refactoring: clean progress dialog handling

1 files changed, 6 insertions, 11 deletions

diff --git a/main/src/cgeo/geocaching/activity/Progress.java b/main/src/cgeo/geocaching/activity/Progress.java
index 2710023..8ee88a7 100644
--- a/main/src/cgeo/geocaching/activity/Progress.java
+++ b/main/src/cgeo/geocaching/activity/Progress.java
@@ -17,7 +17,7 @@ public class Progress {
     private ProgressDialog dialog;
     private int progress = 0;
     private int progressDivider = 1;
-    private boolean hideAbsolute = false;
+    final private boolean hideAbsolute;
 
     public Progress(boolean hideAbsolute) {
         this.hideAbsolute = hideAbsolute;
@@ -28,7 +28,7 @@ public class Progress {
     }
 
     public synchronized void dismiss() {
-        if (dialog != null && dialog.isShowing()) {
+        if (isShowing()) {
             try {
                 dialog.dismiss();
             } catch (final Exception e) {
@@ -54,13 +54,8 @@ public class Progress {
         }
     }
 
-    private void createProgressDialog(Context context, String title, String message, Message cancelMessage) {
-        if (hideAbsolute) {
-            dialog = new CustomProgressDialog(context);
-        }
-        else {
-            dialog = new ProgressDialog(context);
-        }
+    private void createProgressDialog(final Context context, final String title, final String message, final Message cancelMessage) {
+        dialog = hideAbsolute ? new CustomProgressDialog(context) : new ProgressDialog(context);
         dialog.setTitle(title);
         dialog.setMessage(message);
         if (cancelMessage != null) {
@@ -87,7 +82,7 @@ public class Progress {
     }
 
     public synchronized void setMaxProgressAndReset(final int max) {
-        if (dialog != null && dialog.isShowing()) {
+        if (isShowing()) {
             final int modMax = max / this.progressDivider;
             dialog.setMax(modMax);
             dialog.setProgress(0);
@@ -97,7 +92,7 @@ public class Progress {
 
     public synchronized void setProgress(final int progress) {
         final int modProgress = progress / this.progressDivider;
-        if (dialog != null && dialog.isShowing()) {
+        if (isShowing()) {
             dialog.setProgress(modProgress);
         }
         this.progress = modProgress;