Skip to content
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

Fix CardContentProvider to support parallel builds #17310

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
+63 −28
Open

Fix CardContentProvider to support parallel builds #17310

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
259f12d
Fix: include application id in CardContentProvider's authority and pe…
iamllama Oct 26, 2024
338a577
Fix: add const and fix naming
iamllama Oct 26, 2024
700e757
Fix: add convenience methods for authority, perm and uris
iamllama Oct 28, 2024
04513c2
Fix: Use constants from FlashCardsContract instead of hardcoding them
iamllama Oct 28, 2024
333a568
Fix: Use getPermission in ContentProviderTest
iamllama Oct 28, 2024
449829f
Fix: READ_WRITE_PERMISSION can't be const
iamllama Oct 28, 2024
9b3f5c5
Remove unused hardcoded build config fields
iamllama Oct 28, 2024
086d146
Fix: lint
iamllama Oct 28, 2024
26b876d
Fix: change convenience uri methods to take authority instead of pack…
iamllama Oct 28, 2024
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
12 changes: 8 additions & 4 deletions AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,12 @@ class CardContentProvider : ContentProvider() {
return sanitized.toTypedArray()
}

// Follows the format in the manifest
private const val AUTHORITY = "${BuildConfig.APPLICATION_ID}.flashcards"
private const val PERMISSION = "${BuildConfig.APPLICATION_ID}.permission.READ_WRITE_DATABASE"

init {
fun addUri(path: String, code: Int) = sUriMatcher.addURI(FlashCardsContract.AUTHORITY, path, code)
fun addUri(path: String, code: Int) = sUriMatcher.addURI(AUTHORITY, path, code)
// Here you can see all the URIs at a glance
addUri("notes", NOTES)
addUri("notes_v2", NOTES_V2)
Expand Down Expand Up @@ -1230,16 +1234,16 @@ class CardContentProvider : ContentProvider() {

private fun hasReadWritePermission(): Boolean {
return if (BuildConfig.DEBUG) { // Allow self-calling of the provider only in debug builds (e.g. for unit tests)
context!!.checkCallingOrSelfPermission(FlashCardsContract.READ_WRITE_PERMISSION) == PackageManager.PERMISSION_GRANTED
context!!.checkCallingOrSelfPermission(PERMISSION) == PackageManager.PERMISSION_GRANTED
} else {
context!!.checkCallingPermission(FlashCardsContract.READ_WRITE_PERMISSION) == PackageManager.PERMISSION_GRANTED
context!!.checkCallingPermission(PERMISSION) == PackageManager.PERMISSION_GRANTED
}
}

/** Returns true if the calling package is known to be "rogue" and should be blocked.
* Calling package might be rogue if it has not declared #READ_WRITE_PERMISSION in its manifest */
private fun knownRogueClient(): Boolean =
!context!!.arePermissionsDefinedInManifest(callingPackage!!, FlashCardsContract.READ_WRITE_PERMISSION)
!context!!.arePermissionsDefinedInManifest(callingPackage!!, PERMISSION)
}

/** replaces [anki:play...] with [sound:] */
Expand Down