fix: added ButterKnife unbind s, and cleaned up if not null unsubscribe

mtilbrook-dev · mtilbrook-dev · commit 605ecdfd56af · 2016-01-28T08:22:00.000+11:00
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/BufferDemoFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/BufferDemoFragment.java
@@ -79,6 +79,11 @@ public View onCreateView(LayoutInflater inflater,
         return layout;
     }
 
+    @Override public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
+    }
+
     // -----------------------------------------------------------------------------------
     // Main Rx entities
 
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/ConcurrencyWithSchedulersDemoFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/ConcurrencyWithSchedulersDemoFragment.java
@@ -13,6 +13,7 @@
 import android.widget.ProgressBar;
 
 import com.morihacky.android.rxjava.R;
+import com.morihacky.android.rxjava.RxUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,9 +42,8 @@ public class ConcurrencyWithSchedulersDemoFragment
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (_subscription != null) {
-            _subscription.unsubscribe();
-        }
+        RxUtils.unsubscribeIfNotNull(_subscription);
+        ButterKnife.unbind(this);
     }
 
     @Override
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/DebounceSearchEmitterFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/DebounceSearchEmitterFragment.java
@@ -15,6 +15,7 @@
 import com.jakewharton.rxbinding.widget.RxTextView;
 import com.jakewharton.rxbinding.widget.TextViewTextChangeEvent;
 import com.morihacky.android.rxjava.R;
+import com.morihacky.android.rxjava.RxUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,9 +45,8 @@ public class DebounceSearchEmitterFragment
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (_subscription != null) {
-            _subscription.unsubscribe();
-        }
+        RxUtils.unsubscribeIfNotNull(_subscription);
+        ButterKnife.unbind(this);
     }
 
     @Override
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/DoubleBindingTextViewFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/DoubleBindingTextViewFragment.java
@@ -9,6 +9,7 @@
 import android.widget.TextView;
 
 import com.morihacky.android.rxjava.R;
+import com.morihacky.android.rxjava.RxUtils;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -69,8 +70,7 @@ public void onNumberChanged() {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        if (_subscription != null) {
-            _subscription.unsubscribe();
-        }
+        RxUtils.unsubscribeIfNotNull(_subscription);
+        ButterKnife.unbind(this);
     }
 }
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/ExponentialBackoffFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/ExponentialBackoffFragment.java
@@ -66,6 +66,12 @@ public void onPause() {
         RxUtils.unsubscribeIfNotNull(_subscriptions);
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
+    }
+
     // -----------------------------------------------------------------------------------
 
     @OnClick(R.id.btn_eb_retry)
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/FormValidationCombineLatestFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/FormValidationCombineLatestFragment.java
@@ -10,6 +10,7 @@
 
 import com.jakewharton.rxbinding.widget.RxTextView;
 import com.morihacky.android.rxjava.R;
+import com.morihacky.android.rxjava.RxUtils;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -57,9 +58,13 @@ public View onCreateView(LayoutInflater inflater,
     @Override
     public void onPause() {
         super.onPause();
-        if (_subscription != null) {
-            _subscription.unsubscribe();
-        }
+        RxUtils.unsubscribeIfNotNull(_subscription);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
     }
 
     private void _combineLatestEvents() {
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/MainFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/MainFragment.java
@@ -27,6 +27,12 @@ public View onCreateView(LayoutInflater inflater,
         return layout;
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
+    }
+
     @OnClick(R.id.btn_demo_schedulers)
     void demoConcurrencyWithSchedulers() {
         clickedOn(new ConcurrencyWithSchedulersDemoFragment());
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/PseudoCacheConcatFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/PseudoCacheConcatFragment.java
@@ -9,6 +9,7 @@
 import android.widget.ListView;
 
 import com.morihacky.android.rxjava.R;
+import com.morihacky.android.rxjava.RxUtils;
 import com.morihacky.android.rxjava.retrofit.Contributor;
 import com.morihacky.android.rxjava.retrofit.GithubApi;
 import com.morihacky.android.rxjava.retrofit.GithubService;
@@ -49,9 +50,13 @@ public View onCreateView(LayoutInflater inflater,
     @Override
     public void onPause() {
         super.onPause();
-        if (_subscription != null) {
-            _subscription.unsubscribe();
-        }
+        RxUtils.unsubscribeIfNotNull(_subscription);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
     }
 
     @OnClick(R.id.btn_start_pseudo_cache)
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/PseudoCacheMergeFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/PseudoCacheMergeFragment.java
@@ -8,16 +8,20 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
-import butterknife.Bind;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+
 import com.morihacky.android.rxjava.R;
+import com.morihacky.android.rxjava.RxUtils;
 import com.morihacky.android.rxjava.retrofit.Contributor;
 import com.morihacky.android.rxjava.retrofit.GithubApi;
 import com.morihacky.android.rxjava.retrofit.GithubService;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 import rx.Observable;
 import rx.Subscriber;
 import rx.Subscription;
@@ -48,9 +52,13 @@ public View onCreateView(LayoutInflater inflater,
     @Override
     public void onPause() {
         super.onPause();
-        if (_subscription != null) {
-            _subscription.unsubscribe();
-        }
+        RxUtils.unsubscribeIfNotNull(_subscription);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
     }
 
     @OnClick(R.id.btn_start_pseudo_cache)
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/RetrofitAsyncTaskDeathFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/RetrofitAsyncTaskDeathFragment.java
@@ -64,6 +64,12 @@ public View onCreateView(LayoutInflater inflater,
         return layout;
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
+    }
+
     @OnClick(R.id.btn_demo_retrofit_async_death)
     public void onGetGithubUserClicked() {
         _adapter.clear();
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/RetrofitFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/RetrofitFragment.java
@@ -75,10 +75,15 @@ public void onResume() {
     @Override
     public void onPause() {
         super.onPause();
-
         RxUtils.unsubscribeIfNotNull(_subscriptions);
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
+    }
+
     @OnClick(R.id.btn_demo_retrofit_contributors)
     public void onListContributorsClicked() {
         _adapter.clear();
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/RotationPersist1Fragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/RotationPersist1Fragment.java
@@ -119,6 +119,12 @@ public void onPause() {
         RxUtils.unsubscribeIfNotNull(_subscriptions);
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
+    }
+
     private void _setupLogger() {
         _logs = new ArrayList<>();
         _adapter = new LogAdapter(getActivity(), new ArrayList<String>());
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/TimingDemoFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/TimingDemoFragment.java
@@ -54,6 +54,12 @@ public View onCreateView(LayoutInflater inflater,
         return layout;
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
+    }
+
     // -----------------------------------------------------------------------------------
 
     @OnClick(R.id.btn_demo_timing_1)
diff --git a/app/src/main/java/com/morihacky/android/rxjava/volley/VolleyDemoFragment.java b/app/src/main/java/com/morihacky/android/rxjava/volley/VolleyDemoFragment.java
@@ -65,6 +65,12 @@ public void onPause() {
         _compositeSubscription.unsubscribe();
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
+    }
+
     public Observable<JSONObject> newGetRouteData() {
         return Observable.defer(new Func0<Observable<JSONObject>>() {
             @Override
