OC-3079: (fix bug) Two send options appear after send and mail with a ownCloud file

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 3c8b477..ed4f9ee 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -34,6 +34,7 @@ import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.SyncRequest;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.SyncRequest;

+import android.content.res.Configuration;

 import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;
 import android.net.Uri;


@@ -223,6 +224,10 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
             unbindService(mUploadConnection);
     }
 
             unbindService(mUploadConnection);
     }
 

+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }

 
     /**
      *  Called when the ownCloud {@link Account} associated to the Activity was just updated.
 
     /**
      *  Called when the ownCloud {@link Account} associated to the Activity was just updated.


@@ -1625,7 +1630,8 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     public void startDownloadForSending(OCFile file) {
         mWaitingToSend = file;
         requestForDownload(mWaitingToSend);
     public void startDownloadForSending(OCFile file) {
         mWaitingToSend = file;
         requestForDownload(mWaitingToSend);

-        updateFragmentsVisibility(true);
+        boolean hasSecondFragment = (getSecondFragment()!= null);
+        updateFragmentsVisibility(hasSecondFragment);

     }
     
     private void requestForDownload(OCFile file) {
     }
     
     private void requestForDownload(OCFile file) {


@@ -1639,7 +1645,6 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     }
     
     private void sendDownloadedFile(){
     }
     
     private void sendDownloadedFile(){

-        dismissLoadingDialog();

         getFileOperationsHelper().sendDownloadedFile(mWaitingToSend, this);
         mWaitingToSend = null;
     }
         getFileOperationsHelper().sendDownloadedFile(mWaitingToSend, this);
         mWaitingToSend = null;
     }