From: masensio <masensio@solidgear.es>
Date: Wed, 5 Feb 2014 08:01:46 +0000 (+0100)
Subject: OC-2823: Show toast message when CreateShareOperation failes
X-Git-Tag: oc-android-1.5.5~58^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e2af381b88f3c1bd93fc50e281322568319c9246?hp=--cc

OC-2823: Show toast message when CreateShareOperation failes
---

e2af381b88f3c1bd93fc50e281322568319c9246
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5a61a15a..1725ae38 100644
--- 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_file_error">An error occurred while trying to share this file or folder</string>
 </resources>
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index f04760c9..4647d5fb 100644
--- 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) {
-        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();
         }
         
     }