Alternative solution for fix in 10f99ceb9ca... enforcing dialog dissmiss instead...

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8700e58..f6d3472 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -51,7 +51,7 @@
         <activity
             android:name=".ui.activity.FileDisplayActivity"
             android:label="@string/app_name"
         <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" />
             <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" 
         
         <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" 
                        
         <activity      
             android:name=".ui.preview.PreviewVideoActivity"
                        android:label="@string/app_name"
                        android:theme="@style/Theme.ownCloud.Fullscreen" 

-                       android:configChanges="orientation">
+                       >

                </activity>        
 
         <service
                </activity>        
 
         <service

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 81929e0..0293314 100644 (file)
--- 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);
     }
 
             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.
      */ 

diff --git a/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java b/src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
index f4af7e1..af21f78 100644 (file)
--- 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);                               
                                    
                                    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);
                                    // Send the file
                                    ((FileActivity)getSherlockActivity()).startActivity(mIntent);

-
+                                   

                                }
                            })
                        .create();
                                }
                            })
                        .create();


@@ -146,7 +148,8 @@ public class ShareLinkToDialog  extends SherlockDialogFragment {
                             
                                    // Create a new share resource
                                    FileOperationsHelper foh = new FileOperationsHelper();
                             
                                    // Create a new share resource
                                    FileOperationsHelper foh = new FileOperationsHelper();

-                                   foh.shareFileWithLinkToApp(mFile, mIntent, (FileActivity)getSherlockActivity()); 
+                                   foh.shareFileWithLinkToApp(mFile, mIntent, (FileActivity)getSherlockActivity());
+                                   

                                }
                            })
                        .create();
                                }
                            })
                        .create();

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 82d2476..0da4fbc 100644 (file)
--- 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
     }
     
     @Override

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

     public boolean onOptionsItemSelected(MenuItem item) {
         boolean returnValue = false;
         
     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 ec6a8cf..48dc047 100644 (file)
--- 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
     }
     
     @Override

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

     protected void onAccountSet(boolean stateWasRecovered) {
         super.onAccountSet(stateWasRecovered);
         if (getAccount() != null) {
     protected void onAccountSet(boolean stateWasRecovered) {
         super.onAccountSet(stateWasRecovered);
         if (getAccount() != null) {