Merge pull request #14 from PAXSTORE/hotfix/v10.0.2

Hotfix/v10.0.2

Author: Apollolight

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         //https://github.com/novoda/bintray-release check latest version of novoda
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
@@ -21,7 +21,8 @@ allprojects {
         google()
         jcenter()
         maven { url 'https://jitpack.io' }
-        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
+        maven { url "https://central.sonatype.com/repository/maven-snapshots/" }
+
     }
     tasks.withType(Javadoc) {
         options{

demo/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
     defaultConfig {
         applicationId "com.pax.android.demoapp.cloudmsg"
         minSdkVersion 19
-        targetSdkVersion 30
+        targetSdkVersion 34
         versionCode 900
         versionName "10.0.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

gradle.properties

@@ -21,4 +21,4 @@ org.gradle.jvmargs=-Xmx1024m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-version=10.0.0
+version=10.0.2

sdk/build.gradle

@@ -1,8 +1,13 @@
 apply plugin: 'com.android.library'
 
-
+java {
+    toolchain {
+//        It is strongly recommended to set it to Java 8 or Java 11 for the best compatibility.
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 android {
-    compileSdkVersion 29
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 19
@@ -29,14 +34,19 @@ android {
         exclude 'META-INF/LICENSE'
     }
     namespace 'com.pax.market.android.app.sdk.msg'
+    compileOptions {
+        //It is strongly recommended to set it to Java 8 or Java 11 for the best compatibility.
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'org.slf4j:slf4j-api:1.7.12'
 
-    compileOnly 'com.whatspos.sdk:paxstore-3rd-app-java-sdk:10.0.0'
+    implementation 'com.whatspos.sdk:paxstore-3rd-app-java-sdk:10.0.1'
 
 }
 

sdk/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <application>
 
         <meta-data
@@ -10,6 +12,7 @@
 
         <service android:name="com.pax.market.android.app.sdk.msg.service.CloudMessageService"
             android:permission="com.market.android.app.sdk.CLOUD_MSG"
+            android:foregroundServiceType="dataSync"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.paxstore.mpush.CLOUD_MESSAGE_RECEIVED"/>

sdk/src/main/java/com/pax/market/android/app/sdk/msg/service/CloudMessageService.java

@@ -55,7 +55,7 @@ public CloudMessageService() {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        NotificationUtils.showForeGround(this, "Cloud message");
+        NotificationUtils.showForeGround(this, "Cloud message", NotificationUtils.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
         return super.onStartCommand(intent, flags, startId);
     }
 

sdk/src/main/java/com/pax/market/android/app/sdk/msg/utils/NotificationUtils.java

@@ -8,48 +8,67 @@
 import android.app.NotificationManager;
 import android.app.Service;
 import android.content.Context;
+import android.content.pm.ServiceInfo;
+import android.os.Build;
 
 import com.pax.market.android.app.sdk.msg.R;
 
 
 public class NotificationUtils {
     private static final int NOTIFICATION_ID = 1002;
 
-    private static final String LIBRARY_PACKAGE_NAME = "com.pax.market.android.app.sdk.msg";
+    public static final int FOREGROUND_SERVICE_TYPE_DATA_SYNC = 1 << 0;
 
+    private static final String LIBRARY_PACKAGE_NAME = "com.pax.market.android.app.sdk.msg";
     /**
-     *
-     * @param service
-     * @param smallIcon
-     * @param content
+     * @deprecated This method is deprecated because it does not support the mandatory
+     * foreground service types required by Android 14 (API 34).
+     * <b>Migration Guide:</b><br>
+     * Please migrate to {@link #showForeGround(Service, int, String, int)} to explicitly
+     * provide the correct service type for your business logic.
      */
     public static void showForeGround(Service service, int smallIcon, String content) {
-        NotificationChannel mChannel = null;
-        NotificationManager notificationManager = (NotificationManager) service.getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);
+        showForeGround(service, smallIcon, content, 0);
+    }
 
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            mChannel = new NotificationChannel(LIBRARY_PACKAGE_NAME, service.getApplicationContext().getString(R.string.app_name), NotificationManager.IMPORTANCE_NONE);
-            mChannel.setSound(null, null);
-            mChannel.enableVibration(false);
-            notificationManager.createNotificationChannel(mChannel);
+    /**
+     * @deprecated This method is deprecated because it does not support the mandatory
+     * foreground service types required by Android 14 (API 34).
+     * <b>Migration Guide:</b><br>
+     * Please migrate to {@link #showForeGround(Service, String, int)} to explicitly
+     * provide the correct service type for your business logic.
+     */
+    @Deprecated
+    public static void showForeGround(Service service, String content) {
+        showForeGround(service, content, 0);
+    }
 
-            Notification.Builder builder = new Notification.Builder(service.getApplicationContext(), LIBRARY_PACKAGE_NAME);
-            builder.setContentText(content);
-            builder.setSmallIcon(smallIcon);
-            builder.setAutoCancel(true);
-            builder.setShowWhen(true);
 
-            // 这里两个通知使用同一个id且必须按照这个顺序后调用startForeground
-            service.startForeground(NOTIFICATION_ID, builder.build());
-        }
+    /**
+     * Updated method to support Android 14 foreground service types.
+     *
+     * @param service               The Service instance.
+     * @param content               Content to display in the notification.
+     * @param foregroundServiceType The type(s) of foreground service,
+     *                              e.g., {@link ServiceInfo#FOREGROUND_SERVICE_TYPE_DATA_SYNC}.
+     */
+    public static void showForeGround(Service service, String content, int foregroundServiceType) {
+        showForeGround(service, PreferencesUtils.getInt(service, SP_SMALL_LOGO_ICON, R.drawable.ic_notificaiton), content, foregroundServiceType);
+
     }
 
+
     /**
+     * Updated method to support Android 14 foreground service types.
      *
-     * @param service
-     * @param content
+     * @param service               The Service instance.
+     * @param content               Content to display in the notification.
+     * @param smallIcon             The icon display in the notification.
+     * @param foregroundServiceType The type(s) of foreground service,
+     *                              e.g., {@link ServiceInfo#FOREGROUND_SERVICE_TYPE_DATA_SYNC}.
      */
-    public static void showForeGround(Service service, String content) {
+    public static void showForeGround(Service service, int smallIcon, String content, int foregroundServiceType) {
+
         NotificationChannel mChannel = null;
         NotificationManager notificationManager = (NotificationManager) service.getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);
 
@@ -61,12 +80,16 @@ public static void showForeGround(Service service, String content) {
 
             Notification.Builder builder = new Notification.Builder(service.getApplicationContext(), LIBRARY_PACKAGE_NAME);
             builder.setContentText(content);
-            builder.setSmallIcon(PreferencesUtils.getInt(service, SP_SMALL_LOGO_ICON, R.drawable.ic_notificaiton));
+            builder.setSmallIcon(smallIcon);
             builder.setAutoCancel(true);
             builder.setShowWhen(true);
 
-            // 这里两个通知使用同一个id且必须按照这个顺序后调用startForeground
-            service.startForeground(NOTIFICATION_ID, builder.build());
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { // API 34
+                service.startForeground(NOTIFICATION_ID, builder.build(), foregroundServiceType);
+            } else {
+                service.startForeground(NOTIFICATION_ID, builder.build());
+            }
         }
     }
+
 }