Merge branch 'jk/dont-use-photon-image-and-label-for-products'

particle-iot · Feb 15, 2019 · 7b1c85f · 7b1c85f
2 parents 7e201aa + 5fe767c
commit 7b1c85f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
@@ -1,3 +1,8 @@
+2.3.11
+======
+- Fix Photon claiming issue
+- Don't show unknown "product" devices as Photons, just show them as "other"/unknown 
+
 2.3.10
 ======
 - Automatic device type detection when starting setup

diff --git a/app/build.gradle b/app/build.gradle
@@ -28,8 +28,9 @@ android {
         applicationId 'io.particle.android.app'
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 102031003
-        versionName "2.3.10"
+        // scheme for these version numbers: EPOCH MAJOR MINOR PATCH BUILD
+        versionCode 1_02_03_11_01
+        versionName  "2.3.11"
 
         vectorDrawables.useSupportLibrary = true
 

diff --git a/cloudsdk/src/main/java/io/particle/android/sdk/cloud/ParticleDevice.kt b/cloudsdk/src/main/java/io/particle/android/sdk/cloud/ParticleDevice.kt
@@ -176,6 +176,7 @@ class ParticleDevice internal constructor(
     }
 
     enum class ParticleDeviceType {
+        OTHER,
         CORE,
         PHOTON,
         P1,
@@ -211,7 +212,7 @@ class ParticleDevice internal constructor(
                     88 -> RED_BEAR_DUO
                     103 -> BLUZ
                     6 -> PHOTON
-                    else -> PHOTON
+                    else -> OTHER
                 }
             }
         }

diff --git a/...cesetup/src/main/java/io/particle/android/sdk/devicesetup/ParticleDeviceSetupLibrary.java b/...cesetup/src/main/java/io/particle/android/sdk/devicesetup/ParticleDeviceSetupLibrary.java
@@ -155,7 +155,7 @@ public static void init(Context ctx, final Class<? extends Activity> mainActivit
      *            Activity here)
      */
     public static void init(Context ctx) {
-        init(ctx, true);
+        init(ctx, false);
     }
 
     /**
@@ -166,7 +166,7 @@ public static void init(Context ctx) {
      *            Activity here)
      */
     public static void initWithSetupOnly(Context ctx) {
-        init(ctx, false);
+        init(ctx, true);
     }
 
     public static ParticleDeviceSetupLibrary getInstance() {