Merge pull request #23 from getyoti/YM-25652

[YM-25652] Update pending intent flags

Author: Pedro Martins

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.3.1] - 2022-02-22
+### Changed
+- Update pending intent flags to support Android 12.
+
 ## [1.3.0] - 2021-07-20
 ### Added
 - Added attribute buttonTheme to the YotiSDKButton for applying the theme.

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.4'
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.20.0"
     }
 }

gradle.properties

@@ -22,7 +22,7 @@
 
 
 minSdkVersionVersion=21
-targetSdkVersion=28
+targetSdkVersion=31
 compileSdkVersion=28
 
 uiWidgetsVersion=1.9.0
@@ -56,9 +56,9 @@ easyIDScheme=easyid://
 pomId=yoti-button-sdk
 pomGroup=com.yoti.mobile.android.sdk
 pomPackaging=aar
-pomVersion=1.3.0
+pomVersion=1.3.1
 pomDescription=Button SDK that allows 3rd party to trigger Yoti as support app
-currentVersionCode=000010
+currentVersionCode=000011
 
 pomLicenseName=MIT
 pomLicenseUrl=https://github.com/getyoti/android-sdk-button/blob/master/LICENSE.md

sample-app-2/src/main/AndroidManifest.xml

@@ -15,6 +15,7 @@
 
         <activity
             android:name="com.yoti.mobile.android.sampleapp2.MainActivity"
+            android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/SampleAppFullScreenTheme">
             <intent-filter>
@@ -24,13 +25,17 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name="com.yoti.mobile.android.sampleapp2.recievers.ShareAttributesResultBroadcastReceiver" android:exported="false">
+        <receiver
+            android:name="com.yoti.mobile.android.sampleapp2.recievers.ShareAttributesResultBroadcastReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.yoti.services.CALLBACK" />
             </intent-filter>
         </receiver>
 
-        <activity android:name="com.yoti.mobile.android.sampleapp2.ProfileActivity" />
+        <activity
+            android:name="com.yoti.mobile.android.sampleapp2.ProfileActivity"
+            android:exported="false" />
 
         <service
             android:name="com.yoti.mobile.android.sampleapp2.services.CallbackIntentService"

sample-app-3/src/main/AndroidManifest.xml

@@ -11,17 +11,21 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.yoti.mobile.android.sdk.sampleapp.MainActivity"
-            android:theme="@style/SampleAppTheme"
-            android:launchMode="singleInstance">
+        <activity
+            android:name="com.yoti.mobile.android.sdk.sampleapp.MainActivity"
+            android:exported="true"
+            android:launchMode="singleInstance"
+            android:theme="@style/SampleAppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <receiver android:name="com.yoti.mobile.android.sdk.sampleapp.ShareAttributesResultBroadcastReceiver" android:exported="false">
+        <receiver
+            android:name="com.yoti.mobile.android.sdk.sampleapp.ShareAttributesResultBroadcastReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.test.app.YOTI_CALLBACK" />
                 <action android:name="com.test.app.BACKEND_CALLBACK" />

sample-app/src/main/AndroidManifest.xml

@@ -12,7 +12,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/SampleAppTheme">
             <intent-filter>
@@ -22,7 +24,9 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name=".ShareAttributesResultBroadcastReceiver" android:exported="false">
+        <receiver
+            android:name=".ShareAttributesResultBroadcastReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.test.app.YOTI_CALLBACK" />
                 <action android:name="com.test.app.BACKEND_CALLBACK" />

yoti-sdk/src/main/AndroidManifest.xml

@@ -2,6 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.yoti.mobile.android.sdk">
 
+    <queries>
+        <package android:name="com.yoti.mobile.android.live" />
+        <package android:name="com.postofficeid.mobile.android.live" />
+    </queries>
+
     <application
         android:label="@string/app_name">
         <activity android:name=".ReceiverActivity"

yoti-sdk/src/main/java/com/yoti/mobile/android/sdk/kernelSDK/KernelSDKIntentService.java

@@ -6,6 +6,7 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.net.Uri;
+import android.os.Build;
 import android.os.ResultReceiver;
 import android.text.TextUtils;
 
@@ -150,8 +151,15 @@ private void handleActionStartScenario(String useCaseId, ResultReceiver resultRe
             intent.setData(uri);
         }
 
+        int flags;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;
+        } else {
+            flags = PendingIntent.FLAG_UPDATE_CURRENT;
+        }
         Intent wakeupIntent = new Intent(this, ReceiverActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 1, wakeupIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 1, wakeupIntent, flags);
+
 
         intent.putExtra(YOTI_PENDING_INTENT_EXTRA, pendingIntent);