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

Add workaround for resource/folder when ACTION_VIEW fails while pointing to downloads directory #604

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Add workaround for resource/folder when ACTION_VIEW fails while pointing to downloads directory #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e27073f
add workaround for resource/folder mime types when view activity fail…
Sir-Photch Nov 1, 2023
f713c3e
limit workaround to download folder
Sir-Photch Nov 1, 2023
3567b8a
move logic to LocalFile.launch
Sir-Photch Nov 2, 2023
1bc0f6d
Update Context.kt
Sir-Photch Nov 2, 2023
2081f86
Merge remote-tracking branch 'upstream/main' into view-folder-activit…
Sir-Photch Nov 2, 2023
d5345c9
Merge branch 'view-folder-activity-not-found-workaround' of https://g…
Sir-Photch Nov 2, 2023
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
7 changes: 4 additions & 3 deletions app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,11 @@ class SearchVM : ViewModel(), KoinComponent {
fun launchBestMatchOrAction(context: Context) {
val bestMatch = bestMatch.value
if (bestMatch is SavableSearchable) {
bestMatch.launch(context, null)
favoritesService.reportLaunch(bestMatch)
if (bestMatch.launch(context, null))
favoritesService.reportLaunch(bestMatch)
return
} else if (bestMatch is SearchAction) {
}
if (bestMatch is SearchAction) {
bestMatch.start(context)
return
}
Expand Down
2 changes: 1 addition & 1 deletion core/ktx/src/main/java/de/mm20/launcher2/ktx/Context.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ fun Context.tryStartActivity(intent: Intent, bundle: Bundle? = null): Boolean {
} catch (e: SecurityException) {
false
}
}
}
15 changes: 14 additions & 1 deletion data/files/src/main/java/de/mm20/launcher2/files/providers/LocalFile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package de.mm20.launcher2.files.providers

import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.graphics.BitmapFactory
Expand Down Expand Up @@ -186,7 +187,19 @@ internal data class LocalFile(
}

override fun launch(context: Context, options: Bundle?): Boolean {
return context.tryStartActivity(getLaunchIntent(context), options)
if (context.tryStartActivity(getLaunchIntent(context), options))
return true

// startsWith allows path to end with a slash
if (isDirectory && path.startsWith("/storage/emulated/0/Download")) {
val aospViewDownloadsIntent = Intent()
.setComponent(ComponentName("com.android.documentsui", "com.android.documentsui.ViewDownloadsActivity"))
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION)

return context.tryStartActivity(aospViewDownloadsIntent, options)
}

return false
}

override val isDeletable: Boolean
Expand Down