Skip to content

Commit 82e3f87

Browse files
Furtifvgw-courtney-m
authored andcommitted
Others (#945)
* update google protocbuf 3.0.0-beta to 3.3.0 * update deps * update gitignore * Update googleProtobuf to 3.4.0 * update protos filesto 0.79.3 * Update deps * update protobuf * update protobuf * Update 0.85.1 protobuf module (not tested) based of commit pogosandbox/node-pogo-protos@1e113c7 * update to 8500 * Opps end point missed * Update Google protocBuf * remove out * fix #945 (comment) * new protos files to 0.87.5 * test new.. * others. * revert 3.5.1 * udate to 3.5.1 * 0.89.1 * 0.91.1 and new protos * fix #945 (review) * fix #945 (review) * fix #945 (review) * Update .gitignore * Update .travis.yml * Remove redundant .gitignore * Update build.gradle * remove bad .gitignore * remove unsuported hardware * set ptc head to lasted iOS * update POGOProtos to 0.95.3
1 parent 71834c7 commit 82e3f87

File tree

6 files changed

+12
-51
lines changed

6 files changed

+12
-51
lines changed

.gitmodules

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[submodule "library/src/resources/protobuf"]
22
path = library/src/resources/protobuf
3-
url = https://github.com/pogosandbox/POGOProtos.git
3+
url = https://github.com/Furtif/POGOProtos.git
4+
branch = master

library/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
jcenter()
44
}
55
dependencies {
6-
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.7'
6+
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.4'
77
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1"
88
}
99
}
@@ -51,7 +51,7 @@ protobuf {
5151
// Configure the protoc executable
5252
protoc {
5353
// Download from repositories
54-
artifact = 'com.google.protobuf:protoc:3.0.0-beta-3'
54+
artifact = 'com.google.protobuf:protoc:3.5.1'
5555
}
5656
}
5757

