Skip to content

Commit 73c7d0b

Browse files
Merge pull request #28 from getyoti/YM-26407
[YM-26407] Restore callback behaviour and make it compatible with Android 12
2 parents 38b7d01 + 7b4e3d3 commit 73c7d0b

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
restore-keys: |
1717
${{ runner.os }}-gradle${{ hashFiles('gradle/wrapper/gradle-wrapper.properties')}}-
1818
${{ runner.os }}-
19-
- name: set up JDK 1.8
19+
- name: Set up JDK 11
2020
uses: actions/setup-java@v1
2121
with:
22-
java-version: 1.8
22+
java-version: 11
2323

2424
- name: Run tests with Gradle
2525
run: ./gradlew testDebug --no-daemon

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
restore-keys: |
2020
${{ runner.os }}-gradle${{ hashFiles('gradle/wrapper/gradle-wrapper.properties')}}-
2121
${{ runner.os }}-
22-
- name: set up JDK 1.8
22+
- name: Set up JDK 11
2323
uses: actions/setup-java@v1
2424
with:
25-
java-version: 1.8
25+
java-version: 11
2626

2727
- name: Run tests with Gradle
2828
run: ./gradlew testDebug --no-daemon

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
minSdkVersionVersion=21
2525
targetSdkVersion=31
26-
compileSdkVersion=28
26+
compileSdkVersion=31
2727

2828
uiWidgetsVersion=1.9.0
2929
supportLibraryVersion=1.0.2
@@ -56,7 +56,7 @@ easyIDScheme=easyid://
5656
pomId=yoti-button-sdk
5757
pomGroup=com.yoti.mobile.android.sdk
5858
pomPackaging=aar
59-
pomVersion=1.3.3
59+
pomVersion=1.3.4
6060
pomName=Yoti Button SDK
6161
pomDescription=Button SDK that allows 3rd party to trigger Yoti as support app
6262
currentVersionCode=000013

yoti-sdk/src/main/java/com/yoti/mobile/android/sdk/ReceiverActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ protected void onCreate(Bundle savedInstanceState) {
1212

1313
Intent intent = new Intent(getIntent().getAction());
1414
intent.setPackage(getIntent().getPackage());
15+
intent.putExtras(getIntent().getExtras());
1516

1617
sendBroadcast(intent);
1718

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ private void handleActionStartScenario(String useCaseId, ResultReceiver resultRe
152152
}
153153

154154
int flags;
155-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
156-
flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;
155+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
156+
flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE;
157157
} else {
158158
flags = PendingIntent.FLAG_UPDATE_CURRENT;
159159
}

0 commit comments

Comments
 (0)