Proxy configurators

src/org/adblockplus/android/CrashHandler.java

Index: src/org/adblockplus/android/CrashHandler.java
diff --git a/src/org/adblockplus/android/CrashHandler.java b/src/org/adblockplus/android/CrashHandler.java
index 250c48b2ed58631abdcc1ca51fa5a3582a463426..05bd7c85a5b1593e7e1b5c52ff1970587b3e2285 100644
--- a/src/org/adblockplus/android/CrashHandler.java
+++ b/src/org/adblockplus/android/CrashHandler.java
@@ -20,6 +20,9 @@ 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;
@@ -170,6 +173,19 @@ public class CrashHandler implements UncaughtExceptionHandler
     {
       // 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);
+      final LinkProperties linkProperties = LinkProperties.fromContext(this.context);
+      if (linkProperties != null && linkProperties.isValid())
+      {
+        linkProperties.setHttpProxy(proxyProperties);
+      }
+    }
+    catch(final Throwable t)

[Felix Dahlke, 2014/08/19 09:06:00]

Space between "catch" and "(".

[René Jeschke, 2014/08/19 10:41:33]

Done.

+    {
+      // TODO we need to clean up this exception handling stuff ... and the compatibility stuff also

[Felix Dahlke, 2014/08/19 09:06:00]

Also something that should be an issue rather than a TODO comment IMO, those are
just bound to keep lying around.

Better have this comment explain why it is safe to ignore exceptions here.

+    }
   }
 }