Merge branch 'develop' into send_file_pr311_with_develop

diff --combined res/menu/file_actions_menu.xml
index 73adda7,0572206..986ce3e
--- 1/res/menu/file_actions_menu.xml
--- 2/res/menu/file_actions_menu.xml
+++ b/res/menu/file_actions_menu.xml
@@@ -20,7 -20,8 +20,8 @@@
  <menu         xmlns:android="http://schemas.android.com/apk/res/android">
      
        <item   android:id="@+id/action_share_file"                             android:title="@string/action_share_file"                       android:icon="@android:drawable/ic_menu_share"                                  android:orderInCategory="1" />
-     <item     android:id="@+id/action_open_file_with"                 android:title="@string/actionbar_open_with"                     android:icon="@android:drawable/ic_menu_edit"                                   android:orderInCategory="1" />
+       <item   android:id="@+id/action_unshare_file"               android:title="@string/action_unshare_file"                 android:icon="@android:drawable/ic_menu_share"                                  android:orderInCategory="1" />
+     <item     android:id="@+id/action_open_file_with"                 android:title="@string/actionbar_open_with"                     android:icon="@android:drawable/ic_menu_edit"                                   android:orderInCategory="1" /> 
        <item   android:id="@+id/action_download_file"                  android:title="@string/filedetails_download"            android:icon="@drawable/ic_action_download"                                             android:orderInCategory="1" />
      <item     android:id="@+id/action_sync_file"                              android:title="@string/filedetails_sync_file"           android:icon="@drawable/ic_action_refresh"                                              android:orderInCategory="1" />
        <item   android:id="@+id/action_cancel_download"                android:title="@string/common_cancel_download"          android:icon="@android:drawable/ic_menu_close_clear_cancel"             android:orderInCategory="1" />
@@@ -28,6 -29,6 +29,6 @@@
        <item   android:id="@+id/action_rename_file"                    android:title="@string/common_rename"                           android:icon="@android:drawable/ic_menu_set_as"                                 android:orderInCategory="1" />
      <item     android:id="@+id/action_remove_file"                    android:title="@string/common_remove"                           android:icon="@android:drawable/ic_menu_delete"                                 android:orderInCategory="1" />
      <item     android:id="@+id/action_see_details"                    android:title="@string/actionbar_see_details"           android:icon="@android:drawable/ic_menu_info_details"                   android:orderInCategory="1" />
 -    <item     android:id="@+id/action_share_file"                             android:title="@string/actionbar_share_file"            android:icon="@android:drawable/ic_menu_info_details"                   android:orderInCategory="1" />
 +    <item     android:id="@+id/action_send_file"                              android:title="@string/actionbar_send_file"                     android:icon="@android:drawable/ic_menu_info_details"                   android:orderInCategory="1" />
      
  </menu>

diff --combined res/values-de-rCH/strings.xml
index f09e75c,5693825..db98bf6
--- 1/res/values-de-rCH/strings.xml
--- 2/res/values-de-rCH/strings.xml
+++ b/res/values-de-rCH/strings.xml
@@@ -10,7 -10,7 +10,7 @@@
    <string name="actionbar_mkdir">Ordner anlegen</string>
    <string name="actionbar_settings">Einstellungen</string>
    <string name="actionbar_see_details">Details</string>
-   <string name="actionbar_send_file">Datei Senden</string>
 -  <string name="actionbar_share_file">Freigeben</string>
++  <string name="actionbar_send_file">Freigeben</string>
    <string name="prefs_category_general">Allgemein</string>
    <string name="prefs_category_more">Mehr</string>
    <string name="prefs_accounts">Konten</string>

diff --combined res/values-de-rDE/strings.xml
index 64b43cb,494e22c..7943ca7
--- 1/res/values-de-rDE/strings.xml
--- 2/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@@ -10,7 -10,7 +10,7 @@@
    <string name="actionbar_mkdir">Ordner anlegen</string>
    <string name="actionbar_settings">Einstellungen</string>
    <string name="actionbar_see_details">Details</string>
-   <string name="actionbar_send_file">Datei senden</string>
 -  <string name="actionbar_share_file">Teilen</string>
++  <string name="actionbar_send_file">Teilen</string>
    <string name="prefs_category_general">Allgemein</string>
    <string name="prefs_category_more">Mehr</string>
    <string name="prefs_accounts">Konten</string>
