mirror of
https://github.com/nextcloud/android.git
synced 2024-11-29 10:49:04 +03:00
Merge pull request #13081 from nextcloud/improvement/show-snackbar-message-instead-throwing-exception
Show Snackbar Message Instead Throwing Exception For Sync Folder Operations
This commit is contained in:
commit
009bb25b22
2 changed files with 4 additions and 1 deletions
|
@ -804,7 +804,8 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
||||||
|
|
||||||
private void startSyncFolderOperation(OCFile folder) {
|
private void startSyncFolderOperation(OCFile folder) {
|
||||||
if (folder == null) {
|
if (folder == null) {
|
||||||
throw new IllegalArgumentException("Folder must not be null");
|
DisplayUtils.showSnackMessage(this, R.string.receive_external_files_activity_start_sync_folder_is_not_exists_message);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
long currentSyncTime = System.currentTimeMillis();
|
long currentSyncTime = System.currentTimeMillis();
|
||||||
|
|
|
@ -448,6 +448,8 @@
|
||||||
<string name="clipboard_unexpected_error">Unexpected error while copying to clipboard</string>
|
<string name="clipboard_unexpected_error">Unexpected error while copying to clipboard</string>
|
||||||
<string name="clipboard_label">Text copied from %1$s</string>
|
<string name="clipboard_label">Text copied from %1$s</string>
|
||||||
|
|
||||||
|
<string name="receive_external_files_activity_start_sync_folder_is_not_exists_message">Folder cannot be found, sync operation is cancelled</string>
|
||||||
|
|
||||||
<string name="error_cant_bind_to_operations_service">Critical error: Unable to perform operations</string>
|
<string name="error_cant_bind_to_operations_service">Critical error: Unable to perform operations</string>
|
||||||
|
|
||||||
<string name="network_error_socket_exception">An error occurred during connection to the server</string>
|
<string name="network_error_socket_exception">An error occurred during connection to the server</string>
|
||||||
|
|
Loading…
Reference in a new issue