Updated target SDK to 35. closes #562

Author: AchoArnold

android/app/build.gradle

@@ -15,12 +15,12 @@ def getGitHash = { ->
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.httpsms"
         minSdk 28
-        targetSdk 33
+        targetSdk 35
         versionCode 1
         versionName "${getGitHash()}"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -51,23 +51,23 @@ android {
 }
 
 dependencies {
-    implementation platform('com.google.firebase:firebase-bom:32.7.4')
+    implementation platform('com.google.firebase:firebase-bom:33.5.1')
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
     implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'com.google.firebase:firebase-messaging-ktx'
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'androidx.work:work-runtime-ktx:2.9.0'
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.work:work-runtime-ktx:2.10.0'
+    implementation 'androidx.core:core-ktx:1.15.0'
     implementation "androidx.cardview:cardview:1.0.0"
-    implementation 'com.beust:klaxon:5.5'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'org.apache.commons:commons-text:1.9'
-    implementation 'com.google.android.material:material:1.11.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'com.beust:klaxon:5.6'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'org.apache.commons:commons-text:1.12.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.core:core-ktx:1.15.0'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }

android/app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING"/>
 
     <application
         android:allowBackup="true"
@@ -47,7 +48,7 @@
             tools:ignore="LockedOrientationActivity" />
         <activity
         android:name="com.journeyapps.barcodescanner.CaptureActivity"
-        android:screenOrientation="portrait"
+        android:screenOrientation="fullSensor"
         tools:replace="screenOrientation"
         tools:ignore="DiscouragedApi" />
 
@@ -60,6 +61,7 @@
 
         <service
             android:name=".MyFirebaseMessagingService"
+            android:foregroundServiceType="remoteMessaging"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />

android/app/src/main/java/com/httpsms/LoginActivity.kt

@@ -120,6 +120,7 @@ class LoginActivity : AppCompatActivity() {
     }
 
     @SuppressLint("HardwareIds")
+    @Suppress("DEPRECATION")
     private fun getPhoneNumber(context: Context): String? {
         val telephonyManager = this.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
         if (ActivityCompat.checkSelfPermission(
@@ -291,8 +292,8 @@ class LoginActivity : AppCompatActivity() {
         }
 
         Thread {
-            val error = HttpSmsApiService(apiKey.text.toString(), URI(serverUrl.text.toString().trim())).validateApiKey()
-            liveData.postValue(error)
+            val response = HttpSmsApiService(apiKey.text.toString(), URI(serverUrl.text.toString().trim())).validateApiKey()
+            liveData.postValue(response)
             Timber.d("finished validating api URL")
         }.start()
     }

android/app/src/main/java/com/httpsms/Receiver.kt

@@ -1,7 +1,10 @@
 package com.httpsms
 
 import android.content.Context
+import android.content.Context.RECEIVER_EXPORTED
 import android.content.IntentFilter
+import android.os.Build
+import androidx.annotation.RequiresApi
 import timber.log.Timber
 
 object Receiver {
@@ -12,19 +15,35 @@ object Receiver {
         if(sentReceiver == null) {
             Timber.d("registering [sent] receiver for intent [${SmsManagerService.sentAction()}]")
             sentReceiver = SentReceiver()
-            context.registerReceiver(
-                sentReceiver,
-                IntentFilter(SmsManagerService.sentAction())
-            )
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                context.registerReceiver(
+                    sentReceiver,
+                    IntentFilter(SmsManagerService.sentAction()),
+                    RECEIVER_EXPORTED
+                )
+            } else {
+                context.registerReceiver(
+                    sentReceiver,
+                    IntentFilter(SmsManagerService.sentAction())
+                )
+            }
         }
 
         if(deliveredReceiver == null) {
             Timber.d("registering [delivered] receiver for intent [${SmsManagerService.deliveredAction()}]")
             deliveredReceiver = DeliveredReceiver()
-            context.registerReceiver(
-                deliveredReceiver,
-                IntentFilter(SmsManagerService.deliveredAction())
-            )
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                context.registerReceiver(
+                    deliveredReceiver,
+                    IntentFilter(SmsManagerService.deliveredAction()),
+                    RECEIVER_EXPORTED
+                )
+            } else {
+                context.registerReceiver(
+                    deliveredReceiver,
+                    IntentFilter(SmsManagerService.deliveredAction())
+                )
+            }
         }
     }
 

android/app/src/main/java/com/httpsms/SmsManagerService.kt

@@ -36,7 +36,7 @@ class SmsManagerService {
             } else {
                 context.getSystemService(SubscriptionManager::class.java)
             }
-            return localSubscriptionManager.activeSubscriptionInfoList.size > 1
+            return localSubscriptionManager.activeSubscriptionInfoList!!.size > 1
         }
     }
 
@@ -61,11 +61,11 @@ class SmsManagerService {
             context.getSystemService(SubscriptionManager::class.java)
         }
 
-        Timber.d("active subscription info size: [${localSubscriptionManager.activeSubscriptionInfoList.size}]")
-        val subscriptionId = if (sim == Constants.SIM1 && localSubscriptionManager.activeSubscriptionInfoList.size > 0) {
-            localSubscriptionManager.activeSubscriptionInfoList[0].subscriptionId
-        } else if (sim == Constants.SIM2 && localSubscriptionManager.activeSubscriptionInfoList.size > 1) {
-            localSubscriptionManager.activeSubscriptionInfoList[1].subscriptionId
+        Timber.d("active subscription info size: [${localSubscriptionManager.activeSubscriptionInfoList!!.size}]")
+        val subscriptionId = if (sim == Constants.SIM1 && localSubscriptionManager.activeSubscriptionInfoList!!.size > 0) {
+            localSubscriptionManager.activeSubscriptionInfoList!![0].subscriptionId
+        } else if (sim == Constants.SIM2 && localSubscriptionManager.activeSubscriptionInfoList!!.size > 1) {
+            localSubscriptionManager.activeSubscriptionInfoList!![1].subscriptionId
         } else{
             SubscriptionManager.getDefaultSmsSubscriptionId()
         }

android/app/src/main/java/com/httpsms/receivers/PhoneStateReceiver.kt

@@ -98,7 +98,7 @@ class PhoneStateReceiver : BroadcastReceiver() {
         }
 
         var sim = Constants.SIM1
-        localSubscriptionManager.activeSubscriptionInfoList.forEach {
+        localSubscriptionManager.activeSubscriptionInfoList!!.forEach {
             if (it.subscriptionId == subscriptionId) {
                if (it.simSlotIndex > 0){
                    sim = Constants.SIM2

android/build.gradle

@@ -11,7 +11,7 @@ buildscript {
     }
     dependencies {
         // Add this line
-        classpath 'com.google.gms:google-services:4.4.0'
+        classpath 'com.google.gms:google-services:4.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }