android: Crash fixes

src/org/adblockplus/android/Preferences.java

Index: src/org/adblockplus/android/Preferences.java
===================================================================
--- a/src/org/adblockplus/android/Preferences.java
+++ b/src/org/adblockplus/android/Preferences.java
@@ -62,6 +62,8 @@
 
   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;
@@ -98,6 +100,23 @@
     {
       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
@@ -117,24 +136,11 @@
 
     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)
     {