feat: android local sync update (#20)

amplitude · Mar 29, 2022 · e25ecd4 · e25ecd4
1 parent d14cb55
commit e25ecd4
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 20 deletions.
diff --git a/.github/workflows/pull-request-test.yml b/.github/workflows/pull-request-test.yml
@@ -12,6 +12,8 @@ jobs:
           java-version: '11'
           distribution: 'zulu'
       - uses: actions/checkout@v2
+      - name: Build
+        run: ./gradlew build
       - name: Unit Test
         run: ./gradlew testDebugUnitTest
       - name: Lint

diff --git a/android/src/main/java/com/amplitude/android/utilities/AndroidLoggerProvider.kt b/android/src/main/java/com/amplitude/android/utilities/AndroidLoggerProvider.kt
@@ -1,12 +1,12 @@
 package com.amplitude.android.utilities
 
 import com.amplitude.common.Logger
-import com.amplitude.common.android.AndroidLogger
+import com.amplitude.common.android.LogcatLogger
 import com.amplitude.core.Amplitude
 import com.amplitude.core.LoggerProvider
 
 class AndroidLoggerProvider() : LoggerProvider {
     override fun getLogger(amplitude: Amplitude): Logger {
-        return AndroidLogger()
+        return LogcatLogger()
     }
 }
diff --git a/common-android/src/main/AndroidManifest.xml b/common-android/src/main/AndroidManifest.xml
@@ -2,4 +2,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.amplitude.common.android">
 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 </manifest>
diff --git a/common-android/src/main/java/com/amplitude/common/android/AndroidContextProvider.kt b/common-android/src/main/java/com/amplitude/common/android/AndroidContextProvider.kt
@@ -3,6 +3,7 @@ package com.amplitude.common.android
 import android.content.Context
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
+import android.content.res.Resources
 import android.location.Geocoder
 import android.location.Location
 import android.location.LocationManager
@@ -178,11 +179,26 @@ class AndroidContextProvider(private val context: Context, locationListening: Bo
                 return null
             }
 
+        private val locale: Locale
+            private get() {
+                val configuration = Resources.getSystem().configuration
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    val localeList = configuration.locales
+                    if (localeList.isEmpty) {
+                        return Locale.getDefault()
+                    } else {
+                        return localeList.get(0)
+                    }
+                } else {
+                    return configuration.locale
+                }
+            }
+
         private val countryFromLocale: String
-            private get() = Locale.getDefault().country
+            private get() = locale.country
 
         private fun fetchLanguage(): String {
-            return Locale.getDefault().language
+            return locale.language
         }
 
         private fun fetchAdvertisingId(): String {
@@ -209,12 +225,12 @@ class AndroidContextProvider(private val context: Context, locationListening: Bo
                 val getId = appSetInfo.javaClass.getMethod("getId")
                 appSetId = getId.invoke(appSetInfo) as String
             } catch (e: ClassNotFoundException) {
-                AndroidLogger.logger
+                LogcatLogger.logger
                     .warn("Google Play Services SDK not found for app set id!")
             } catch (e: InvocationTargetException) {
-                AndroidLogger.logger.warn("Google Play Services not available for app set id")
+                LogcatLogger.logger.warn("Google Play Services not available for app set id")
             } catch (e: Exception) {
-                AndroidLogger.logger.error(
+                LogcatLogger.logger.error(
                     "Encountered an error connecting to Google Play Services for app set id"
                 )
             }
@@ -248,13 +264,13 @@ class AndroidContextProvider(private val context: Context, locationListening: Bo
                     val getId = advertisingInfo.javaClass.getMethod("getId")
                     advertisingId = getId.invoke(advertisingInfo) as String
                 } catch (e: ClassNotFoundException) {
-                    AndroidLogger.logger
+                    LogcatLogger.logger
                         .warn("Google Play Services SDK not found for advertising id!")
                 } catch (e: InvocationTargetException) {
-                    AndroidLogger.logger
+                    LogcatLogger.logger
                         .warn("Google Play Services not available for advertising id")
                 } catch (e: Exception) {
-                    AndroidLogger.logger.error(
+                    LogcatLogger.logger.error(
                         "Encountered an error connecting to Google Play Services for advertising id"
                     )
                 }
@@ -274,17 +290,17 @@ class AndroidContextProvider(private val context: Context, locationListening: Bo
                 // status 0 corresponds to com.google.android.gms.common.ConnectionResult.SUCCESS;
                 return status != null && status == 0
             } catch (e: NoClassDefFoundError) {
-                AndroidLogger.logger.warn("Google Play Services Util not found!")
+                LogcatLogger.logger.warn("Google Play Services Util not found!")
             } catch (e: ClassNotFoundException) {
-                AndroidLogger.logger.warn("Google Play Services Util not found!")
+                LogcatLogger.logger.warn("Google Play Services Util not found!")
             } catch (e: NoSuchMethodException) {
-                AndroidLogger.logger.warn("Google Play Services not available")
+                LogcatLogger.logger.warn("Google Play Services not available")
             } catch (e: InvocationTargetException) {
-                AndroidLogger.logger.warn("Google Play Services not available")
+                LogcatLogger.logger.warn("Google Play Services not available")
             } catch (e: IllegalAccessException) {
-                AndroidLogger.logger.warn("Google Play Services not available")
+                LogcatLogger.logger.warn("Google Play Services not available")
             } catch (e: Exception) {
-                AndroidLogger.logger.warn(
+                LogcatLogger.logger.warn(
                     "Error when checking for Google Play Services: $e"
                 )
             }
@@ -363,9 +379,9 @@ class AndroidContextProvider(private val context: Context, locationListening: Bo
                 try {
                     location = locationManager.getLastKnownLocation(provider!!)
                 } catch (e: SecurityException) {
-                    AndroidLogger.logger.warn("Failed to get most recent location")
+                    LogcatLogger.logger.warn("Failed to get most recent location")
                 } catch (e: Exception) {
-                    AndroidLogger.logger.warn("Failed to get most recent location")
+                    LogcatLogger.logger.warn("Failed to get most recent location")
                 }
                 if (location != null) {
                     locations.add(location)

diff --git a/...amplitude/common/android/AndroidLogger.kt → .../amplitude/common/android/LogcatLogger.kt b/...amplitude/common/android/AndroidLogger.kt → .../amplitude/common/android/LogcatLogger.kt
@@ -3,7 +3,7 @@ package com.amplitude.common.android
 import android.util.Log
 import com.amplitude.common.Logger
 
-class AndroidLogger() : Logger {
+class LogcatLogger() : Logger {
     override var logMode: Logger.LogMode = Logger.LogMode.INFO
     private val tag = "Amplitude"
 
@@ -32,6 +32,6 @@ class AndroidLogger() : Logger {
     }
 
     companion object {
-        val logger = AndroidLogger()
+        val logger = LogcatLogger()
     }
 }