@@@ -237,5 -237,6 +237,6 @@@
    <string name="share_link_no_support_share_api">Entschuldigung, Freigaben sind auf Ihrem Server nicht aktiviert. Bitte kontaktieren Sie Ihren Administrator.</string>
    <string name="share_link_file_no_exist">Die Freigabe der Datei oder des Ordners ist nicht möglich. Bitte stellen Sie sicher, dass diese existiert.</string>
    <string name="share_link_file_error">Es ist ein Fehler beim Freigeben der Datei oder des Ordners aufgetreten.</string>
+   <string name="unshare_link_file_no_exist">Das Entfernen der Freigabe für die Datei oder den Ordner ist nicht möglich. Diese existieren nicht.</string>
    <string name="unshare_link_file_error">Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten.</string>
  </resources>

diff --combined res/values-de/strings.xml
index 95d370d,c564a51..7fe82aa
--- 1/res/values-de/strings.xml
--- 2/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@@ -10,7 -10,7 +10,7 @@@
    <string name="actionbar_mkdir">Ordner anlegen</string>
    <string name="actionbar_settings">Einstellungen</string>
    <string name="actionbar_see_details">Details</string>
-   <string name="actionbar_send_file">Datei Senden</string>
 -  <string name="actionbar_share_file">Teilen</string>
++  <string name="actionbar_send_file">Teilen</string>
    <string name="prefs_category_general">Allgemein</string>
    <string name="prefs_category_more">Mehr</string>
    <string name="prefs_accounts">Konten</string>
@@@ -237,5 -237,6 +237,6 @@@
    <string name="share_link_no_support_share_api">Entschuldigung, Freigaben sind auf Deinem Server nicht aktiviert. Bitte kontaktiere Deinen Administrator.</string>
    <string name="share_link_file_no_exist">Die Freigabe der Datei oder des Ordners ist nicht möglich. Bitte stelle sicher, dass diese existiert.</string>
    <string name="share_link_file_error">Es ist ein Fehler beim Freigeben der Datei oder des Ordners aufgetreten.</string>
+   <string name="unshare_link_file_no_exist">Das Entfernen der Freigabe für die Datei oder den Ordner ist nicht möglich. Diese existieren nicht.</string>
    <string name="unshare_link_file_error">Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten.</string>
  </resources>

diff --combined res/values/strings.xml
index 601a703,6c392b2..822cb2a
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -11,7 -11,7 +11,7 @@@
      <string name="actionbar_mkdir">Create directory</string>
      <string name="actionbar_settings">Settings</string>
      <string name="actionbar_see_details">Details</string>
 -    <string name="actionbar_share_file">Share</string>
 +    <string name="actionbar_send_file">Send</string>
      <string name="prefs_category_general">General</string>
      <string name="prefs_category_more">More</string>
      <string name="prefs_accounts">Accounts</string>
@@@ -250,7 -250,6 +250,8 @@@
        <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>
+       <string name="unshare_link_file_no_exist">Unable to unshare this file or folder. It does not exist.</string>
        <string name="unshare_link_file_error">An error occurred while trying to unshare this file or folder</string>
 +      
 +      <string name="send_file_title_intent">Send</string>
  </resources>

diff --combined src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index d0f62ae,5780e58..5c6817e
--- 1/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
--- 2/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -222,7 -222,7 +222,7 @@@ public class OCFileListFragment extend
              toHide.add(R.id.action_cancel_upload);
              toHide.add(R.id.action_sync_file);
              toHide.add(R.id.action_see_details);
 -            toHide.add(R.id.action_share_file);
 +            toHide.add(R.id.action_send_file);
              if (    mContainerActivity.getFileDownloaderBinder().isDownloading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile) ||
                      mContainerActivity.getFileUploaderBinder().isUploading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)           ) {
                  toDisable.add(R.id.action_rename_file);
@@@ -259,6 -259,11 +259,11 @@@
                  toHide.add(R.id.action_cancel_upload);
              }
          }
