Proxy configurators

src/org/adblockplus/android/CrashHandler.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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.PrintWriter;
 import java.lang.Thread.UncaughtExceptionHandler;
 
+import org.adblockplus.android.compat.LinkProperties;
+import org.adblockplus.android.compat.ProxyProperties;
+
 import android.annotation.SuppressLint;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Build;
 import android.util.Log;
 
 /**
  * Writes crash data in file.
@@ skipping 130 matching lines @@
     restoreProxy = false;
     int p = 0;
     try
     {
       p = Integer.valueOf(port);
     }
     catch (final NumberFormatException e)
     {
       // ignore - no valid port, it will be correctly processed later
     }
-    ProxySettings.setConnectionProxy(context, host, p, excl);
+
+    try
+    {
+      final ProxyProperties proxyProperties = new ProxyProperties(this.host, p, this.excl);

[Felix Dahlke, 2014/08/24 11:51:19]

We can move this closer to its usage, i.e. into the if below.

[René Jeschke, 2014/08/24 11:54:14]

Done.

+      final LinkProperties linkProperties = LinkProperties.fromContext(this.context);
+      if (linkProperties != null && linkProperties.isValid())
+      {
+        linkProperties.setHttpProxy(proxyProperties);
+      }
+    }
+    catch (final Throwable t)
+    {
+      // This method here must not throw any exceptions to make sure it does not kill anything else.
+      // And it's safe to ignore this exception here, because if resetting the proxy fails, then it fails ... and we don't get a second chance to
+      // clear it again (because we're most likely currently crashing).
+    }
   }
 }