@@ -96,7 +96,7 @@ dependencies {
9696
compile 'com.squareup.moshi:moshi:1.2.0'
9797
compile 'com.annimon:stream:1.1.1'
9898
compile 'com.squareup.okhttp3:okhttp:3.4.1'
99-
compile 'com.google.protobuf:protobuf-java:3.0.0-beta-3'
99+
compile 'com.google.protobuf:protobuf-java:3.5.1'
100100
compile 'io.reactivex:rxjava:1.1.8'
101101
compile 'net.jpountz.lz4:lz4:1.3.0'
102102
compileOnly 'org.projectlombok:lombok:1.16.10'

library/src/main/java/com/pokegoapi/api/device/DeviceInfo.java

+2-42
Original file line numberDiff line numberDiff line change
@@ -26,44 +26,6 @@
2626

2727
public class DeviceInfo {
2828
private static final String[][] DEVICES = new String[][]{
29-
{"iPad3,1", "iPad", "J1AP"},
30-
{"iPad3,2", "iPad", "J2AP"},
31-
{"iPad3,3", "iPad", "J2AAP"},
32-
{"iPad3,4", "iPad", "P101AP"},
33-
{"iPad3,5", "iPad", "P102AP"},
34-
{"iPad3,6", "iPad", "P103AP"},
35-
36-
{"iPad4,1", "iPad", "J71AP"},
37-
{"iPad4,2", "iPad", "J72AP"},
38-
{"iPad4,3", "iPad", "J73AP"},
39-
{"iPad4,4", "iPad", "J85AP"},
40-
{"iPad4,5", "iPad", "J86AP"},
41-
{"iPad4,6", "iPad", "J87AP"},
42-
{"iPad4,7", "iPad", "J85mAP"},
43-
{"iPad4,8", "iPad", "J86mAP"},
44-
{"iPad4,9", "iPad", "J87mAP"},
45-
46-
{"iPad5,1", "iPad", "J96AP"},
47-
{"iPad5,2", "iPad", "J97AP"},
48-
{"iPad5,3", "iPad", "J81AP"},
49-
{"iPad5,4", "iPad", "J82AP"},
50-
51-
{"iPad6,7", "iPad", "J98aAP"},
52-
{"iPad6,8", "iPad", "J99aAP"},
53-
54-
{"iPad7,1", "iPad", "N102AP"},
55-
56-
{"iPhone5,1", "iPhone", "N41AP"},
57-
{"iPhone5,2", "iPhone", "N42AP"},
58-
{"iPhone5,3", "iPhone", "N48AP"},
59-
{"iPhone5,4", "iPhone", "N49AP"},
60-
61-
{"iPhone6,1", "iPhone", "N51AP"},
62-
{"iPhone6,2", "iPhone", "N53AP"},
63-
64-
{"iPhone7,1", "iPhone", "N56AP"},
65-
{"iPhone7,2", "iPhone", "N61AP"},
66-
6729
{"iPhone8,1", "iPhone", "N71AP"},
6830
{"iPhone8,2", "iPhone", "N66AP"},
6931
{"iPhone8,4", "iPhone", "N69AP"},
@@ -74,13 +36,11 @@ public class DeviceInfo {
7436
{"iPhone9,4", "iPhone", "D111AP"}
7537
};
7638

77-
private static final String[] IPHONE_OS_VERSIONS = {
78-
"8.1.1", "8.1.2", "8.1.3", "8.2", "8.3", "8.4", "8.4.1",
79-
"9.0", "9.0.1", "9.0.2", "9.1", "9.2", "9.2.1", "9.3", "9.3.1", "9.3.2", "9.3.3", "9.3.4"
39+
private static final String[] IPHONE_OS_VERSIONS = { "11.0", "11.1", "11.2", "11.2.5", "11.3.0"
8040
};
8141

8242
private static final String[] IOS_VERSIONS = {
83-
"10.2", "10.2.1"
43+
"11.0", "11.1", "11.2", "11.2.5", "11.3.0"
8444
};
8545

8646
private SignatureOuterClass.Signature.DeviceInfo.Builder deviceInfoBuilder;

library/src/main/java/com/pokegoapi/auth/PtcCredentialProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class PtcCredentialProvider extends CredentialProvider {
4545
public static final String SERVICE_URL = "https://sso.pokemon.com/sso/oauth2.0/callbackAuthorize";
4646
public static final String LOGIN_URL = "https://sso.pokemon.com/sso/login";
4747
public static final String LOGIN_OAUTH = "https://sso.pokemon.com/sso/oauth2.0/accessToken";
48-
public static final String USER_AGENT = "pokemongo/1 CFNetwork/811.4.18 Darwin/16.5.0";
48+
public static final String USER_AGENT = "pokemongo/1 CFNetwork/897.1 Darwin/17.5.0"; //Lasted iOS 11.3.0
4949
//We try and refresh token 5 minutes before it actually expires
5050
protected static final long REFRESH_TOKEN_BUFFER_TIME = 5 * 60 * 1000;
5151
protected static final int MAXIMUM_RETRIES = 5;

library/src/main/java/com/pokegoapi/util/hash/pokehash/PokeHashProvider.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
* @see <a href="https://hashing.pogodev.org/">https://hashing.pogodev.org/</a>
4141
*/
4242
public class PokeHashProvider implements HashProvider {
43-
private static final String DEFAULT_ENDPOINT = "https://pokehash.buddyauth.com/api/v147_1/hash";
43+
private static final String DEFAULT_ENDPOINT = "https://pokehash.buddyauth.com/api/v159_1/hash";
4444

4545
@Getter
4646
@Setter
4747
private String endpoint = DEFAULT_ENDPOINT;
4848

49-
private static final int VERSION = 7904;
50-
private static final long UNK25 = -6553495230586135539L;
49+
private static final int VERSION = 9100;
50+
private static final long UNK25 = -782790124105039914L;
5151

5252
private static final Moshi MOSHI = new Builder().build();
5353

library/src/resources/protobuf

Submodule protobuf updated 156 files

0 commit comments

Comments
 (0)