diff options
author | Christian Schneppe <christian@pix-art.de> | 2016-10-08 23:25:42 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-10-08 23:25:42 +0200 |
commit | 1c444b9cef918da3be321b2c9396b1a1707fdbd6 (patch) | |
tree | 2552e95b0d8b6e763d518f439107eaafb5271ef7 /src/main/java/de/pixart/messenger/ui/XmppActivity.java | |
parent | 140db2477016bdd4362ba451b2c92d877ba9e55f (diff) |
little bug fixes and improvements to VideoCompressor
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/XmppActivity.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java index 1e011de8c..54bb66c21 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -126,7 +126,7 @@ public abstract class XmppActivity extends Activity { protected boolean mUsingEnterKey = false; protected Toast mToast; - protected ProgressDialog mProgress; + protected ProgressDialog mProgress = null; Integer oldOrientation = getRequestedOrientation(); protected void hideToast() { @@ -146,6 +146,9 @@ public abstract class XmppActivity extends Activity { } protected void showProgress() { + if (mProgress == null) { + mProgress = new ProgressDialog(XmppActivity.this); + } setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR); mProgress.setMessage(getString(R.string.compressing_video)); mProgress.setCancelable(false); @@ -153,9 +156,11 @@ public abstract class XmppActivity extends Activity { } protected void closeProgress() { - if (mProgress.isShowing()) { + if (mProgress != null && mProgress.isShowing()) { mProgress.dismiss(); setRequestedOrientation(oldOrientation); + } else { + mProgress = null; } } @@ -441,7 +446,6 @@ public abstract class XmppActivity extends Activity { if (ab!=null) { ab.setDisplayHomeAsUpEnabled(true); } - mProgress = new ProgressDialog(this); } protected boolean isOptimizingBattery() { |