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
@@ skipping 158 matching lines @@
     {
       p = Integer.valueOf(port);
     }
     catch (final NumberFormatException e)
     {
       // ignore - no valid port, it will be correctly processed later
     }
 
     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);
+        linkProperties.setHttpProxy(new ProxyProperties(this.host, p, this.excl));
       }
     }
     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).
     }
   }
 }