ABP/Android libadblockplus integration

src/org/adblockplus/android/Preferences.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.android;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 
 import org.jraf.android.backport.switchwidget.SwitchPreference;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ skipping 57 matching lines @@
         copyAssets();
         SharedPreferences.Editor editor = prefs.edit();
         editor.putInt(getString(R.string.pref_version), thisVersion);
         editor.commit();
       }
     }
     catch (NameNotFoundException e)
     {
       copyAssets();
     }
+  }
 
+  @Override
+  protected void onStart()
+  {
+    super.onStart();
     AdblockPlus application = AdblockPlus.getApplication();
+    application.startEngine();
 
     // Initialize subscription list
     subscriptionList = (RefreshableListPreference) findPreference(getString(R.string.pref_subscription));
-    List<Subscription> subscriptions = application.getSubscriptions();
-    String[] entries = new String[subscriptions.size()];
-    String[] entryValues = new String[subscriptions.size()];
+    Subscription[] subscriptions = application.getRecommendedSubscriptions();
+    String[] entries = new String[subscriptions.length];
+    String[] entryValues = new String[subscriptions.length];
     int i = 0;
     for (Subscription subscription : subscriptions)
     {
       entries[i] = subscription.title;
       entryValues[i] = subscription.url;
       i++;
     }
     subscriptionList.setEntries(entries);
-    subscriptionList.setEntryValues(entryValues);
+    subscriptionList.setEntryValues(entryValues);  

[Felix Dahlke, 2013/09/13 14:40:39]

Nit: Trailing whitespace.

   }
 
   @Override
-  protected void onStart()
-  {
-    super.onStart();
-    AdblockPlus application = AdblockPlus.getApplication();
-    application.startEngine();
-    application.startInteractive();
-  }
-
-  @Override
   public void onResume()
   {
     super.onResume();
     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
     final AdblockPlus application = AdblockPlus.getApplication();
 
+    Subscription current = null;
+    Subscription[] subscriptions = application.getListedSubscriptions();
+    if (subscriptions.length > 0)
+    {
+      current = subscriptions[0];
+    }
+
     boolean firstRun = false;

[Wladimir Palant, 2013/09/12 11:31:14]

I don't think you need the firstRun variable, just use application.isFirstRun()
when necessary. E.g. below you should have |if (application.isFirstRun() &&
current != null)|.

-
-    // Get current subscription
-    String current = prefs.getString(getString(R.string.pref_subscription), (String) null);
-
-    // If there is no current subscription autoselect one
-    if (current == null)
+    if (application.isFirstRun())
     {
       firstRun = true;
-      Subscription offer = application.offerSubscription();
-      current = offer.url;
-      if (offer != null)
+      
+      if (current != null)
       {
-        subscriptionList.setValue(offer.url);
-        application.setSubscription(offer);
-        new AlertDialog.Builder(this).setTitle(R.string.app_name).setMessage(String.format(getString(R.string.msg_subscription_offer, offer.title))).setIcon(android.R.drawable.ic_dialog_info)
+        new AlertDialog.Builder(this).setTitle(R.string.app_name).setMessage(String.format(getString(R.string.msg_subscription_offer, current.title))).setIcon(android.R.drawable.ic_dialog_info)
             .setPositiveButton(R.string.ok, null).create().show();
       }
     }
 
     // Enable manual subscription refresh
     subscriptionList.setOnRefreshClickListener(new View.OnClickListener()
     {
       @Override
       public void onClick(View v)
       {
-        application.refreshSubscription();
+        application.refreshSubscriptions();
       }
     });
 
     // Set subscription status message
     if (subscriptionSummary != null)
       subscriptionList.setSummary(subscriptionSummary);
     else
       setPrefSummary(subscriptionList);
 
     // Time to start listening for events
     registerReceiver(receiver, new IntentFilter(AdblockPlus.BROADCAST_SUBSCRIPTION_STATUS));
     registerReceiver(receiver, new IntentFilter(ProxyService.BROADCAST_STATE_CHANGED));
     registerReceiver(receiver, new IntentFilter(ProxyService.BROADCAST_PROXY_FAILED));
 
-    final String url = current;
-
-    // Initialize subscription verification
-    (new Thread()
+    // Update service and UI state according to user settings
+    if (current != null)
     {
-      @Override
-      public void run()
-      {
-        if (!application.verifySubscriptions())
-        {
-          Subscription subscription = application.getSubscription(url);
-          application.setSubscription(subscription);
-        }
-      }
-    }).start();
-
-    // Update service and UI state according to user settings
+      subscriptionList.setValue(current.url);
+      application.actualizeSubscriptionStatus(current.url);
+    }
     boolean enabled = prefs.getBoolean(getString(R.string.pref_enabled), false);
     boolean proxyenabled = prefs.getBoolean(getString(R.string.pref_proxyenabled), true);
     boolean autoconfigured = prefs.getBoolean(getString(R.string.pref_proxyautoconfigured), false);
