Skip to content

Commit 8be45e3

Browse files
committed
Fixed error message coming after camera permission allowed.
1 parent e625f45 commit 8be45e3

3 files changed

Lines changed: 5 additions & 0 deletions

File tree

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,9 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
458458
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
459459
// permission was granted
460460
getFileOperationsHelper().uploadFromCamera(this, FileDisplayActivity.REQUEST_CODE__UPLOAD_FROM_CAMERA);
461+
} else if (!shouldShowRequestPermissionRationale(permissions[0])) {
462+
// user CHECKED "never ask again"
463+
DisplayUtils.showSnackMessage(this, R.string.camera_permission_rationale);
461464
}
462465
break;
463466
default:

app/src/main/res/values-de/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,7 @@
944944
<string name="version_dev_download">Herunterladen</string>
945945
<string name="video_overlay_icon">Video Überlagerungsicon</string>
946946
<string name="wait_a_moment">Bitte warten…</string>
947+
<string name="camera_permission_rationale">Bitte geben Sie unter Apps &amp; Benachrichtigungen in den Einstellungen manuell die Erlaubnis.</string>
947948
<string name="wait_checking_credentials">Überprüfe gespeicherte Anmeldeinformationen</string>
948949
<string name="wait_for_tmp_copy_from_private_storage">Kopiere Datei von privatem Speicher</string>
949950
<string name="webview_version_check_alert_dialog_message">Bitte aktualisieren Sie die Android System WebView-App für eine Anmeldung</string>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@
10071007
<string name="link_name">Link Name</string>
10081008
<string name="delete_link">Delete Link</string>
10091009
<string name="share_settings">Settings</string>
1010+
<string name="camera_permission_rationale">Please navigate to App info in settings and give permission manually.</string>
10101011
<string name="common_confirm">Confirm</string>
10111012
<string name="strict_mode">Strict mode: no HTTP connection allowed!</string>
10121013
<string name="destination_filename">Destination filename</string>

0 commit comments

Comments
 (0)