Bump 1.6.8

pluscubed · Nov 2, 2018 · 32b1c29 · 32b1c29
1 parent 945bbfd
commit 32b1c29
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -43,8 +43,8 @@ android {
         applicationId "com.pluscubed.velociraptor"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 44
-        versionName "1.6.7"
+        versionCode 45
+        versionName "1.6.8"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [appName: "@string/app_name"]
         multiDexEnabled true
@@ -135,7 +135,6 @@ dependencies {
     implementation "com.android.support:support-annotations:$support_version"
     implementation "com.android.support:cardview-v7:$support_version"
     implementation "com.android.support:design:$support_version"
-    implementation "com.android.support:customtabs:$support_version"
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     implementation "com.google.firebase:firebase-core:16.0.4"

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -99,4 +99,7 @@
 -dontwarn java.lang.invoke.*
 
 #DbInspector
--dontwarn org.apache.commons.**
+-dontwarn org.apache.commons.**
+
+#Billing library
+-keep class com.android.vending.billing.**
diff --git a/app/src/main/java/com/pluscubed/velociraptor/api/osm/OsmLimitProvider.java b/app/src/main/java/com/pluscubed/velociraptor/api/osm/OsmLimitProvider.java
@@ -57,6 +57,8 @@ public OsmLimitProvider(Context context, OkHttpClient client, LimitCache osmCach
         int resId = context.getResources().getIdentifier("overpass_api", "string", context.getPackageName());
         if (resId != 0) {
             endpointUrl = context.getString(resId);
+        } else {
+            Timber.d("Private overpass_api not set");
         }
         OsmApiEndpoint endpoint = new OsmApiEndpoint(endpointUrl);
         initializeOsmService(endpoint);

diff --git a/app/src/main/java/com/pluscubed/velociraptor/billing/BillingManager.java b/app/src/main/java/com/pluscubed/velociraptor/billing/BillingManager.java
@@ -89,7 +89,7 @@ public void run() {
      */
     @Override
     public void onPurchasesUpdated(int resultCode, List<Purchase> purchases) {
-        if (resultCode == BillingResponse.OK) {
+        if (resultCode == BillingResponse.OK && purchases != null) {
             for (Purchase purchase : purchases) {
                 handlePurchase(purchase);
             }
@@ -278,13 +278,17 @@ public void run() {
                             = billingClient.queryPurchases(SkuType.SUBS);
                     Log.i(TAG, "Querying purchases and subscriptions elapsed time: "
                             + (System.currentTimeMillis() - time) + "ms");
-                    Log.i(TAG, "Querying subscriptions result code: "
-                            + subscriptionResult.getResponseCode()
-                            + " res: " + subscriptionResult.getPurchasesList().size());
+                    if (subscriptionResult.getPurchasesList() != null) {
+                        Log.i(TAG, "Querying subscriptions result code: "
+                                + subscriptionResult.getResponseCode()
+                                + " res: " + subscriptionResult.getPurchasesList().size());
+                    }
 
                     if (subscriptionResult.getResponseCode() == BillingResponse.OK) {
-                        purchasesResult.getPurchasesList().addAll(
-                                subscriptionResult.getPurchasesList());
+                        if (subscriptionResult.getPurchasesList() != null && purchasesResult.getPurchasesList() != null) {
+                            purchasesResult.getPurchasesList().addAll(
+                                    subscriptionResult.getPurchasesList());
+                        }
                     } else {
                         Log.e(TAG, "Got an error response trying to query subscription purchases");
                     }

diff --git a/app/src/main/res/raw/changelog.html b/app/src/main/res/raw/changelog.html
@@ -22,6 +22,12 @@
     </style>
 </head>
 <body>
+    <h4>v1.6.8 - 11/1/18</h4>
+    <ul>
+        <li>Fix crashes</li>
+    </ul>
+    <br />
+
     <h4>v1.6.7 - 10/28/18</h4>
     <ul>
         <li>Fix minor bugs, update internals</li>

diff --git a/build.gradle b/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
     ext{
-        kotlin_version = '1.2.71'
+        kotlin_version = '1.3.0'
     }
 
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-beta01'
+        classpath 'com.android.tools.build:gradle:3.3.0-beta02'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
         classpath 'com.google.gms:google-services:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"