diff options
| author | Álvaro Brey <alvaro.brey@nextcloud.com> | 2022-11-03 18:43:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-03 18:43:49 +0300 |
| commit | 0c04e336a3f921e56c0476edbbbb863aa6b867d2 (patch) | |
| tree | 48b4590f908c60c7ca89e692ce1227c7db5fb1a4 | |
| parent | 9569dcfd970a7893c8fcd6e9e1d5fe15309ab55e (diff) | |
| parent | 9e4bd1935f92b87fdb4be37525c248e058ec9f70 (diff) | |
Merge pull request #10976 from nextcloud/fix/webauthn-crash
Fix webauthn crashes due to PendingIntent mutability
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | build.gradle | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/build.gradle b/app/build.gradle index 79dc95509e..f99309c9ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -257,8 +257,8 @@ dependencies { implementation 'androidx.annotation:annotation:1.5.0' implementation 'com.vanniktech:emoji-google:0.9.0' - implementation "com.github.cotechde.hwsecurity:hwsecurity-fido:$fidoVersion" - implementation "com.github.cotechde.hwsecurity:hwsecurity-fido2:$fidoVersion" + implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$fidoVersion" + implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido2:$fidoVersion" // document scanner not available on FDroid (generic) due to OpenCV binaries gplayImplementation "com.github.zynkware:Document-Scanning-Android-SDK:$documentScannerVersion" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c78886a676..6bb4d2b4ba 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -344,7 +344,7 @@ <activity android:name=".authentication.AuthenticatorActivity" - android:configChanges="orientation|screenSize|keyboardHidden" + android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:exported="true" android:launchMode="singleTask" android:theme="@style/Theme.ownCloud.noActionBar.Login"> diff --git a/build.gradle b/build.gradle index ca4038e9ee..55cdab58e8 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { mockkVersion = "1.13.2" espressoVersion = "3.4.0" workRuntime = "2.7.1" - fidoVersion = "4.1.0" + fidoVersion = "4.1.0-patch1" checkerVersion = "3.21.2" exoplayerVersion = "2.18.1" documentScannerVersion = "1.0.1" |