From 5cc23d8db1f4123b1f7d9daa4ba58b27bf32063f Mon Sep 17 00:00:00 2001
From: Alvaro Arcos <arcos1989@gmail.com>
Date: Thu, 9 Jun 2016 10:03:00 +0200
Subject: [PATCH] Fix butterknife unbinder NPE

---
 app/build.gradle                                              | 4 ++--
 .../us/idinfor/smartcitizen/ui/activity/MainActivity.java     | 4 +++-
 .../smartcitizen/ui/adapter/ActivityDurationPagerAdapter.java | 4 +++-
 .../smartcitizen/ui/fragment/ActivityTimelineFragment.java    | 4 +++-
 .../us/idinfor/smartcitizen/ui/fragment/FitnessFragment.java  | 4 +++-
 .../smartcitizen/ui/fragment/LocationDetailsFragment.java     | 4 +++-
 .../us/idinfor/smartcitizen/ui/fragment/LoginFragment.java    | 4 +++-
 7 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index be1af2e..af5b3c1 100644
--- 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
index b9673d6..a96cfae 100644
--- 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
index 9fedceb..645ba87 100644
--- 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
index 1f1aacd..1889dae 100644
--- 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
index 4fb55b2..434bea5 100644
--- 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
index b0a9794..b2be66e 100644
--- 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
index 5888375..c45dce0 100644
--- 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