From ebcc9b98e3df0cbaf69a863d9260f6e341482db2 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Thu, 6 Mar 2014 16:29:21 +0100
Subject: [PATCH] Alternative solution for fix in 10f99ceb9ca... enforcing
 dialog dissmiss instead of introducing false specific onConfigurationChange

---
 AndroidManifest.xml                                           | 6 +++---
 src/com/owncloud/android/ui/activity/FileDisplayActivity.java | 5 -----
 src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java     | 7 +++++--
 src/com/owncloud/android/ui/preview/PreviewImageActivity.java | 5 -----
 src/com/owncloud/android/ui/preview/PreviewVideoActivity.java | 5 -----
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8700e583..f6d34727 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -51,7 +51,7 @@
         <activity
             android:name=".ui.activity.FileDisplayActivity"
             android:label="@string/app_name"
-            android:configChanges="orientation" >
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -94,13 +94,13 @@
         
         <activity	
             android:name=".ui.preview.PreviewImageActivity" 
-            android:configChanges="orientation" />
+            />
 		        
         <activity	
             android:name=".ui.preview.PreviewVideoActivity"
 			android:label="@string/app_name"
 			android:theme="@style/Theme.ownCloud.Fullscreen" 
-			android:configChanges="orientation">
+			>
 		</activity>        
 
         <service
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 81929e0b..0293314f 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -224,11 +224,6 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
             unbindService(mUploadConnection);
     }
 
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-    }
-
     /**
      *  Called when the ownCloud {@link Account} associated to the Activity was just updated.
      */ 
diff --git a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
index f4af7e19..af21f78c 100644
--- a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
@@ -126,9 +126,11 @@ public class ShareLinkToDialog  extends SherlockDialogFragment {
                                    ComponentName name=new ComponentName(actInfo.applicationInfo.packageName, actInfo.name);
                                    mIntent.setComponent(name);                               
                                    
+                                   dialog.dismiss();    // explicitly added for Android 2.x devices
+
                                    // Send the file
                                    ((FileActivity)getSherlockActivity()).startActivity(mIntent);
-
+                                   
                                }
                            })
                        .create();
@@ -146,7 +148,8 @@ public class ShareLinkToDialog  extends SherlockDialogFragment {
                             
                                    // Create a new share resource
                                    FileOperationsHelper foh = new FileOperationsHelper();
-                                   foh.shareFileWithLinkToApp(mFile, mIntent, (FileActivity)getSherlockActivity()); 
+                                   foh.shareFileWithLinkToApp(mFile, mIntent, (FileActivity)getSherlockActivity());
+                                   
                                }
                            })
                        .create();
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 82d24760..0da4fbc1 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -247,11 +247,6 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
     }
     
     @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-    }
-    
-    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean returnValue = false;
         
diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
index ec6a8cff..48dc047c 100644
--- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
@@ -190,11 +190,6 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
     }
     
     @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-    }
-    
-    @Override
     protected void onAccountSet(boolean stateWasRecovered) {
         super.onAccountSet(stateWasRecovered);
         if (getAccount() != null) {
-- 
2.11.0