+         
+         // Options shareLink
+         if (!targetFile.isShareByLink()) {
+             toHide.add(R.id.action_unshare_file);
+         }
  
          for (int i : toHide) {
              item = menu.findItem(i);
@@@ -284,12 -289,17 +289,17 @@@
      public boolean onContextItemSelected (MenuItem item) {
          AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();        
          mTargetFile = (OCFile) mAdapter.getItem(info.position);
-         switch (item.getItemId()) {
+         switch (item.getItemId()) {                
              case R.id.action_share_file: {
                  FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
                  activity.getFileOperationsHelper().shareFileWithLink(mTargetFile, activity);
                  return true;
              }
+             case R.id.action_unshare_file: {
+                 FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
+                 activity.getFileOperationsHelper().unshareFileWithLink(mTargetFile, activity);
+                 return true;
+             }
              case R.id.action_rename_file: {
                  String fileName = mTargetFile.getFileName();
                  int extensionStart = mTargetFile.isFolder() ? -1 : fileName.lastIndexOf(".");
@@@ -351,19 -361,19 +361,19 @@@
                  ((FileFragment.ContainerActivity)getActivity()).showDetails(mTargetFile);
                  return true;
              }
 -            case R.id.action_share_file: {
 +            case R.id.action_send_file: {
                  Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
                  // set MimeType
                  sharingIntent.setType(mTargetFile.getMimetype());
 -                sharingIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+mTargetFile.getStoragePath()));
 -                startActivity(Intent.createChooser(sharingIntent, "Share via")); 
 +                sharingIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + mTargetFile.getStoragePath()));
 +                startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.send_file_title_intent))); 
                  return true;
              }
              default:
                  return super.onContextItemSelected(item); 
          }
      }
-     
+ 
  
      /**
       * Use this to query the {@link OCFile} that is currently
@@@ -432,7 -442,7 +442,7 @@@
           * @param file
           */
          public void onBrowsedDownTo(OCFile folder);
-         
+ 
          public void startDownloadForPreview(OCFile file);
  
          public void startMediaPreview(OCFile file, int i, boolean b);

diff --combined src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 84cdcc6,88f40b8..80d5d1e
--- 1/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
--- 2/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@@ -176,8 -176,22 +176,22 @@@ public class PreviewImageFragment exten
          mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());
          if (savedInstanceState != null) {
              if (!mIgnoreFirstSavedState) {
-                 setFile((OCFile)savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE));
+                 OCFile file = (OCFile)savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE);
                  mAccount = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_ACCOUNT);
+                 
+                 // Update the file
+                 if (mAccount!= null) {
+                     mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());
+                     OCFile updatedFile = mStorageManager.getFileByPath(file.getRemotePath());
+                     if (updatedFile != null) {
+                         setFile(updatedFile);
+                     } else {
+                         setFile(file);
+                     }
+                 } else {
+                     setFile(file);
+                 }
+ 
              } else {
                  mIgnoreFirstSavedState = false;
              }
@@@ -230,6 -244,11 +244,11 @@@
          toHide.add(R.id.action_cancel_upload);
          toHide.add(R.id.action_download_file);
          toHide.add(R.id.action_rename_file);    // by now
+         
+         // Options shareLink
+         if (!getFile().isShareByLink()) {
+             toHide.add(R.id.action_unshare_file);
+         }
  
          for (int i : toHide) {
              item = menu.findItem(i);
@@@ -241,6 -260,27 +260,27 @@@
          
      }
  
+     /**
+      * {@inheritDoc}
+      */
+     @Override
+     public void onPrepareOptionsMenu(Menu menu) {
+         super.onPrepareOptionsMenu(menu);
+         
+         MenuItem item = menu.findItem(R.id.action_unshare_file);
+         // Options shareLink
+         OCFile file = ((FileActivity) getSherlockActivity()).getFile();
+         if (!file.isShareByLink()) {
+             item.setVisible(false);
+             item.setEnabled(false);
+         } else {
+             item.setVisible(true);
+             item.setEnabled(true);
+         }
+             
+     }
+ 
+     
      
      /**
       * {@inheritDoc}
@@@ -253,6 -293,11 +293,11 @@@
                  act.getFileOperationsHelper().shareFileWithLink(getFile(), act);
                  return true;
              }
+             case R.id.action_unshare_file: {
+                 FileActivity act = (FileActivity)getSherlockActivity();
+                 act.getFileOperationsHelper().unshareFileWithLink(getFile(), act);
+                 return true;
+             }
              case R.id.action_open_file_with: {
                  openFile();
                  return true;
@@@ -265,8 -310,8 +310,8 @@@
                  seeDetails();
                  return true;
              }
 -            case R.id.action_share_file: {
 -                shareFile();
 +            case R.id.action_send_file: {
 +                sendFile();
                  return true;
              }
              
@@@ -275,15 -320,16 +320,16 @@@
          }
      }
      
 -    private void shareFile(){
 +    private void sendFile(){
          Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
          // set MimeType
          sharingIntent.setType(getFile().getMimetype());
          sharingIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+getFile().getStoragePath()));
 -        startActivity(Intent.createChooser(sharingIntent, "Share via"));
 +        startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.send_file_title_intent)));
      }
  
      
+ 
      private void seeDetails() {
          ((FileFragment.ContainerActivity)getActivity()).showDetails(getFile());        
      }