+
+    // This is weird but UI does not update on back button (when returning from advanced preferences)
+    ((SwitchPreference) findPreference(getString(R.string.pref_enabled))).setChecked(enabled);
+
     if (enabled || firstRun)
       setFilteringEnabled(true);
     if (enabled || firstRun || (proxyenabled && !autoconfigured))
       setProxyEnabled(true);
 
     bindService(new Intent(this, ProxyService.class), proxyServiceConnection, 0);
   }
 
   @Override
   public void onPause()
@@ skipping 12 matching lines @@
     proxyService = null;
     
     hideConfigurationMsg();
   }
 
   @Override
   protected void onStop()
   {
     super.onStop();
     AdblockPlus application = AdblockPlus.getApplication();
-    application.stopInteractive();
     if (!application.isFilteringEnabled())
-      application.stopEngine(true);
+      application.stopEngine();
   }
 
   @Override
   public boolean onCreateOptionsMenu(Menu menu)
   {
     MenuInflater inflater = getSupportMenuInflater();
     inflater.inflate(R.menu.menu_preferences, menu);
     return true;
   }
 
@@ skipping 141 matching lines @@
         setProxyEnabled(true);
       }
       else if (serviceRunning && autoconfigured)
       {
         // If user disabled filtering disable proxy only if it was autoconfigured
         stopService(new Intent(this, ProxyService.class));
       }
     }
     else if (getString(R.string.pref_subscription).equals(key))
     {
-      String current = sharedPreferences.getString(key, null);
-      Subscription subscription = application.getSubscription(current);
-      application.setSubscription(subscription);
+      String url = sharedPreferences.getString(key, null);
+      if (url != null)
+        application.setSubscription(url);
     }
     else if (getString(R.string.pref_hideicon).equals(key))
     {
       boolean hideIcon = sharedPreferences.getBoolean(key, false);
       if (hideIcon)
         showDialog(HIDEICONWARNING_DIALOG);
       if (proxyService != null)
         proxyService.setEmptyIcon(hideIcon);
     }
     super.onSharedPreferenceChanged(sharedPreferences, key);
@@ skipping 41 matching lines @@
         }
       }
       if (action.equals(ProxyService.BROADCAST_PROXY_FAILED))
       {
         String msg = extra.getString("msg");
         new AlertDialog.Builder(Preferences.this).setTitle(R.string.error).setMessage(msg).setIcon(android.R.drawable.ic_dialog_alert).setPositiveButton(R.string.ok, null).create().show();
         setFilteringEnabled(false);
       }
       if (action.equals(AdblockPlus.BROADCAST_SUBSCRIPTION_STATUS))
       {
-        final String text = extra.getString("text");
+        //TODO Should check if url matches active subscription
+        final String text = extra.getString("status");
         final long time = extra.getLong("time");
         runOnUiThread(new Runnable()
         {
           public void run()
           {
             setSubscriptionStatus(text, time);
           }
         });
       }
     }
@@ skipping 65 matching lines @@
         showConfigurationMsg(getString(R.string.msg_configuration));
     }
 
     public void onServiceDisconnected(ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }