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 error message after camera permission declined. #117

Closed
wants to merge 1 commit into from
Closed

Fix error message after camera permission declined. #117

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,9 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
// permission was granted
getOCFileListFragmentFromFile().directCameraUpload();
} else if (!shouldShowRequestPermissionRationale(permissions[0])) {
// user CHECKED "never ask again"
DisplayUtils.showSnackMessage(this, R.string.camera_permission_rationale);
}
break;
default:
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,7 @@
<string name="version_dev_download">Herunterladen</string>
<string name="video_overlay_icon">Video Überlagerungsicon</string>
<string name="wait_a_moment">Bitte warten…</string>
<string name="camera_permission_rationale">Bitte geben Sie unter Apps &amp; Benachrichtigungen in den Einstellungen manuell die Erlaubnis.</string>
<string name="wait_checking_credentials">Überprüfe gespeicherte Anmeldeinformationen</string>
<string name="wait_for_tmp_copy_from_private_storage">Kopiere Datei von privatem Speicher</string>
<string name="webview_version_check_alert_dialog_message">Bitte aktualisieren Sie die Android System WebView-App für eine Anmeldung</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,7 @@
<string name="link_name">Link Name</string>
<string name="delete_link">Delete Link</string>
<string name="share_settings">Settings</string>
<string name="camera_permission_rationale">Please navigate to App info in settings and give permission manually.</string>
surinder-tsys marked this conversation as resolved.
Show resolved Hide resolved
<string name="common_confirm">Confirm</string>
<string name="strict_mode">Strict mode: no HTTP connection allowed!</string>
<string name="destination_filename">Destination filename</string>
Expand Down