From d7cff11399808acb707f27b41db9507c9ce6e0e1 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Wed, 21 Jun 2023 16:53:02 +0600 Subject: [PATCH 1/3] 1270-Fallback to default deviceInfoProvider for authData on missing issue: https://gitlab.e.foundation/e/os/backlog/-/issues/1270 AuthData requires DeviceInfoProvider for network operations. Sometimes, client apps failed to provide it, & cause NPE. On that cases we want to fallback to default deviceInfo. We choose pixel-3a as our fallback device as it looks like a better candidate. --- src/main/java/com/aurora/gplayapi/data/models/AuthData.kt | 1 + .../aurora/gplayapi/data/providers/DeviceInfoProvider.kt | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/aurora/gplayapi/data/models/AuthData.kt b/src/main/java/com/aurora/gplayapi/data/models/AuthData.kt index 6e67240..9c42a2e 100644 --- a/src/main/java/com/aurora/gplayapi/data/models/AuthData.kt +++ b/src/main/java/com/aurora/gplayapi/data/models/AuthData.kt @@ -49,5 +49,6 @@ class AuthData { var dfeCookie: String = String() var locale: Locale = Locale.getDefault() var deviceInfoProvider: DeviceInfoProvider? = null + get() = field ?: DeviceInfoProvider.getDefault() var userProfile: UserProfile? = null } \ No newline at end of file diff --git a/src/main/java/com/aurora/gplayapi/data/providers/DeviceInfoProvider.kt b/src/main/java/com/aurora/gplayapi/data/providers/DeviceInfoProvider.kt index fc64ce8..59c4cfe 100644 --- a/src/main/java/com/aurora/gplayapi/data/providers/DeviceInfoProvider.kt +++ b/src/main/java/com/aurora/gplayapi/data/providers/DeviceInfoProvider.kt @@ -208,5 +208,12 @@ class DeviceInfoProvider(var properties: Properties, var localeString: String) : "TimeZone", "GL.Extensions" ) + + fun getDefault(): DeviceInfoProvider? { + val properties = DeviceManager.loadProperties("px_3a.properties") + ?: return null + + return DeviceInfoProvider(properties, Locale.getDefault().toString()) + } } } \ No newline at end of file -- GitLab From 32417a033dcb42cb1e27c9be9425a366bbb04c3e Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Wed, 21 Jun 2023 17:01:53 +0600 Subject: [PATCH 2/3] bump version to 3.0.1-2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0fde3e6..6f60831 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ plugins { } group("com.aurora") -version("3.0.1-1") +version("3.0.1-2") repositories { mavenCentral() -- GitLab From 6beba697002c3f0b1ae22a18296ef4d4a4e15d11 Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Wed, 21 Jun 2023 11:36:49 +0000 Subject: [PATCH 3/3] Apply 1 suggestion(s) to 1 file(s) --- src/main/java/com/aurora/gplayapi/data/models/AuthData.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/aurora/gplayapi/data/models/AuthData.kt b/src/main/java/com/aurora/gplayapi/data/models/AuthData.kt index 9c42a2e..a23dafd 100644 --- a/src/main/java/com/aurora/gplayapi/data/models/AuthData.kt +++ b/src/main/java/com/aurora/gplayapi/data/models/AuthData.kt @@ -50,5 +50,6 @@ class AuthData { var locale: Locale = Locale.getDefault() var deviceInfoProvider: DeviceInfoProvider? = null get() = field ?: DeviceInfoProvider.getDefault() + var userProfile: UserProfile? = null } \ No newline at end of file -- GitLab