Fix butterknife unbinder NPE

aarcosg · Jun 9, 2016 · 5cc23d8 · 5cc23d8
1 parent 92bd201
commit 5cc23d8
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "us.idinfor.smartcitizen"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 7
-        versionName "1.2.3"
+        versionCode 8
+        versionName "1.2.4"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/us/idinfor/smartcitizen/ui/activity/MainActivity.java b/app/src/main/java/us/idinfor/smartcitizen/ui/activity/MainActivity.java
@@ -109,7 +109,9 @@ protected void onDestroy() {
         if(mDrawerLayout != null){
             mDrawerLayout.removeDrawerListener(mDrawerToggle);
         }
-        mUnbinder.unbind();
+        if(mUnbinder != null){
+           mUnbinder.unbind();
+        }
     }
 
     @Override

diff --git a/app/src/main/java/us/idinfor/smartcitizen/ui/adapter/ActivityDurationPagerAdapter.java b/app/src/main/java/us/idinfor/smartcitizen/ui/adapter/ActivityDurationPagerAdapter.java
@@ -78,6 +78,8 @@ public Object instantiateItem(ViewGroup container, int position) {
     @Override
     public void destroyItem(ViewGroup container, int position, Object object) {
         container.removeView((View) object);
-        mUnbinder.unbind();
+       if(mUnbinder != null){
+           mUnbinder.unbind();
+       }
     }
 }
diff --git a/app/src/main/java/us/idinfor/smartcitizen/ui/fragment/ActivityTimelineFragment.java b/app/src/main/java/us/idinfor/smartcitizen/ui/fragment/ActivityTimelineFragment.java
@@ -78,7 +78,9 @@ public void onResume() {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        mUnbinder.unbind();
+       if(mUnbinder != null){
+           mUnbinder.unbind();
+       }
     }
 
     @Override

diff --git a/app/src/main/java/us/idinfor/smartcitizen/ui/fragment/FitnessFragment.java b/app/src/main/java/us/idinfor/smartcitizen/ui/fragment/FitnessFragment.java
@@ -128,7 +128,9 @@ public void onResume() {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        mUnbinder.unbind();
+       if(mUnbinder != null){
+           mUnbinder.unbind();
+       }
     }
 
     @Override

diff --git a/app/src/main/java/us/idinfor/smartcitizen/ui/fragment/LocationDetailsFragment.java b/app/src/main/java/us/idinfor/smartcitizen/ui/fragment/LocationDetailsFragment.java
@@ -90,7 +90,9 @@ public void onResume() {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        mUnbinder.unbind();
+       if(mUnbinder != null){
+           mUnbinder.unbind();
+       }
     }
 
     @Override

diff --git a/app/src/main/java/us/idinfor/smartcitizen/ui/fragment/LoginFragment.java b/app/src/main/java/us/idinfor/smartcitizen/ui/fragment/LoginFragment.java
@@ -74,7 +74,9 @@ public void onPause() {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        mUnbinder.unbind();
+       if(mUnbinder != null){
+           mUnbinder.unbind();
+       }
     }
 
     @Override