Fixed crashes when ArrayList was null in IPresenter.

mazurio · Jan 14, 2016 · ca58d2c · ca58d2c
1 parent bd4dc42
commit ca58d2c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -46,14 +46,14 @@ android {
     productFlavors {
         pro {
             applicationId 'com.bodyweight.fitness.pro'
-            versionCode 111
-            versionName "1.1.1"
+            versionCode 113
+            versionName "1.1.3"
         }
 
         free {
             applicationId 'com.bodyweight.fitness.free'
-            versionCode 111
-            versionName "1.1.1"
+            versionCode 113
+            versionName "1.1.3"
         }
     }
     buildTypes {
@@ -109,4 +109,4 @@ dependencies {
         transitive = true;
     }
     compile files('libs/amazon-mobile-associates-1.0.73.0.jar')
-}
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.bodyweight.fitness"
     android:installLocation="auto">
 
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+
 	<uses-permission android:name="android.permission.INTERNET" />
 
     <application

diff --git a/app/src/main/java/com/bodyweight/fitness/presenter/IPresenter.java b/app/src/main/java/com/bodyweight/fitness/presenter/IPresenter.java
@@ -73,6 +73,10 @@ public void onSubscribe() {}
      * @param subscription subscription.
      */
     public void subscribe(Subscription subscription) {
+        if (mSubscriptions == null) {
+            mSubscriptions = new ArrayList<>();
+        }
+
         mSubscriptions.add(subscription);
     }
 
@@ -81,7 +85,7 @@ public void subscribe(Subscription subscription) {
      */
     private void unsubscribeAll() {
         if (mSubscriptions == null) {
-            return;
+            mSubscriptions = new ArrayList<>();
         }
 
         for(Subscription s : mSubscriptions) {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
 	<string name="app_name">Bodyweight Fitness</string>
-	<string name="app_version">1.1.1</string>
+	<string name="app_version">1.1.3</string>
 
 	<string name="action_progression">Choose Exercise Progression</string>
 	<string name="action_about">About</string>