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

Side by Side Diff: src/org/adblockplus/android/ProxyService.java

Issue 6074937345310720: Issue 1262 - Wrong proxy configuration message (Closed)
Patch Set: Created Aug. 26, 2014, 12:51 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 private static final int[] PORT_VARIANTS = new int[] {-1, 2020, 3030, 4040, 50 50, 6060, 7070, 9090, 1234, 12345, 4321, 0}; 58 private static final int[] PORT_VARIANTS = new int[] {-1, 2020, 3030, 4040, 50 50, 6060, 7070, 9090, 1234, 12345, 4321, 0};
59 59
60 private static final boolean LOG_REQUESTS = false; 60 private static final boolean LOG_REQUESTS = false;
61 61
62 static final int ONGOING_NOTIFICATION_ID = R.string.app_name; 62 static final int ONGOING_NOTIFICATION_ID = R.string.app_name;
63 63
64 private static final long POSITION_RIGHT = Build.VERSION.SDK_INT >= Build.VERS ION_CODES.GINGERBREAD ? Long.MIN_VALUE : Long.MAX_VALUE; 64 private static final long POSITION_RIGHT = Build.VERSION.SDK_INT >= Build.VERS ION_CODES.GINGERBREAD ? Long.MIN_VALUE : Long.MAX_VALUE;
65 65
66 /** 66 /**
67 * This flag indicates that this mobile device runs an Android version that al lows the user to configure a http(s) proxy.
68 */
69 public static final boolean GLOBAL_PROXY_USER_CONFIGURABLE = Build.VERSION.SDK _INT >= 12; // Honeycomb 3.1
70
71 /**
67 * Broadcasted when service starts or stops. 72 * Broadcasted when service starts or stops.
68 */ 73 */
69 public static final String BROADCAST_STATE_CHANGED = "org.adblockplus.android. SERVICE_STATE_CHANGED"; 74 public static final String BROADCAST_STATE_CHANGED = "org.adblockplus.android. SERVICE_STATE_CHANGED";
70 75
71 /** 76 /**
72 * Broadcasted if proxy fails to start. 77 * Broadcasted if proxy fails to start.
73 */ 78 */
74 public static final String BROADCAST_PROXY_FAILED = "org.adblockplus.android.P ROXY_FAILURE"; 79 public static final String BROADCAST_PROXY_FAILED = "org.adblockplus.android.P ROXY_FAILURE";
75 80
76 /** 81 /**
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 @Override 590 @Override
586 public void log(final int level, final Object obj, final String message) 591 public void log(final int level, final Object obj, final String message)
587 { 592 {
588 if (level <= logLevel) 593 if (level <= logLevel)
589 { 594 {
590 Log.println(7 - level, obj != null ? obj.toString() : TAG, message); 595 Log.println(7 - level, obj != null ? obj.toString() : TAG, message);
591 } 596 }
592 } 597 }
593 } 598 }
594 } 599 }
OLDNEW
« no previous file with comments | « src/org/adblockplus/android/ProxyConfigurationActivity.java ('k') | src/org/adblockplus/android/Utils.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld