Release 0.1.9

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 16
-        versionName "0.1.8"
+        versionCode 17
+        versionName "0.1.9"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -76,9 +76,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
     implementation "androidx.activity:activity-ktx:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.4"
+    implementation "androidx.fragment:fragment-ktx:1.2.5"
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.core:core:1.3.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
@@ -99,20 +99,22 @@ dependencies {
     implementation 'io.michaelrocks:bimap:1.0.2'
 
     // Google Maps v3 Beta
-    implementation name:'maps-sdk-3.0.0-beta', ext:'aar'
-    implementation name:'places-maps-sdk-3.0.0-beta', ext:'aar'
+    implementation 'com.google.android.libraries.maps:maps:3.1.0-beta'
+    implementation name:'places-maps-sdk-3.1.0-beta', ext:'aar'
     implementation 'com.google.maps.android:android-maps-utils-v3:1.3.3'
-    implementation 'com.google.android.gms:play-services-basement:17.3.0'
+    implementation 'com.android.volley:volley:1.1.1'
     implementation 'com.google.android.gms:play-services-base:17.3.0'
+    implementation 'com.google.android.gms:play-services-basement:17.3.0'
     implementation 'com.google.android.gms:play-services-gcm:17.0.0'
     implementation 'com.google.android.gms:play-services-location:17.0.0'
-    implementation 'com.google.android.gms:play-services-clearcut:17.0.0'
-    implementation 'com.android.volley:volley:1.1.1'
+    implementation 'com.google.android.gms:play-services-tasks:17.1.0'
+    implementation 'com.google.auto.value:auto-value-annotations:1.6.3'
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    implementation 'com.google.android.datatransport:transport-runtime:2.2.3'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
     // navigation library
-    def nav_version = "2.3.0-beta01"
+    def nav_version = "2.3.0-rc01"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
@@ -128,7 +130,7 @@ dependencies {
     implementation "androidx.room:room-ktx:$room_version"
 
     // billing library
-    def billing_version = "2.2.1"
+    def billing_version = "3.0.0"
     implementation "com.android.billingclient:billing:$billing_version"
     implementation "com.android.billingclient:billing-ktx:$billing_version"
 

app/src/main/java/net/vonforst/evmap/viewmodel/DonateViewModel.kt

@@ -20,12 +20,12 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
             override fun onBillingServiceDisconnected() {
             }
 
-            override fun onBillingSetupFinished(p0: BillingResult?) {
+            override fun onBillingSetupFinished(p0: BillingResult) {
                 loadProducts()
 
                 // consume pending purchases
                 val purchases = billingClient.queryPurchases(BillingClient.SkuType.INAPP)
-                purchases.purchasesList.forEach {
+                purchases.purchasesList?.forEach {
                     if (!it.isAcknowledged) {
                         consumePurchase(it.purchaseToken, false)
                     }
@@ -53,7 +53,7 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
             )
             .build()
         billingClient.querySkuDetailsAsync(params) { result, details ->
-            if (result.responseCode == BillingClient.BillingResponseCode.OK) {
+            if (result.responseCode == BillingClient.BillingResponseCode.OK && details != null) {
                 products.value = Resource.success(details
                     .sortedBy { it.priceAmountMicros }
                     .map { DonationItem(it) }