Issue 5223 - App is freezing sometimes

adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/MainPreferences.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 20 matching lines @@
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 import android.text.Html;
 import android.util.Log;
 import android.view.Gravity;
 import android.widget.Button;
 import android.widget.LinearLayout;
 
 public class MainPreferences extends PreferenceActivity implements
-    EngineService.OnEngineCreatedCallback, SharedPreferences.OnSharedPreferenceChangeListener
+    EngineService.OnEngineCreatedCallback, SharedPreferences.OnSharedPreferenceChangeListener,
+    Engine.SubscriptionUpdateCallback
 {
   private static final String TAG = MainPreferences.class.getSimpleName();
   private Engine engine = null;
   private AlertDialog dialog;
   private int dialogTitleResId;
 
   private SharedPreferences getSharedPreferences()
   {
     return PreferenceManager.getDefaultSharedPreferences(this.getApplicationContext());
   }
@@ skipping 154 matching lines @@
       btNeutralLayoutParams.gravity = Gravity.CENTER;
       btNeutral.setLayoutParams(btNeutralLayoutParams);
     }
   }
 
   @Override
   public void onEngineCreated(Engine engine, boolean success)
   {
     Log.d(TAG, "onEngineCreated: " + success);
     this.engine = success ? engine : null;
+
+    if (this.engine != null)
+    {
+      this.engine.setSubscriptionUpdateCallback(this);
+    }
+
     if (this.dialogTitleResId == R.string.initialization_title)
     {
       this.dismissDialog();
 
       this.checkForCompatibleSBrowserAndProceed();
     }
   }
 
   @Override
   public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
@@ skipping 10 matching lines @@
       this.engine.changeSubscriptionState(id, enabled);
     }
     else if (this.getString(R.string.key_application_activated).equals(key))
     {
       if (this.dialogTitleResId == R.string.setup_dialog_title)
       {
         this.dismissDialog();
       }
     }
   }
+
+  @Override
+  public void subscriptionUpdateRequested(final boolean enabled)
+  {
+    this.dialog = ProgressDialog.show(this, null, enabled ?
+        getString(R.string.add_subscription_dialog_message) : getString(R.string.remove_subscription_dialog_message));
+  }
+
+  @Override
+  public void subscriptionUpdatedApplied()
+  {
+    if (dialog != null)
+    {
+      dialog.dismiss();

[anton, 2017/06/26 13:49:34]

don't we need to `dialog = null` after it's dismissed?

[jens, 2017/06/26 14:05:20]

Yeah, you're right. I think it's cleaner. I will use the dismissDialog() method
already exists.

+    }
+  }
 }