소스 검색

OC-2823: Show toast message when CreateShareOperation failes

masensio 11 년 전
부모
커밋
e2af381b88
2개의 변경된 파일13개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 0
      res/values/strings.xml
  2. 12 6
      src/com/owncloud/android/ui/activity/FileDisplayActivity.java

+ 1 - 0
res/values/strings.xml

@@ -248,4 +248,5 @@
 	
 	<string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your administrator.</string>
 	<string name="share_link_file_no_exist">Unable to share this file or folder. Please, make sure it exists</string>
+	<string name="share_link_file_error">An error occurred while trying to share this file or folder</string>
 </resources>

+ 12 - 6
src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -1338,16 +1338,22 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
 
 
     private void onCreateShareOperationFinish(CreateShareOperation operation, RemoteOperationResult result) {
-        if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
-            // Show a Message
-            Toast t = Toast.makeText(this, getString(R.string.share_link_file_no_exist), Toast.LENGTH_LONG);
-            t.show();
-            
-        } else if (result.isSuccess()) {
+        
+        if (result.isSuccess()) {
             refeshListOfFilesFragment();
 
             Intent sendIntent = operation.getSendIntent();
             startActivity(sendIntent);
+            
+        } else if (result.getCode() == ResultCode.FILE_NOT_FOUND) {    // Error --> SHARE_NOT_FOUND
+            // Show a Message
+            Toast t = Toast.makeText(this, getString(R.string.share_link_file_no_exist), Toast.LENGTH_LONG);
+            t.show();
+            
+        } else {    // Generic error
+            // Show a Message, operation finished without success
+            Toast t = Toast.makeText(this, getString(R.string.share_link_file_error), Toast.LENGTH_LONG);
+            t.show();
         }
         
     }