From: masensio <masensio@solidgear.es>
Date: Sat, 1 Feb 2014 18:38:36 +0000 (+0100)
Subject: OC-2771: Add pop-up message if the server doesn't support Share API and Share Link... 
X-Git-Tag: oc-android-1.5.5~58^2~17
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0f7d8d84534f9d2f5928f2867c5e5b2bdc4ff1c0?ds=inline;hp=--cc

OC-2771: Add pop-up message if the server doesn't support Share API and Share Link option is selected
---

0f7d8d84534f9d2f5928f2867c5e5b2bdc4ff1c0
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7ae67dc1..b4fff221 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -244,4 +244,6 @@
     <string name="failed_upload_retry_do_nothing_text">do nothing you are not online for instant upload</string>
 	<string name="failed_upload_failure_text">Failure Message: </string>
 	<string name="failed_upload_quota_exceeded_text">Please check your server configuration,maybe your quota is exceeded.</string>
+	
+	<string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your administrator.</string>
 </resources>
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 1927d75e..e26843b1 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -75,7 +75,6 @@ import com.owncloud.android.lib.operations.common.RemoteOperation;
 import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 import com.owncloud.android.lib.operations.common.ShareType;
 import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
-
 import com.owncloud.android.operations.CreateShareOperation;
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
@@ -1347,6 +1346,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         } else if (operation instanceof CreateFolderOperation) {
             onCreateFolderOperationFinish((CreateFolderOperation)operation, result);
         }
+        
     }
 
 
@@ -1572,9 +1572,21 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
 
 
     public void shareFileWithLink(OCFile file) {
+        
+        if (isSharedSupported()) {
+            // Create the Share
             CreateShareOperation createShare = new CreateShareOperation(file.getRemotePath(), ShareType.PUBLIC_LINK, "", false, "", 1);
             createShare.execute(getStorageManager(), this, this, mHandler, this);
-        
+            
+            // TODO
+            // Get the link --> when the operation is finished
+            
+        } else {
+            // Show a Message
+            Toast t = Toast.makeText(this, getString(R.string.share_link_no_support_share_api), Toast.LENGTH_LONG);
+            t.show();
+            
+        }
     }
     
 }