Merge branch 'dev'

emartech · May 4, 2022 · b6a3872 · b6a3872
2 parents 3e37ee9 + 0d343f7
commit b6a3872
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 51 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,7 @@
 # What's fixed
-### [Config](https://github.com/emartech/android-emarsys-sdk/wiki/Config#changeapplicationcode)
-* Fixed an issue when changing appcode would not clear the push token.
-### [Geofence](https://github.com/emartech/android-emarsys-sdk/wiki#8-geofence)
-* Fixed an issue when enabling the feature without last known location could cause a crash.
+### [EmarsysSDK](https://github.com/emartech/android-emarsys-sdk/wiki)
+* Fixed an issue what potentially can happen on Android 11 when apps could crash due to a known Android issue what could happen during network connection change
+
+# What's changed
+### [Push](https://github.com/emartech/android-emarsys-sdk/wiki#2-push)
+* HuaweiMessagingServiceUtils was made more easily available from Java
diff --git a/core/src/main/java/com/emarsys/core/connection/ConnectionWatchDog.kt b/core/src/main/java/com/emarsys/core/connection/ConnectionWatchDog.kt
@@ -37,53 +37,64 @@ class ConnectionWatchDog(
 
     val connectionState: ConnectionState
         get() {
-            val activeNetwork =
-                connectivityManager.activeNetwork ?: return ConnectionState.DISCONNECTED
-            val networkCapabilities =
-                connectivityManager.getNetworkCapabilities(activeNetwork)
-                    ?: return ConnectionState.DISCONNECTED
-            return when {
-                networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> ConnectionState.CONNECTED
-                networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) -> ConnectionState.CONNECTED
-                networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> ConnectionState.CONNECTED
-                networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> ConnectionState.CONNECTED_MOBILE_DATA
+            return try {
+                val activeNetwork =
+                    connectivityManager.activeNetwork ?: return ConnectionState.DISCONNECTED
+                val networkCapabilities =
+                    connectivityManager.getNetworkCapabilities(activeNetwork)
+                        ?: return ConnectionState.DISCONNECTED
+                when {
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> ConnectionState.CONNECTED
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) -> ConnectionState.CONNECTED
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> ConnectionState.CONNECTED
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> ConnectionState.CONNECTED_MOBILE_DATA
 
-                else -> ConnectionState.DISCONNECTED
+                    else -> ConnectionState.DISCONNECTED
+                }
+            } catch (ignored: Exception) {
+                ConnectionState.DISCONNECTED
             }
         }
     val isConnected: Boolean
         get() {
-            val network = connectivityManager.activeNetwork ?: return false
-            val networkCapabilities =
-                connectivityManager.getNetworkCapabilities(network) ?: return false
-            return when {
-                networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
-                networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
-                networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) -> true
-                networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
-                else -> false
+            return try {
+                val network = connectivityManager.activeNetwork ?: return false
+                val networkCapabilities =
+                    connectivityManager.getNetworkCapabilities(network) ?: return false
+                return when {
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) -> true
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
+                    else -> false
+                }
+            } catch (ignored: Exception) {
+                false
             }
         }
 
 
     fun registerReceiver(connectionChangeListener: ConnectionChangeListener) {
-        if (AndroidVersionUtils.isOreoOrAbove()) {
-            this.connectionChangeListener = connectionChangeListener
-            connectivityManager.registerNetworkCallback(
-                networkRequest,
-                this,
-                concurrentHandlerHolder.coreHandler.handler
-            )
-        } else {
-            if (receiver != null) {
-                receiver =
-                    ConnectivityChangeReceiver(
-                        connectionChangeListener,
-                        this,
-                        concurrentHandlerHolder
-                    )
-                context.registerReceiver(receiver, intentFilter)
+        try {
+            if (AndroidVersionUtils.isOreoOrAbove()) {
+                this.connectionChangeListener = connectionChangeListener
+                connectivityManager.registerNetworkCallback(
+                    networkRequest,
+                    this,
+                    concurrentHandlerHolder.coreHandler.handler
+                )
+            } else {
+                if (receiver != null) {
+                    receiver =
+                        ConnectivityChangeReceiver(
+                            connectionChangeListener,
+                            this,
+                            concurrentHandlerHolder
+                        )
+                    context.registerReceiver(receiver, intentFilter)
+                }
             }
+        } catch (ignored: Exception) {
         }
     }
 

diff --git a/emarsys-huawei/src/main/java/com/emarsys/service/EmarsysHuaweiMessagingServiceUtils.kt b/emarsys-huawei/src/main/java/com/emarsys/service/EmarsysHuaweiMessagingServiceUtils.kt
@@ -7,6 +7,8 @@ import com.emarsys.mobileengage.service.MessagingServiceUtils
 import com.huawei.hms.push.RemoteMessage
 
 object EmarsysHuaweiMessagingServiceUtils {
+
+    @JvmStatic
     fun handleMessage(context: Context, remoteMessage: RemoteMessage): Boolean {
         val handlerHolder: ConcurrentHandlerHolder = mobileEngage().concurrentHandlerHolder
 

diff --git a/testWithAllDevices.yml b/testWithAllDevices.yml
@@ -11,7 +11,7 @@ core-api:
       version: 26
       locale: 'en'
       orientation: portrait
-    - model: HWCOR
+    - model: walleye
       version: 27
       locale: 'en'
       orientation: portrait
@@ -41,7 +41,7 @@ core:
       version: 26
       locale: 'en'
       orientation: portrait
-    - model: HWCOR
+    - model: walleye
       version: 27
       locale: 'en'
       orientation: portrait
@@ -71,7 +71,7 @@ mobile-engage-api:
       version: 26
       locale: 'en'
       orientation: portrait
-    - model: HWCOR
+    - model: walleye
       version: 27
       locale: 'en'
       orientation: portrait
@@ -101,7 +101,7 @@ mobile-engage:
       version: 26
       locale: 'en'
       orientation: portrait
-    - model: HWCOR
+    - model: walleye
       version: 27
       locale: 'en'
       orientation: portrait
@@ -131,7 +131,7 @@ predict-api:
       version: 26
       locale: 'en'
       orientation: portrait
-    - model: HWCOR
+    - model: walleye
       version: 27
       locale: 'en'
       orientation: portrait
@@ -161,7 +161,7 @@ predict:
       version: 26
       locale: 'en'
       orientation: portrait
-    - model: HWCOR
+    - model: walleye
       version: 27
       locale: 'en'
       orientation: portrait
@@ -191,7 +191,7 @@ emarsys-sdk:
       version: 26
       locale: 'en'
       orientation: portrait
-    - model: HWCOR
+    - model: walleye
       version: 27
       locale: 'en'
       orientation: portrait
@@ -221,7 +221,7 @@ emarsys:
       version: 26
       locale: 'en'
       orientation: portrait
-    - model: HWCOR
+    - model: walleye
       version: 27
       locale: 'en'
       orientation: portrait
@@ -251,7 +251,7 @@ common:
       version: 26
       locale: 'en'
       orientation: portrait
-    - model: HWCOR
+    - model: walleye
       version: 27
       locale: 'en'
       orientation: portrait
@@ -281,7 +281,7 @@ emarsys-firebase:
       version: 26
       locale: 'en'
       orientation: portrait
-    - model: HWCOR
+    - model: walleye
       version: 27
       locale: 'en'
       orientation: portrait
@@ -311,7 +311,7 @@ emarsys-huawei:
       version: 26
       locale: 'en'
       orientation: portrait
-    - model: HWCOR
+    - model: walleye
       version: 27
       locale: 'en'
       orientation: portrait