From 5a65b3b96b522d72cf18cf797d7bb16df276d11f Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 23 Feb 2017 11:06:47 +0100
Subject: [PATCH] correct checking for valid subscription

---
 Habitica/build.gradle                                     | 8 ++++----
 .../habitrpgwrapper/lib/models/SubscriptionPlan.java      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 1e24d535e..d91ee3688 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -62,10 +62,10 @@ dependencies {
     compile('com.mikepenz:materialdrawer:5.3.6@aar') {
         transitive = true
     }
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
-    compile 'com.android.support:recyclerview-v7:25.1.0'
-    compile 'com.android.support:preference-v14:25.1.0'
+    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:design:25.1.1'
+    compile 'com.android.support:recyclerview-v7:25.1.1'
+    compile 'com.android.support:preference-v14:25.1.1'
     compile 'com.android.support:multidex:1.0.1'
 
     //QR Code
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
index 879ae27ba..d1950d84d 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
@@ -50,7 +50,7 @@ public class SubscriptionPlan extends BaseModel {
 
     public boolean isActive() {
         Date today = new Date();
-        return (this.dateCreated != null && this.dateCreated.before(today)) && (this.dateTerminated == null || this.dateTerminated.after(today));
+        return planId != null && this.dateTerminated == null || this.dateTerminated.after(today);
     }
 
     @Override