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

Jump to bottom

fix(boot-service): execute on later Android versions #17154

Merged
merged 2 commits into from
Sep 28, 2024
Merged

fix(boot-service): execute on later Android versions #17154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
347043a
refactor(permissions): rename method
david-allison Sep 28, 2024
f44530b
fix(boot-service): execute on later Android versions
david-allison Sep 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
2 changes: 1 addition & 1 deletion AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ open class AnkiDroidApp : Application(), Configuration.Provider, ChangeManager.S
LanguageUtil.setDefaultBackendLanguages()

// Create the AnkiDroid directory if missing. Send exception report if inaccessible.
if (Permissions.hasStorageAccessPermission(this)) {
if (Permissions.hasLegacyStorageAccessPermission(this)) {
try {
val dir = CollectionHelper.getCurrentAnkiDroidDirectory(this)
CollectionHelper.initializeAnkiDroidDirectory(dir)
Expand Down
4 changes: 2 additions & 2 deletions AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import com.ichi2.utils.ImportUtils.showImportUnsuccessfulDialog
import com.ichi2.utils.IntentUtil.resolveMimeType
import com.ichi2.utils.NetworkUtils
import com.ichi2.utils.Permissions
import com.ichi2.utils.Permissions.hasStorageAccessPermission
import com.ichi2.utils.Permissions.hasLegacyStorageAccessPermission
import com.ichi2.utils.copyToClipboard
import com.ichi2.utils.trimToLength
import timber.log.Timber
Expand Down Expand Up @@ -272,7 +272,7 @@ class IntentHandler : AbstractIntentHandler() {
* @return `true`: if granted, otherwise `false` and shows a missing permission toast
*/
fun grantedStoragePermissions(context: Context, showToast: Boolean): Boolean {
val granted = !ScopedStorageService.isLegacyStorage(context) || hasStorageAccessPermission(context) || Permissions.isExternalStorageManagerCompat()
val granted = !ScopedStorageService.isLegacyStorage(context) || hasLegacyStorageAccessPermission(context) || Permissions.isExternalStorageManagerCompat()

if (!granted && showToast) {
showThemedToast(context, context.getString(R.string.intent_handler_failed_no_storage_permission), false)
Expand Down
8 changes: 5 additions & 3 deletions AnkiDroid/src/main/java/com/ichi2/anki/services/BootService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,27 @@ import android.content.Context
import android.content.Intent
import androidx.core.app.PendingIntentCompat
import com.ichi2.anki.CollectionManager
import com.ichi2.anki.IntentHandler.Companion.grantedStoragePermissions
import com.ichi2.anki.R
import com.ichi2.anki.preferences.Preferences
import com.ichi2.anki.preferences.sharedPrefs
import com.ichi2.anki.showThemedToast
import com.ichi2.annotations.NeedsTest
import com.ichi2.libanki.Collection
import com.ichi2.libanki.utils.Time
import com.ichi2.libanki.utils.TimeManager
import com.ichi2.utils.Permissions.hasStorageAccessPermission
import timber.log.Timber
import java.util.Calendar

@NeedsTest("Check on various Android versions that this can execute")
class BootService : BroadcastReceiver() {
private var failedToShowNotifications = false
override fun onReceive(context: Context, intent: Intent) {
if (sWasRun) {
Timber.d("BootService - Already run")
return
}
if (!hasStorageAccessPermission(context)) {
if (!grantedStoragePermissions(context, showToast = false)) {
Timber.w("Boot Service did not execute - no permissions")
return
}
Expand Down Expand Up @@ -67,7 +69,7 @@ class BootService : BroadcastReceiver() {
// getInstance().getColSafe
return try {
CollectionManager.getColUnsafe()
} catch (e: Exception) {
} catch (e: Error) { // java.lang.UnsatisfiedLinkError occurs in tests
Timber.e(e, "Failed to get collection for boot service - possibly media ejecting")
null
}
Expand Down
7 changes: 5 additions & 2 deletions AnkiDroid/src/main/java/com/ichi2/utils/Permissions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.annotation.RequiresApi
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import com.ichi2.anki.IntentHandler
import com.ichi2.anki.common.utils.android.isRobolectric
import com.ichi2.compat.CompatHelper.Companion.getPackageInfoCompat
import com.ichi2.compat.PackageInfoFlagsCompat
Expand Down Expand Up @@ -116,11 +117,13 @@ object Permissions {
/**
* Check if we have read and write access permission to the external storage
* Note: This can return true >= R on a debug build or if storage is preserved
*
* @see IntentHandler.grantedStoragePermissions
*
* @param context
* @return
*/
@JvmStatic // unit tests were flaky - maybe remove later
fun hasStorageAccessPermission(context: Context): Boolean {
fun hasLegacyStorageAccessPermission(context: Context): Boolean {
return hasStorageReadAccessPermission(context) && hasStorageWriteAccessPermission(context)
}

Expand Down