OC-2823: Show toast message when CreateShareOperation failes

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5a61a15..1725ae3 100644 (file)
--- a/res/values/strings.xml
+++ b/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_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>
 </resources>

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index f04760c..4647d5f 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1338,16 +1338,22 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
 
 
     private void onCreateShareOperationFinish(CreateShareOperation operation, RemoteOperationResult result) {
 
 
     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);
             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();

         }
         
     }
         }
         
     }