Merge pull request #105 from particle-iot/bug/ch60996/update-mobile-apps-to-use-reliable-sim-management

Update mobile apps to use Reliable SIM Management conventions like the console

Author: jensck

.travis.yml

@@ -7,8 +7,8 @@ jdk:
 
 env:
   global:
-    - ANDROID_COMPILE_API_LEVEL=28
-    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
+    - ANDROID_COMPILE_API_LEVEL=30
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
 
 android:
   components:
@@ -33,6 +33,9 @@ android:
     - 'android-sdk-license-.+'
     - 'google-gdk-license-.+'
 
+before_install:
+  - yes | sdkmanager "platforms;android-30"
+  - yes | sdkmanager "build-tools;29.0.2"
 
 script:
   - ./gradlew :cloudsdk:assembleDebug :cloudsdk:testDebugUnitTest :cloudsdk:jacocoTestReport 

mesh/src/main/java/io/particle/mesh/setup/flow/Errors.kt

@@ -194,13 +194,13 @@ class StickerErrorException(cause: Throwable? = null) : MeshSetupFlowException(
 
 class FailedToActivateSimException(severity: ExceptionType, cause: Throwable? = null) : MeshSetupFlowException(
     cause,
-    userFacingMessage = "SIM activation is taking longer than expected. Please retry your SIM activation. If you have retried multiple times, please contact support.",
+    userFacingMessage = "SIM activation is ongoing and taking a long time to finish. Wait for it to complete and try again.",
     severity = severity
 )
 
 
 class FailedToDeactivateSimException : MeshSetupFlowException(
-    userFacingMessage = "SIM deactivation is taking longer than expected. Please retry your SIM deactivation. If you have retried multiple times, please contact support.",
+    userFacingMessage = "SIM deactivation is ongoing and taking a long time to finish. Wait for it to complete and try again.",
     severity = ERROR_FATAL
 )
 

mesh/src/main/java/io/particle/mesh/setup/flow/setupsteps/StepEnsureSimActivated.kt

@@ -7,6 +7,7 @@ import io.particle.mesh.setup.flow.FailedToActivateSimException
 import io.particle.mesh.setup.flow.MeshSetupStep
 import io.particle.mesh.setup.flow.Scopes
 import io.particle.mesh.setup.flow.context.SetupContexts
+import io.particle.mesh.setup.flow.retrySimAction
 
 class StepEnsureSimActivated(private val cloud: ParticleCloud) : MeshSetupStep() {
 
@@ -15,27 +16,17 @@ class StepEnsureSimActivated(private val cloud: ParticleCloud) : MeshSetupStep()
             return
         }
 
-        for (i in 0..2) {
-
-            val statusCode = doActivateSim(ctxs)
-            if (statusCode == 200) {
-                ctxs.targetDevice.updateIsSimActivated(true)
-                return
-
-            } else if (statusCode == 504) {
-                continue
-
-            } else {
-                throw FailedToActivateSimException(ERROR_RECOVERABLE)
-            }
+        retrySimAction {
+            doActivateSim(ctxs)
         }
-
-        throw FailedToActivateSimException(ERROR_FATAL)
     }
 
     private fun doActivateSim(ctxs: SetupContexts): Int {
         val response = cloud.activateSim(ctxs.targetDevice.iccid!!)
         return response.status
     }
 
+    override fun wrapException(cause: Exception): Exception {
+        return FailedToActivateSimException(ERROR_FATAL, cause)
+    }
 }