Skip to content

Commit 917bd5d

Browse files
committed
Fixed error message coming after camera permission allowed.
1 parent a5578e9 commit 917bd5d

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
@@ -456,6 +456,9 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
456456
// permission was granted
457457
getFileOperationsHelper()
458458
.uploadFromCamera(this, FileDisplayActivity.REQUEST_CODE__UPLOAD_FROM_CAMERA);
459+
} else if (!shouldShowRequestPermissionRationale(permissions[0])) {
460+
// user CHECKED "never ask again"
461+
DisplayUtils.showSnackMessage(this, R.string.camera_permission_rationale);
459462
}
460463
break;
461464
default:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,7 @@
911911
<string name="version_dev_download">Herunterladen</string>
912912
<string name="video_overlay_icon">Video Überlagerungsicon</string>
913913
<string name="wait_a_moment">Bitte warten…</string>
914+
<string name="camera_permission_rationale">Bitte geben Sie unter Apps &amp; Benachrichtigungen in den Einstellungen manuell die Erlaubnis.</string>
914915
<string name="wait_checking_credentials">Überprüfe gespeicherte Anmeldeinformationen</string>
915916
<string name="wait_for_tmp_copy_from_private_storage">Kopiere Datei von privatem Speicher</string>
916917
<string name="what_s_new_image">Was-gibt\'s-Neues-Bild</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,7 @@
991991
<string name="link_name">Link Name</string>
992992
<string name="delete_link">Delete Link</string>
993993
<string name="share_settings">Settings</string>
994+
<string name="camera_permission_rationale">Please navigate to App info in settings and give permission manually.</string>
994995
<string name="common_confirm">Confirm</string>
995996
<string name="strict_mode">Strict mode: no HTTP connection allowed!</string>
996997
<string name="destination_filename">Destination filename</string>

0 commit comments

Comments
 (0)