Skip to content

Commit 36b7528

Browse files
david-allisonmikehardy
authored andcommitted
fix: revert workaround for broken AGP [8.6.1]
We're now on AGP 8.7.1 and this is fixed: https://issuetracker.google.com/issues/367752734 * remove `open = true` * fix error Reverts part of 7db4ea9 * androidGradlePlugin 8.6.1 broke lint if using `.toLong()` in a `@LongDef` https://issuetracker.google.com/issues/367752734 was been raised and `open = true` was temporarily added on broken `@LongDef` instances Related 17086 Related 17263 Fixes 17265
1 parent 4244b2f commit 36b7528

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

AnkiDroid/src/main/java/com/ichi2/compat/PackageManagerCompat.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ const val GET_ATTRIBUTIONS = -0x80000000 // API 31
129129

130130
@LongDef(
131131
flag = true,
132-
open = true, // HACK: AGP 8.6.1 broke .toLong(): https://issuetracker.google.com/issues/367752734
133132
// prefix = ["GET_", "MATCH_"],
134133
value = [
135134
AndroidPackageManager.GET_ACTIVITIES.toLong(),

AnkiDroid/src/main/java/com/ichi2/compat/ResolveInfoCompat.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ const val MATCH_DIRECT_BOOT_UNAWARE = 0x00040000
152152

153153
@LongDef(
154154
flag = true,
155-
open = true, // HACK: AGP 8.6.1 broke .toLong(): https://issuetracker.google.com/issues/367752734
156155
// prefix = ["GET_", "MATCH_"],
157156
value = [
158157
GET_META_DATA.toLong(),

AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabsHelper.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.browser.customtabs.CustomTabsService
2222
import com.ichi2.compat.CompatHelper.Companion.queryIntentActivitiesCompat
2323
import com.ichi2.compat.CompatHelper.Companion.resolveActivityCompat
2424
import com.ichi2.compat.CompatHelper.Companion.resolveServiceCompat
25+
import com.ichi2.compat.GET_RESOLVED_FILTER
2526
import com.ichi2.compat.ResolveInfoFlagsCompat
2627
import timber.log.Timber
2728

@@ -110,7 +111,7 @@ object CustomTabsHelper {
110111
val pm = context.packageManager
111112
val handlers = pm.queryIntentActivitiesCompat(
112113
intent,
113-
ResolveInfoFlagsCompat.of(PackageManager.GET_RESOLVED_FILTER.toLong())
114+
ResolveInfoFlagsCompat.of(GET_RESOLVED_FILTER.toLong())
114115
)
115116
if (handlers.isEmpty()) {
116117
return false

AnkiDroid/src/main/java/com/ichi2/utils/AdaptionUtil.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import android.provider.Settings
2828
import com.ichi2.anki.AnkiDroidApp
2929
import com.ichi2.compat.CompatHelper.Companion.getPackageInfoCompat
3030
import com.ichi2.compat.CompatHelper.Companion.queryIntentActivitiesCompat
31+
import com.ichi2.compat.MATCH_DEFAULT_ONLY
3132
import com.ichi2.compat.PackageInfoFlagsCompat
3233
import com.ichi2.compat.ResolveInfoFlagsCompat
3334
import timber.log.Timber
@@ -74,7 +75,7 @@ object AdaptionUtil {
7475
}
7576
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("http://www.google.com"))
7677
val pm = context.packageManager
77-
val list = pm.queryIntentActivitiesCompat(intent, ResolveInfoFlagsCompat.of(PackageManager.MATCH_DEFAULT_ONLY.toLong()))
78+
val list = pm.queryIntentActivitiesCompat(intent, ResolveInfoFlagsCompat.of(MATCH_DEFAULT_ONLY.toLong()))
7879
for (ri in list) {
7980
if (!isValidBrowser(ri)) {
8081
continue

0 commit comments

Comments
 (0)