Merge branch 'develop' into fix_loading_dialog_crash

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / LoadingDialog.java

diff --git a/src/com/owncloud/android/ui/dialog/LoadingDialog.java b/src/com/owncloud/android/ui/dialog/LoadingDialog.java
index fd5c520..2203e03 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/LoadingDialog.java
+++ b/src/com/owncloud/android/ui/dialog/LoadingDialog.java
@@ -15,6 +15,17 @@ public class LoadingDialog extends DialogFragment {
 
     private String mMessage;
     
 
     private String mMessage;
     

+    public LoadingDialog() {
+        super();
+    }
+    
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+        setCancelable(false);
+    }
+

     public LoadingDialog(String message) {
         this.mMessage = message;
     }
     public LoadingDialog(String message) {
         this.mMessage = message;
     }


@@ -38,4 +49,10 @@ public class LoadingDialog extends DialogFragment {
         return dialog;
     }
 
         return dialog;
     }
 

+    @Override
+    public void onDestroyView() {
+        if (getDialog() != null && getRetainInstance())
+            getDialog().setDismissMessage(null);
+            super.onDestroyView();
+    }

 }
 }