android: NullPointerException in clearConnectionProxy

src/org/adblockplus/android/ProxyService.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 77 matching lines @@
   private final static String IPTABLES_RETURN = " -t nat -m owner --uid-owner {{UID}} -A OUTPUT -p tcp -j RETURN\n";
   private final static String IPTABLES_ADD_HTTP = " -t nat -A OUTPUT -p tcp --dport 80 -j REDIRECT --to {{PORT}}\n";
 
   private Notification ongoingNotification;
   private PendingIntent contentIntent;
 
   private Handler notrafficHandler;
 
   protected ProxyServer proxy = null;
   protected int port;
+  private Properties proxyConfiguration = new Properties();
 
   /**
    * Indicates that service is working with root privileges.
    */
   private boolean transparent = false;
   /**
    * Indicates that service has autoconfigured Android proxy settings (version
    * 3.1+).
    */
   private boolean nativeProxy = false;
@@ skipping 113 matching lines @@
         // TODO Add port travel
         listen = new ServerSocket(port, 1024);
       }
       catch (IOException e)
       {
         sendBroadcast(new Intent(BROADCAST_PROXY_FAILED).putExtra("msg", e.getMessage()));
         Log.e(TAG, null, e);
         return;
       }
 
-      Properties config = new Properties();
-      config.put("handler", "main");
-      config.put("main.prefix", "");
-      config.put("main.class", "sunlabs.brazil.server.ChainHandler");
+      proxyConfiguration.put("handler", "main");
+      proxyConfiguration.put("main.prefix", "");
+      proxyConfiguration.put("main.class", "sunlabs.brazil.server.ChainHandler");
       if (transparent)
       {
-        config.put("main.handlers", "urlmodifier adblock");
-        config.put("urlmodifier.class", "org.adblockplus.brazil.TransparentProxyHandler");
+        proxyConfiguration.put("main.handlers", "urlmodifier adblock");
+        proxyConfiguration.put("urlmodifier.class", "org.adblockplus.brazil.TransparentProxyHandler");
       }
       else
       {
-        config.put("main.handlers", "https adblock");
-        config.put("https.class", "org.adblockplus.brazil.SSLConnectionHandler");
+        proxyConfiguration.put("main.handlers", "https adblock");
+        proxyConfiguration.put("https.class", "org.adblockplus.brazil.SSLConnectionHandler");
       }
-      config.put("adblock.class", "org.adblockplus.brazil.RequestHandler");
+      proxyConfiguration.put("adblock.class", "org.adblockplus.brazil.RequestHandler");
       if (logRequests)
-        config.put("adblock.proxylog", "yes");
+        proxyConfiguration.put("adblock.proxylog", "yes");
 
-      configureUserProxy(config, proxyHost, proxyPort, proxyExcl, proxyUser, proxyPass);
+      configureUserProxy(proxyConfiguration, proxyHost, proxyPort, proxyExcl, proxyUser, proxyPass);
 
       proxy = new ProxyServer();
       proxy.logLevel = Server.LOG_DIAGNOSTIC;
-      proxy.setup(listen, config.getProperty("handler"), config);
+      proxy.setup(listen, proxyConfiguration.getProperty("handler"), proxyConfiguration);
       proxy.start();
     }
 
     prefs.registerOnSharedPreferenceChangeListener(this);
 
     String msg = getString(transparent ? R.string.notif_all : nativeProxy ? R.string.notif_wifi : R.string.notif_waiting);
     if (!transparent && !nativeProxy)
     {
       // Initiate no traffic check
       notrafficHandler = new Handler();
@@ skipping 72 matching lines @@
 
     Log.i(TAG, "Service stopped");
   }
 
   /**
    * Restores system proxy settings via native call on Android 3.1+ devices using
    * Java reflection.
    */
   private void clearConnectionProxy()
   {
-    String proxyHost = (String) proxy.props.getProperty("adblock.proxyHost");
-    String proxyPort = (String) proxy.props.getProperty("adblock.proxyPort");
-    String proxyExcl = (String) proxy.props.getProperty("adblock.proxyExcl");
+    String proxyHost = (String) proxyConfiguration.getProperty("adblock.proxyHost");
+    String proxyPort = (String) proxyConfiguration.getProperty("adblock.proxyPort");
+    String proxyExcl = (String) proxyConfiguration.getProperty("adblock.proxyExcl");
     int port = 0;
     try
     {
       if (proxyHost != null)
         port = Integer.valueOf(proxyPort);
     }
     catch (NumberFormatException e)
     {
       Log.e(TAG, "Bad port setting", e);
     }
@@ skipping 103 matching lines @@
       String keyUser = getString(R.string.pref_proxyuser);
       String keyPass = getString(R.string.pref_proxypass);
       if (key.equals(ketHost) || key.equals(keyPort) || key.equals(keyUser) || key.equals(keyPass))
       {
         String proxyHost = sharedPreferences.getString(ketHost, null);
         String proxyPort = sharedPreferences.getString(keyPort, null);
         String proxyUser = sharedPreferences.getString(keyUser, null);
         String proxyPass = sharedPreferences.getString(keyPass, null);
         if (proxy != null)
         {
-          configureUserProxy(proxy.props, proxyHost, proxyPort, null, proxyUser, proxyPass);
-          proxy.restart(proxy.props.getProperty("handler"));
+          configureUserProxy(proxyConfiguration, proxyHost, proxyPort, null, proxyUser, proxyPass);
+          proxy.restart(proxyConfiguration.getProperty("handler"));
         }
       }
     }
   }
 
   public boolean isTransparent()
   {
     return transparent;
   }
 
@@ skipping 220 matching lines @@
            */
           method = lp.getClass().getMethod("getHttpProxy");
           Object pp = method.invoke(lp);
 
           String[] userProxy = ProxySettings.getUserProxy(pp);
           if (userProxy != null && Integer.valueOf(userProxy[1]) != port)
           {
             Log.i(TAG, "User has set new proxy: " + userProxy[0] + ":" + userProxy[1] + "(" + userProxy[2] + ")");
             if (proxy != null)
             {
-              configureUserProxy(proxy.props, userProxy[0], userProxy[1], userProxy[2], null, null);
-              proxy.restart(proxy.props.getProperty("handler"));
+              configureUserProxy(proxyConfiguration, userProxy[0], userProxy[1], userProxy[2], null, null);
+              proxy.restart(proxyConfiguration.getProperty("handler"));
             }
           }
         }
         catch (Exception e)
         {
           // This should not happen
           Log.e(TAG, null, e);
         }
 
       }
@@ skipping 21 matching lines @@
     @Override
     public void log(int level, Object obj, String message)
     {
       if (level <= logLevel)
       {
         Log.println(7 - level, obj != null ? obj.toString() : TAG, message);
       }
     }
   }
 }