Merge pull request #304 from enviroCar/develop

Develop
enviroCar · Jun 14, 2016 · 04941f6 · 04941f6
2 parents d12efca + e33e719
commit 04941f6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -40,8 +40,8 @@ ext {
     compileSdkVersion = 23
     targetSdkVersion = 23
     buildToolsVersion = '23.0.2'
-    versionCode = 31
-    versionName = "0.22.2"
+    versionCode = 32
+    versionName = "0.22.3"
 
     javaCompileVersion = JavaVersion.VERSION_1_8
 

diff --git a/org.envirocar.app/AndroidManifest.xml b/org.envirocar.app/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.envirocar.app"
     android:installLocation="internalOnly"
-    android:versionCode="31"
-    android:versionName="0.22.2">
+    android:versionCode="32"
+    android:versionName="0.22.3">
 
     <uses-sdk
         android:minSdkVersion="16"

diff --git a/org.envirocar.app/src/org/envirocar/app/BaseMainActivity.java b/org.envirocar.app/src/org/envirocar/app/BaseMainActivity.java
@@ -583,7 +583,7 @@ private void shutdownEnviroCar() {
         mMainThreadWorker.schedule(() -> {
             System.runFinalizersOnExit(true);
             System.exit(0);
-        }, 100, TimeUnit.MILLISECONDS);
+        }, 750, TimeUnit.MILLISECONDS);
     }
 
     /**

diff --git a/org.envirocar.app/src/org/envirocar/app/view/dashboard/DashboardTempomatFragment.java b/org.envirocar.app/src/org/envirocar/app/view/dashboard/DashboardTempomatFragment.java
@@ -80,8 +80,12 @@ public void onPause(){
     public void onDestroy() {
         LOG.info("onDestroy()");
         super.onDestroy();
-        mTempomatView.destroyDrawingCache();
-        mTempomatView = null;
+
+        // null check before destroying.
+        if(mTempomatView != null) {
+            mTempomatView.destroyDrawingCache();
+            mTempomatView = null;
+        }
     }
 
     @Override