Merge pull request igniterealtime#641 from Flowdalic/android

Android improvements
Flowdalic · Oct 4, 2024 · e376f55 · e376f55
2 parents c354439 + e1cc1a4
commit e376f55
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
         uses: android-actions/setup-android@v3
       - name: Install Android SDK
         run: |
-          sdkmanager "platforms;android-21"
+          sdkmanager "platforms;android-23"
 
       # Testing
       - name: Gradle Check

diff --git a/build-logic/src/main/groovy/org.igniterealtime.smack.android-conventions.gradle b/build-logic/src/main/groovy/org.igniterealtime.smack.android-conventions.gradle
@@ -3,7 +3,7 @@ plugins {
 	id 'org.igniterealtime.smack.global-conventions'
 }
 dependencies {
-	signature "net.sf.androidscents.signature:android-api-level-${smackMinAndroidSdk}:5.0.1_r2@signature"
+	signature "net.sf.androidscents.signature:android-api-level-${smackMinAndroidSdk}:6.0_r3@signature"
 }
 animalsniffer {
 	sourceSets = [sourceSets.main]

diff --git a/build-logic/src/main/groovy/org.igniterealtime.smack.global-conventions.gradle b/build-logic/src/main/groovy/org.igniterealtime.smack.global-conventions.gradle
@@ -1,7 +1,7 @@
 ext {
 	javaVersion = JavaVersion.VERSION_11
 	javaMajor = javaVersion.getMajorVersion()
-	smackMinAndroidSdk = 21
+	smackMinAndroidSdk = 23
 
 	androidBootClasspath = { getAndroidRuntimeJar() }
 }

diff --git a/...nsions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java b/...nsions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java
@@ -36,6 +36,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.Build;
 import android.os.SystemClock;
 
 /**
@@ -174,7 +175,11 @@ public static void onCreate(Context context) {
         sContext = context;
         context.registerReceiver(ALARM_BROADCAST_RECEIVER, new IntentFilter(PING_ALARM_ACTION));
         sAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        sPendingIntent = PendingIntent.getBroadcast(context, 0, new Intent(PING_ALARM_ACTION), 0);
+        int pendingIntentFlags = 0;
+        if (Build.VERSION.SDK_INT >= 23) {
+            pendingIntentFlags |= PendingIntent.FLAG_IMMUTABLE;
+        }
+        sPendingIntent = PendingIntent.getBroadcast(context, 0, new Intent(PING_ALARM_ACTION), pendingIntentFlags);
         sAlarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP,
                 SystemClock.elapsedRealtime() + AlarmManager.INTERVAL_HALF_HOUR,
                 AlarmManager.INTERVAL_HALF_HOUR, sPendingIntent);

diff --git a/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java b/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java
@@ -37,6 +37,8 @@
 public class AndroidSmackInitializer implements SmackInitializer {
 
     @Override
+    // Android deprecated StrictHostnameVerifier in API level 22
+    @SuppressWarnings("deprecation")
     public List<Exception> initialize() {
         SmackConfiguration.setDefaultHostnameVerifier(new StrictHostnameVerifier());
         Base64.setEncoder(AndroidBase64Encoder.INSTANCE);