Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: src/org/adblockplus/android/ProxyService.java

Issue 4705284891082752: Proxy configurators (Closed)
Left Patch Set: Removed command bridge Created Aug. 21, 2014, 7:48 a.m.
Right Patch Set: Last batch of review issues Created Aug. 24, 2014, 11:52 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « src/org/adblockplus/android/ProxyServerType.java ('k') | src/org/adblockplus/android/ProxySettings.java » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 } 371 }
372 catch (final ClassCastException e) 372 catch (final ClassCastException e)
373 { 373 {
374 // ignore - default handler in use 374 // ignore - default handler in use
375 } 375 }
376 } 376 }
377 377
378 @Override 378 @Override
379 public void onSharedPreferenceChanged(final SharedPreferences sharedPreference s, final String key) 379 public void onSharedPreferenceChanged(final SharedPreferences sharedPreference s, final String key)
380 { 380 {
381 // TODO verify this
Felix Dahlke 2014/08/24 11:51:19 Can we remove the TODO or turn it into an issue?
René Jeschke 2014/08/24 11:54:14 Done.
382 if (this.getProxyRegistrationType() != ProxyRegistrationType.NATIVE) 381 if (this.getProxyRegistrationType() != ProxyRegistrationType.NATIVE)
383 { 382 {
384 final String keyHost = getString(R.string.pref_proxyhost); 383 final String keyHost = getString(R.string.pref_proxyhost);
385 final String keyPort = getString(R.string.pref_proxyport); 384 final String keyPort = getString(R.string.pref_proxyport);
386 final String keyUser = getString(R.string.pref_proxyuser); 385 final String keyUser = getString(R.string.pref_proxyuser);
387 final String keyPass = getString(R.string.pref_proxypass); 386 final String keyPass = getString(R.string.pref_proxypass);
388 if (key.equals(keyHost) || key.equals(keyPort) || key.equals(keyUser) || k ey.equals(keyPass)) 387 if (key.equals(keyHost) || key.equals(keyPort) || key.equals(keyUser) || k ey.equals(keyPass))
389 { 388 {
390 final String proxyHost = sharedPreferences.getString(keyHost, null); 389 final String proxyHost = sharedPreferences.getString(keyHost, null);
391 final String proxyPort = sharedPreferences.getString(keyPort, null); 390 final String proxyPort = sharedPreferences.getString(keyPort, null);
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 @Override 585 @Override
587 public void log(final int level, final Object obj, final String message) 586 public void log(final int level, final Object obj, final String message)
588 { 587 {
589 if (level <= logLevel) 588 if (level <= logLevel)
590 { 589 {
591 Log.println(7 - level, obj != null ? obj.toString() : TAG, message); 590 Log.println(7 - level, obj != null ? obj.toString() : TAG, message);
592 } 591 }
593 } 592 }
594 } 593 }
595 } 594 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld