From 5f131c6a656d68d850d4fe228ad0bf7caf054fe9 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Wed, 21 Aug 2024 10:54:27 +0200
Subject: [PATCH] Upgrade sdk from 33 to 34 and billing to 7.0

---
 app/build.gradle                              | 14 ++--
 app/src/main/AndroidManifest.xml              | 82 +++++++++++++------
 .../handhistory/replayer/ReplayerView.kt      |  8 +-
 .../android/util/LocationManager.kt           | 16 ++--
 4 files changed, 75 insertions(+), 45 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f342fba3..9cfa1716 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,7 +17,7 @@ repositories {
 
 android {
 
-    compileSdkVersion 33
+    compileSdkVersion 34
     buildToolsVersion "30.0.3"
 
     compileOptions {
@@ -33,7 +33,7 @@ android {
     defaultConfig {
         applicationId "net.pokeranalytics.android"
         minSdkVersion 23
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 168
         versionName "6.0.26"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -118,7 +118,7 @@ dependencies {
     implementation 'com.google.android.libraries.places:places:2.3.0'
 
     // Billing / Subscriptions
-    implementation 'com.android.billingclient:billing:5.0.0'
+    implementation 'com.android.billingclient:billing:7.0.0'
 
     // Import the BoM for the Firebase platform
     implementation platform('com.google.firebase:firebase-bom:26.1.0')
@@ -160,10 +160,10 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
 
     // Instrumented Tests
-    androidTestImplementation 'androidx.test:core:1.3.0'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test:core:1.6.1'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
 
     // Test
     testImplementation 'junit:junit:4.13.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f77e7ecf..895a27aa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,137 +83,165 @@
         <activity
             android:name="net.pokeranalytics.android.ui.modules.session.SessionActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <!-- No screenOrientation="portrait" to fix Oreo crash -->
         <activity
             android:name="net.pokeranalytics.android.ui.modules.feed.NewDataMenuActivity"
             android:launchMode="singleTop"
-            android:theme="@style/PokerAnalyticsTheme.MenuDialog" />
+            android:theme="@style/PokerAnalyticsTheme.MenuDialog"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden"/>
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:exported="true"/>
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollDetailsActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.Top10Activity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.SettingsActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.GraphActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ProgressReportActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ComparisonReportActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.calendar.CalendarDetailsActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ComparisonChartActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.datalist.DataListActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.filter.FiltersListActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.data.EditableDataActivity"
             android:launchMode="standard"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.CurrenciesActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.filter.FiltersActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.GDPRActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.BillingActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ReportCreationActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.TableReportActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.settings.DealtHandsPerHourActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.calendar.GridCalendarActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.settings.TransactionFilterActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
         <!-- No screenOrientation="portrait" to fix Oreo crash -->
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ColorPickerActivity"
             android:theme="@style/PokerAnalyticsTheme.AlertDialog"
-            android:launchMode="singleTop"/>
+            android:launchMode="singleTop"
+            android:exported="true"/>
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.components.CameraActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:exported="true" />
 
-        <service android:name="net.pokeranalytics.android.ui.modules.handhistory.replayer.ReplayExportService" android:exported="false"/>
+        <service
+            android:name="net.pokeranalytics.android.ui.modules.handhistory.replayer.ReplayExportService"
+            android:exported="false"/>
 
         <meta-data
             android:name="preloaded_fonts"
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerView.kt
index 4072b8a7..e580ab5d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerView.kt
@@ -32,13 +32,9 @@ class ReplayerView(context: Context, attrs: AttributeSet) : View(context, attrs)
 
 	}
 
-	override fun onDraw(canvas: Canvas?) {
+	override fun onDraw(canvas: Canvas) {
 		super.onDraw(canvas)
-
-		canvas?.let {
-			this.animator.drawTable(canvas, context)
-		}
-
+		this.animator.drawTable(canvas, context)
 	}
 
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/util/LocationManager.kt b/app/src/main/java/net/pokeranalytics/android/util/LocationManager.kt
index c6fc9654..a3677f30 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/LocationManager.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/LocationManager.kt
@@ -175,13 +175,14 @@ class LocationManager(private var context: Context) {
 		var locationResultReceived = false
 
 		val locationCallback = object : LocationCallback() {
-			override fun onLocationResult(locationResult: LocationResult?) {
+
+			override fun onLocationResult(locationResult: LocationResult) {
 				super.onLocationResult(locationResult)
 
-				locationResult?.locations?.let {
-					if (!locationResultReceived && it.isNotEmpty()) {
+				locationResult.locations.firstOrNull()?.let { location ->
+					if (!locationResultReceived) {
 						locationResultReceived = true
-						callback(it.first())
+						callback(location)
 						fusedLocationClient.removeLocationUpdates(this)
 					}
 				}
@@ -194,7 +195,12 @@ class LocationManager(private var context: Context) {
 			locationRequest.interval = 200L
 			locationRequest.priority = LocationRequest.PRIORITY_HIGH_ACCURACY
 
-			fusedLocationClient.requestLocationUpdates(locationRequest, locationCallback, Looper.myLooper())
+			Looper.myLooper()?.let { looper ->
+				fusedLocationClient.requestLocationUpdates(locationRequest, locationCallback, looper)
+			} ?: run {
+				callback.invoke(null)
+			}
+
 		} else {
 			// If we don't have the permission, return null
 			callback.invoke(null)