mirror/AuroraStore
1
0
Fork 0
mirror of https://github.com/whyorean/AuroraStore.git synced 2026-06-19 21:19:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Issue #168 GSF version code is saved properly into device.properties now. Fallback version updated

Browse Source
This commit is contained in:
Sergey Eremin
2017-05-22 17:16:38 +03:00
parent 7a2c3c3e01
commit 2d4e9865f9
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/yeriomin/yalpstore/CrashLetterDeviceInfoBuilder.java
View File

@@ -22,7 +22,6 @@ public class CrashLetterDeviceInfoBuilder extends CrashLetterBuilder {
static {
staticProperties.put("Client", "android-google");
staticProperties.put("GSF.version", "16");
staticProperties.put("Roaming", "mobile-notroaming");
staticProperties.put("TimeZone", TimeZone.getDefault().getID());
staticProperties.put("GL.Extensions", TextUtils.join(",", EglExtensionRetriever.getEglExtensions()));
@@ -92,6 +91,7 @@ public class CrashLetterDeviceInfoBuilder extends CrashLetterBuilder {
values.put("HasFiveWayNavigation", Boolean.toString(config.navigation == Configuration.NAVIGATIONHIDDEN_YES));
ConfigurationInfo configurationInfo = ((ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE)).getDeviceConfigurationInfo();
values.put("GL.Version", Integer.toString(configurationInfo.reqGlEsVersion));
values.put("GSF.version", Integer.toString(NativeDeviceInfoProvider.getGsfVersionCode(context)));
return values;
}

27
app/src/main/java/com/github/yeriomin/yalpstore/NativeDeviceInfoProvider.java
View File

@@ -25,8 +25,7 @@ import java.util.TimeZone;
public class NativeDeviceInfoProvider implements DeviceInfoProvider {
// Getting this requires a permission and google services to be installed
static private final int GOOGLE_SERVICES_VERSION_CODE = 80711500;
static private final int GOOGLE_SERVICES_VERSION_CODE = 10548448;
private Context context;
private String localeString;
@@ -46,12 +45,13 @@ public class NativeDeviceInfoProvider implements DeviceInfoProvider {
public String getUserAgentString() {
return "Android-Finsky/7.1.15 ("
+ "api=3"
+ ",versionCode=" + GOOGLE_SERVICES_VERSION_CODE
+ ",versionCode=" + getGsfVersionCode(context)
+ ",sdk=" + Build.VERSION.SDK_INT
+ ",device=" + Build.DEVICE
+ ",hardware=" + (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO ? Build.HARDWARE : Build.PRODUCT)
+ ",product=" + Build.PRODUCT
+ ")";
+ ")"
;
}
public AndroidCheckinRequest generateAndroidCheckinRequest() {
@@ -64,7 +64,8 @@ public class NativeDeviceInfoProvider implements DeviceInfoProvider {
.setVersion(3)
.setDeviceConfiguration(getDeviceConfigurationProto())
.setFragment(0)
.build();
.build()
;
}
private AndroidCheckinProto getCheckinProto() {
@@ -95,8 +96,9 @@ public class NativeDeviceInfoProvider implements DeviceInfoProvider {
.setClient("android-google")
.setOtaInstalled(false)
.setTimestamp(System.currentTimeMillis() / 1000)
.setGoogleServices(GOOGLE_SERVICES_VERSION_CODE)
.build();
.setGoogleServices(getGsfVersionCode(context))
.build()
;
}
public DeviceConfigurationProto getDeviceConfigurationProto() {
@@ -111,7 +113,8 @@ public class NativeDeviceInfoProvider implements DeviceInfoProvider {
.addAllSystemSupportedLocale(getLocales(context))
.setGlEsVersion(configurationInfo.reqGlEsVersion)
.addAllGlExtension(EglExtensionRetriever.getEglExtensions())
.build();
.build()
;
}
private DeviceConfigurationProto.Builder addDisplayMetrics(DeviceConfigurationProto.Builder builder) {
@@ -176,4 +179,12 @@ public class NativeDeviceInfoProvider implements DeviceInfoProvider {
static public List<String> getSharedLibraries(Context context) {
return Arrays.asList(context.getPackageManager().getSystemSharedLibraryNames());
}
static public int getGsfVersionCode(Context context) {
try {
return context.getPackageManager().getPackageInfo("com.google.android.gms", 0).versionCode;
} catch (PackageManager.NameNotFoundException e) {
return GOOGLE_SERVICES_VERSION_CODE;
}
}
}