android: Crash fixes

src/org/adblockplus/android/Preferences.java

 /*
  * This file is part of the Adblock Plus,
  * Copyright (C) 2006-2012 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 44 matching lines @@
 
 /**
  * Main settings UI.
  */
 public class Preferences extends SummarizedPreferences
 {
   private static final String TAG = "Preferences";
 
   private static ProxyService proxyService = null;
 
+  private RefreshableListPreference subscriptionList;

[Felix Dahlke, 2012/11/28 08:12:56]

Are the changes in this file related to the fix?

[Andrey Novikov, 2012/11/28 08:25:01]

Yes, I've just moved initialization to a proper stage.

+  
   private AboutDialog aboutDialog;
   private boolean showAbout = false;
   private boolean trafficDetected = false;
   private String subscriptionSummary;
 
   @Override
   public void onCreate(Bundle savedInstanceState)
   {
     requestWindowFeature(Window.FEATURE_NO_TITLE);
 
@@ skipping 16 matching lines @@
         copyAssets();
         SharedPreferences.Editor editor = prefs.edit();
         editor.putInt(getString(R.string.pref_version), thisVersion);
         editor.commit();
       }
     }
     catch (NameNotFoundException e)
     {
       copyAssets();
     }
+
+    AdblockPlus application = AdblockPlus.getApplication();
+
+    // Initialize subscription list

[Felix Dahlke, 2012/11/28 08:37:37]

I think it makes sense to put this part into an initSubscriptionList function,
but I don't insist of course :)

+    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()];
+    int i = 0;
+    for (Subscription subscription : subscriptions)
+    {
+      entries[i] = subscription.title;
+      entryValues[i] = subscription.url;
+      i++;
+    }
+    subscriptionList.setEntries(entries);
+    subscriptionList.setEntryValues(entryValues);  
   }
 
   @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();
 
-    // Construct subscription list
-    RefreshableListPreference 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()];
-    String current = prefs.getString(getString(R.string.pref_subscription), (String) null);
-    int i = 0;
-    for (Subscription subscription : subscriptions)
-    {
-      entries[i] = subscription.title;
-      entryValues[i] = subscription.url;
-      i++;
-    }
-    subscriptionList.setEntries(entries);
-    subscriptionList.setEntryValues(entryValues);
-
     boolean firstRun = false;
 
+    // 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)
     {
       firstRun = true;
       Subscription offer = application.offerSubscription();
       current = offer.url;
       if (offer != null)
       {
         subscriptionList.setValue(offer.url);
         application.setSubscription(offer);
@@ skipping 354 matching lines @@
           showConfigurationMsg(getString(R.string.msg_configuration, proxyService.port));
     }
 
     public void onServiceDisconnected(ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }