Fixed a potential NullPointerException after recreate() is called whe…

…n setting a new theme
maxieds · Jun 29, 2019 · 119f4ba · 119f4ba
1 parent 9608bf1
commit 119f4ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         applicationId "com.maxieds.chameleonminilivedebugger"
         minSdkVersion 26
         targetSdkVersion 28
-        versionCode 59
-        versionName "0.5.9"
+        versionCode 60
+        versionName "0.6.0"
         //multiDexEnabled true
 
         buildConfigField "String", "GIT_COMMIT_HASH", "\"" + getGitCommitHash() + "\""

diff --git a/app/src/main/java/com/maxieds/chameleonminilivedebugger/LiveLoggerActivity.java b/app/src/main/java/com/maxieds/chameleonminilivedebugger/LiveLoggerActivity.java
@@ -352,10 +352,11 @@ public void onReceive(Context context, Intent intent) {
      @Override
      public void recreate() {
 
-          unregisterReceiver(usbActionReceiver);
-          usbReceiversRegistered = false;
-          runningActivity = null;
-
+          if(usbActionReceiver != null) {
+               unregisterReceiver(usbActionReceiver);
+               usbReceiversRegistered = false;
+          }
+          //runningActivity = null;
           //super.recreate();
           Intent intent = getIntent();
           intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);