Skip to content

Android: Fix geolocation help dialog display logic #1302

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

Open
g-maxime wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Android: Fix geolocation help dialog display logic #1302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 20 additions & 43 deletions Source/GUI/Android/app/src/main/java/net/mediaarea/mediainfo/ReportListActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,6 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)

// If user wants to enable ACCESS_MEDIA_LOCATION permission, but the prompt has been blocked
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
&& permissions.isNotEmpty() && grantResults.isNotEmpty()
&& permissions[0] == android.Manifest.permission.ACCESS_MEDIA_LOCATION
&& grantResults[0] == PackageManager.PERMISSION_DENIED
&& !shouldShowRequestPermissionRationale(permissions[0])) {
showGeolocationHelpDialog()
pendingFileUris.clear()
return
}

// Handle result
when (requestCode) {
READ_EXTERNAL_STORAGE_PERMISSION_REQUEST -> {
Expand Down Expand Up @@ -135,17 +124,6 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {
startActivity(intent)
}

private fun showGeolocationHelpDialog() {
MaterialAlertDialogBuilder(this)
.setTitle(R.string.permissions_geolocation_title)
.setMessage(R.string.permissions_geolocation_help)
.setPositiveButton(android.R.string.ok) { _, _ ->
openPermissionsSettings()
}
.setNegativeButton(android.R.string.cancel, null)
.show()
}

override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
}
Expand Down Expand Up @@ -194,28 +172,27 @@ class ReportListActivity : AppCompatActivity(), ReportActivityListener {

@RequiresApi(Build.VERSION_CODES.Q)
private fun requestMediaLocationPermission(requestCode: Int) {
MaterialAlertDialogBuilder(this)
.setTitle(R.string.permissions_geolocation_title)
.setMessage(R.string.permissions_geolocation_summary)
.setPositiveButton(android.R.string.ok) { _, _ ->
ActivityCompat.requestPermissions(
this@ReportListActivity,
arrayOf(android.Manifest.permission.ACCESS_MEDIA_LOCATION),
requestCode
)
}
.setNegativeButton(android.R.string.cancel) { _, _ ->
when (requestCode) {
ACCESS_MEDIA_LOCATION_PERMISSION_REQUEST_OPENFILE -> {
openFile.launch("*/*") // Lets user open files anyway, even if the location data may be redacted out
}
ACCESS_MEDIA_LOCATION_PERMISSION_REQUEST_SENDFILE -> {
reportModel.addFiles(contentResolver, pendingFileUris.toList()) // Create a copy of pendingFileUris to avoid getting a cleared item in reportModel.addFiles@viewModelScope subroutine
pendingFileUris.clear()
}
if (shouldShowRequestPermissionRationale(android.Manifest.permission.ACCESS_MEDIA_LOCATION)) {
MaterialAlertDialogBuilder(this)
.setTitle(R.string.permissions_geolocation_title)
.setMessage(R.string.permissions_geolocation_summary)
.setCancelable(false)
.setPositiveButton(android.R.string.ok) { _, _ ->
Comment on lines +175 to +180
ActivityCompat.requestPermissions(
this@ReportListActivity,
arrayOf(android.Manifest.permission.ACCESS_MEDIA_LOCATION),
requestCode
)
}
}
.show()
.show()
}
else {
ActivityCompat.requestPermissions(
this@ReportListActivity,
arrayOf(android.Manifest.permission.ACCESS_MEDIA_LOCATION),
requestCode
)
}
}

private fun handleIntent(intent: Intent) {
Expand Down