OneSignal · jinliu9508 · Aug 13, 2024 · Aug 13, 2024 · Aug 13, 2024 · Aug 13, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:

 jobs:
  build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
    steps:
      - uses: actions/checkout@v4
      - name: "[Setup] Java"

diff --git a/Examples/OneSignalDemo/app/build.gradle b/Examples/OneSignalDemo/app/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }

 android {
+    namespace 'com.onesignal.sdktest'
    compileSdkVersion 34
    defaultConfig {
        minSdkVersion 21
@@ -61,10 +62,11 @@ android {
    }

    task flavorSelection() {
-        if (getGradle().getStartParameter().getTaskRequests().toString().contains("Gms")) {
+        def tasksList = gradle.startParameter.taskRequests.toString()
+        if (tasksList.contains('Gms')) {
            apply plugin: 'com.google.gms.google-services'
            googleServices { disableVersionCheck = true }
-        } else {
+        } else if (tasksList.contains('Huawei')) {
            apply plugin: 'com.huawei.agconnect'
        }
    }
@@ -83,12 +85,12 @@ dependencies {
    implementation 'com.github.bumptech.glide:glide:4.12.0'

    /** START - Google Play Builds **/
-    gmsImplementation('com.onesignal:OneSignal:5.1.31')
+    gmsImplementation('com.onesignal:OneSignal:5.2.0-beta-02')
    /** END - Google Play Builds **/

    /** START - Huawei Builds **/
    // Omit Google / Firebase libraries for Huawei builds.
-    huaweiImplementation('com.onesignal:OneSignal:5.1.31') {
+    huaweiImplementation('com.onesignal:OneSignal:5.2.0-beta-02') {
        exclude group: 'com.google.android.gms', module: 'play-services-gcm'
        exclude group: 'com.google.android.gms', module: 'play-services-analytics'
        exclude group: 'com.google.android.gms', module: 'play-services-location'

diff --git a/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml b/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:amazon="http://schemas.amazon.com/apk/res/android"
-    package="com.onesignal.sdktest">
+    xmlns:amazon="http://schemas.amazon.com/apk/res/android">

    <uses-permission android:name="com.android.vending.BILLING" />


diff --git a/...es/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java b/...es/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java
@@ -6,9 +6,10 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.multidex.MultiDexApplication;
-
 import com.onesignal.Continue;
+import com.onesignal.IUserJwtInvalidatedListener;
 import com.onesignal.OneSignal;
+import com.onesignal.UserJwtInvalidatedEvent;
 import com.onesignal.inAppMessages.IInAppMessageClickListener;
 import com.onesignal.inAppMessages.IInAppMessageClickEvent;
 import com.onesignal.inAppMessages.IInAppMessageDidDismissEvent;
@@ -20,7 +21,6 @@
 import com.onesignal.notifications.IDisplayableNotification;
 import com.onesignal.notifications.INotificationLifecycleListener;
 import com.onesignal.notifications.INotificationWillDisplayEvent;
-import com.onesignal.sdktest.BuildConfig;
 import com.onesignal.sdktest.R;
 import com.onesignal.sdktest.constant.Tag;
 import com.onesignal.sdktest.constant.Text;
@@ -38,9 +38,8 @@ public class MainApplication extends MultiDexApplication {
    private static final int SLEEP_TIME_TO_MIMIC_ASYNC_OPERATION = 2000;

    public MainApplication() {
-        // run strict mode default in debug mode to surface any potential issues easier
-        if(BuildConfig.DEBUG)
-            StrictMode.enableDefaults();
+        // run strict mode to surface any potential issues easier
+        StrictMode.enableDefaults();
    }

    @SuppressLint("NewApi")
@@ -140,6 +139,13 @@ public void onUserStateChange(@NonNull UserChangedState state) {
            }
        });

+        OneSignal.addUserJwtInvalidatedListener(new IUserJwtInvalidatedListener() {
+            @Override
+            public void onUserJwtInvalidated(@NonNull UserJwtInvalidatedEvent event) {
+                Log.v(Tag.LOG_TAG, "onUserJwtInvalidated fired with ID:" + event.getExternalId());
+            }
+        });
+
        OneSignal.getInAppMessages().setPaused(true);
        OneSignal.getLocation().setShared(false);


diff --git a/...es/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java b/...es/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java
@@ -18,6 +18,7 @@
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.Switch;
@@ -83,6 +84,10 @@ public class MainActivityViewModel implements ActivityViewModel, IPushSubscripti
    private Button loginUserButton;
    private Button logoutUserButton;

+    // JWT
+    private Button invalidateJwtButton;
+    private Button updateJwtButton;
+
    // Alias
    private TextView aliasTitleTextView;
    private RecyclerView aliasesRecyclerView;
@@ -211,6 +216,9 @@ public ActivityViewModel onActivityCreated(Context context) {
        loginUserButton = getActivity().findViewById(R.id.main_activity_login_user_button);
        logoutUserButton = getActivity().findViewById(R.id.main_activity_logout_user_button);

+        invalidateJwtButton = getActivity().findViewById(R.id.main_activity_invalidate_jwt_button);
+        updateJwtButton = getActivity().findViewById(R.id.main_activity_update_jwt_button);
+
        aliasTitleTextView = getActivity().findViewById(R.id.main_activity_aliases_title_text_view);
        noAliasesTextView = getActivity().findViewById(R.id.main_activity_aliases_no_aliases_text_view);
        addAliasButton = getActivity().findViewById(R.id.main_activity_add_alias_button);
@@ -422,6 +430,7 @@ public void onFailure() {
    }

    private void setupUserLayout() {
+        setupJWTLayout();
        setupAliasLayout();
        setupEmailLayout();
        setupSMSLayout();
@@ -430,6 +439,28 @@ private void setupUserLayout() {
        setupTriggersLayout();
    }

+    private void setupJWTLayout() {
+        invalidateJwtButton.setOnClickListener(v -> {
+            OneSignal.updateUserJwt(OneSignal.getUser().getExternalId(), "");
+        });
+        updateJwtButton.setOnClickListener(v -> {
+            dialog.createUpdateAlertDialog("", Dialog.DialogAction.UPDATE, ProfileUtil.FieldType.JWT, new UpdateAlertDialogCallback() {
+                @Override
+                public void onSuccess(String update) {
+                    if (update != null && !update.isEmpty()) {
+                        OneSignal.updateUserJwt(OneSignal.getUser().getExternalId(), update);
+                        refreshState();
+                    }
+                }
+
+                @Override
+                public void onFailure() {
+
+                }
+            });
+        });
+    }
+
    private void setupAliasLayout() {
        setupAliasesRecyclerView();
        addAliasButton.setOnClickListener(v -> dialog.createAddPairAlertDialog("Add Alias", ProfileUtil.FieldType.ALIAS, new AddPairAlertDialogCallback() {

diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/ProfileUtil.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/ProfileUtil.java
@@ -13,6 +13,7 @@ public enum FieldType {
        ALIAS("Alias"),
        EMAIL("Email"),
        SMS("SMS"),
+        JWT("JWT"),
        EXTERNAL_USER_ID("External User Id"),

        TAG("Tags"),
@@ -97,6 +98,10 @@ public static boolean isSMSValid(TextInputLayout smsTextInputLayout) {
        return true;
    }

+    private static boolean isJWTValid(TextInputLayout jwtTextInputLayout) {
+        return !jwtTextInputLayout.getEditText().toString().isEmpty();
+    }
+
    private static boolean isExternalUserIdValid(TextInputLayout externalUserIdTextInputLayout) {
        externalUserIdTextInputLayout.setErrorEnabled(false);
        if (externalUserIdTextInputLayout.getEditText() != null) {
@@ -137,6 +142,8 @@ static boolean isContentValid(FieldType field, TextInputLayout alertDialogTextIn
                return isEmailValid(alertDialogTextInputLayout);
            case SMS:
                return isSMSValid(alertDialogTextInputLayout);
+            case JWT:
+                return isJWTValid(alertDialogTextInputLayout);
            case EXTERNAL_USER_ID:
                return isExternalUserIdValid(alertDialogTextInputLayout);
            case TAG:

diff --git a/Examples/OneSignalDemo/app/src/main/res/layout/main_activity_layout.xml b/Examples/OneSignalDemo/app/src/main/res/layout/main_activity_layout.xml
@@ -152,20 +152,20 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="start|center_vertical"
-                    android:gravity="start|center_vertical"
-                    android:layout_marginBottom="4dp"
                    android:layout_marginStart="12dp"
                    android:layout_marginLeft="12dp"
+                    android:layout_marginBottom="4dp"
+                    android:gravity="start|center_vertical"
                    android:text="@string/app"
                    android:textColor="@color/colorDarkText" />

                <androidx.cardview.widget.CardView
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="12dp"
                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="4dp"
                    android:layout_marginEnd="12dp"
+                    android:layout_marginBottom="12dp"
                    app:cardCornerRadius="6dp"
                    app:cardElevation="4dp">

@@ -226,23 +226,23 @@
                    android:layout_width="match_parent"
                    android:layout_height="56dp"
                    android:layout_gravity="center"
-                    android:gravity="center"
                    android:layout_marginStart="12dp"
                    android:layout_marginTop="4dp"
                    android:layout_marginEnd="12dp"
                    android:layout_marginBottom="12dp"
-                    android:orientation="vertical"
-                    android:background="@color/colorPrimary">
+                    android:background="@color/colorPrimary"
+                    android:gravity="center"
+                    android:orientation="vertical">

                    <Button
                        android:id="@+id/main_activity_app_revoke_consent_button"
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
+                        android:background="@drawable/ripple_selector_white_red"
                        android:text="@string/revoke_consent"
-                        android:textSize="19sp"
                        android:textColor="@android:color/white"
-                        android:background="@drawable/ripple_selector_white_red"
-                        android:visibility="visible"/>
+                        android:textSize="19sp"
+                        android:visibility="visible" />

                </LinearLayout>

@@ -263,11 +263,11 @@
                        android:id="@+id/main_activity_login_user_button"
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
+                        android:background="@drawable/ripple_selector_white_red"
                        android:text="@string/login_user"
-                        android:textSize="19sp"
                        android:textColor="@android:color/white"
-                        android:background="@drawable/ripple_selector_white_red"
-                        android:visibility="visible"/>
+                        android:textSize="19sp"
+                        android:visibility="visible" />

                </LinearLayout>

@@ -288,14 +288,97 @@
                        android:id="@+id/main_activity_logout_user_button"
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
+                        android:background="@drawable/ripple_selector_white_red"
                        android:text="@string/logout_user"
-                        android:textSize="19sp"
                        android:textColor="@android:color/white"
-                        android:background="@drawable/ripple_selector_white_red"
-                        android:visibility="visible"/>
+                        android:textSize="19sp"
+                        android:visibility="visible" />
                </LinearLayout>
            </LinearLayout>

+            <LinearLayout
+                android:id="@+id/main_activity_jwt_linear_layout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/main_activity_jwt_title_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start|center_vertical"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginBottom="4dp"
+                    android:gravity="start|center_vertical"
+                    android:text="@string/JWT"
+                    android:textColor="@color/colorDarkText" />
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginEnd="12dp"
+                    android:layout_marginBottom="12dp"
+                    app:cardCornerRadius="6dp"
+                    app:cardElevation="4dp">
+
+                    <LinearLayout
+                        android:id="@+id/main_activity_jwt_details_linear_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:layout_marginTop="4dp"
+                            android:background="@color/colorPrimary"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <Button
+                                android:id="@+id/main_activity_invalidate_jwt_button"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/ripple_selector_white_red"
+                                android:text="@string/invalidate_JWT"
+                                android:textColor="@android:color/white"
+                                android:textSize="19sp"
+                                android:visibility="visible" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:layout_marginTop="4dp"
+                            android:background="@color/colorPrimary"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <Button
+                                android:id="@+id/main_activity_update_jwt_button"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/ripple_selector_white_red"
+                                android:text="@string/update_JWT"
+                                android:textColor="@android:color/white"
+                                android:textSize="19sp"
+                                android:visibility="visible" />
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                </androidx.cardview.widget.CardView>
+
+            </LinearLayout>
+
            <!-- Aliases -->
            <LinearLayout
                android:id="@+id/main_activity_aliases_linear_layout"

diff --git a/Examples/OneSignalDemo/app/src/main/res/values/strings.xml b/Examples/OneSignalDemo/app/src/main/res/values/strings.xml
@@ -9,6 +9,11 @@
    <string name="login_user">Login User</string>
    <string name="logout_user">Logout User</string>

+    <string name="JWT">JWT</string>
+    <string name="invalidate_JWT">Invalidate JWT</string>
+    <string name="update_JWT">Update JWT</string>
+    <string name="no_jwt_added">No JWT Added</string>
+
    <string name="aliases">Aliases</string>
    <string name="external_user_id_colon">EUID:</string>
    <string name="no_aliases_added">No Aliases Added</string>

diff --git a/Examples/OneSignalDemo/build.gradle b/Examples/OneSignalDemo/build.gradle
@@ -12,9 +12,9 @@ buildscript {
        maven { url 'https://developer.huawei.com/repo/' }
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:8.8.2'
        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.huawei.agconnect:agcp:1.6.2.300'
+        classpath 'com.huawei.agconnect:agcp:1.9.1.304'

        // TODO: Do not place your application dependencies here; they belong
        //  in the individual module build.gradle files

diff --git a/Examples/OneSignalDemo/gradle/wrapper/gradle-wrapper.properties b/Examples/OneSignalDemo/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists