Skip to content

Commit 66f9092

Browse files
Merge pull request #281 from nextcloud/dismissDialogFragment
fix crash in dismissLoadingDialog #279
2 parents 6c06147 + 00684cd commit 66f9092

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

src/com/owncloud/android/ui/activity/FileActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ public void dismissLoadingDialog() {
482482
if (frag != null) {
483483
Log_OC.d(TAG, "dismiss loading dialog");
484484
LoadingDialog loading = (LoadingDialog) frag;
485-
loading.dismiss();
485+
loading.dismissAllowingStateLoss();
486486
}
487487
}
488488

src/com/owncloud/android/ui/activity/LogHistoryActivity.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919

2020
package com.owncloud.android.ui.activity;
2121

22-
import java.io.BufferedReader;
23-
import java.io.File;
24-
import java.io.FileReader;
25-
import java.io.IOException;
26-
import java.lang.ref.WeakReference;
27-
import java.lang.reflect.Field;
28-
import java.util.ArrayList;
29-
3022
import android.content.ActivityNotFoundException;
3123
import android.content.Intent;
3224
import android.net.Uri;
@@ -35,7 +27,6 @@
3527
import android.support.v4.app.Fragment;
3628
import android.support.v4.app.FragmentManager;
3729
import android.support.v4.app.FragmentTransaction;
38-
import android.support.v7.app.AppCompatActivity;
3930
import android.view.MenuItem;
4031
import android.view.View;
4132
import android.view.View.OnClickListener;
@@ -46,9 +37,16 @@
4637
import com.owncloud.android.R;
4738
import com.owncloud.android.lib.common.utils.Log_OC;
4839
import com.owncloud.android.ui.dialog.LoadingDialog;
49-
import com.owncloud.android.utils.DisplayUtils;
5040
import com.owncloud.android.utils.FileStorageUtils;
5141

42+
import java.io.BufferedReader;
43+
import java.io.File;
44+
import java.io.FileReader;
45+
import java.io.IOException;
46+
import java.lang.ref.WeakReference;
47+
import java.lang.reflect.Field;
48+
import java.util.ArrayList;
49+
5250

5351
public class LogHistoryActivity extends ToolbarActivity {
5452

@@ -269,7 +267,7 @@ public void dismissLoadingDialog(){
269267
Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
270268
if (frag != null) {
271269
LoadingDialog loading = (LoadingDialog) frag;
272-
loading.dismiss();
270+
loading.dismissAllowingStateLoss();
273271
}
274272
}
275273

src/com/owncloud/android/ui/preview/PreviewTextFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public void dismissLoadingDialog() {
246246
final Fragment frag = getActivity().getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
247247
if (frag != null) {
248248
LoadingDialog loading = (LoadingDialog) frag;
249-
loading.dismiss();
249+
loading.dismissAllowingStateLoss();
250250
}
251251
}
252252
}

0 commit comments

Comments
 (0)