From ca58d2ccc3561b22971335d8a52bda9ff18278b7 Mon Sep 17 00:00:00 2001
From: Damian Mazurkiewicz <damian@mazur.io>
Date: Thu, 14 Jan 2016 19:25:23 +0000
Subject: [PATCH] Fixed crashes when ArrayList was null in IPresenter.

---
 app/build.gradle                                       | 10 +++++-----
 app/src/main/AndroidManifest.xml                       |  2 ++
 .../com/bodyweight/fitness/presenter/IPresenter.java   |  6 +++++-
 app/src/main/res/values/strings.xml                    |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 806f7bb5..697382f0 100644
--- 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')
-}
\ No newline at end of file
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 12ec0340..ea241932 100644
--- 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
index 1b35adb1..8f3f8844 100644
--- 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
index a77cfb25..1eb7e392 100644
--- 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>