Skip to content

Fido: fix support when targetSdk>=35 #2887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mar-v-in merged 4 commits into from
Jun 1, 2025
+19 −11
Merged

Fido: fix support when targetSdk>=35 #2887

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2cb40d
Fido: fix support when targetSdk>=35
p1gp1g May 2, 2025
2dd92ac
Fido: fix receiver registration for SDK>=34
p1gp1g May 2, 2025
50327f6
Fido: clean imports
p1gp1g May 2, 2025
094b80b
Use ContextCompat.registerReceiver
mar-v-in Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion ...s-fido/core/src/main/kotlin/org/microg/gms/fido/core/transport/nfc/NfcTransportHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
package org.microg.gms.fido.core.transport.nfc

import android.app.Activity
import android.app.ActivityOptions
import android.app.PendingIntent
import android.content.Intent
import android.content.IntentFilter
import android.nfc.NfcAdapter
import android.nfc.Tag
import android.nfc.tech.IsoDep
import android.os.Build.VERSION.SDK_INT
import android.util.Log
import androidx.core.app.OnNewIntentProvider
import androidx.core.app.PendingIntentCompat
Expand Down Expand Up @@ -39,7 +41,17 @@ class NfcTransportHandler(private val activity: Activity, callback: TransportHan

private suspend fun waitForNewNfcTag(adapter: NfcAdapter): Tag {
val intent = Intent(activity, activity.javaClass).apply { addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP) }
val pendingIntent: PendingIntent = PendingIntentCompat.getActivity(activity, 0, intent, 0, true)!!
val piOptions = if (SDK_INT >= 34) {
ActivityOptions.makeBasic().apply {
pendingIntentCreatorBackgroundActivityStartMode =
ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
}.toBundle()
} else null
val pendingIntent: PendingIntent = PendingIntentCompat.getActivity(
activity, 0, intent,
0,
piOptions,
true)!!
adapter.enableForegroundDispatch(
activity,
pendingIntent,
Expand Down