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

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

Issue 9643003: Improve manual proxy configuration (Closed)
Patch Set: Addressed review issues Created March 13, 2013, 8:48 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/org/adblockplus/android/ProxyConfigurationActivity.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of the Adblock Plus, 2 * This file is part of the Adblock Plus,
3 * Copyright (C) 2006-2012 Eyeo GmbH 3 * Copyright (C) 2006-2012 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 static 67 static
68 { 68 {
69 RootTools.debugMode = false; 69 RootTools.debugMode = false;
70 } 70 }
71 71
72 private static final String TAG = "ProxyService"; 72 private static final String TAG = "ProxyService";
73 private static final boolean logRequests = true; 73 private static final boolean logRequests = true;
74 74
75 // Do not use 8080 because it is a "dirty" port, Android uses it if something goes wrong 75 // Do not use 8080 because it is a "dirty" port, Android uses it if something goes wrong
76 private static final int[] portVariants = new int[] {8888, 1111, 2222, 3333, 4 444, 5555, 6666, 7777, 9999, 26571, 0}; 76 private static final int[] portVariants = new int[] {2020, 3030, 4040, 5050, 6 060, 7070, 9090, 1234, 12345, 4321, 0};
77 77
78 private final static int DEFAULT_TIMEOUT = 3000; 78 private final static int DEFAULT_TIMEOUT = 3000;
79 private final static int NO_TRAFFIC_TIMEOUT = 5 * 60 * 1000; // 5 minutes 79 private final static int NO_TRAFFIC_TIMEOUT = 5 * 60 * 1000; // 5 minutes
80 80
81 final static int ONGOING_NOTIFICATION_ID = R.string.app_name; 81 final static int ONGOING_NOTIFICATION_ID = R.string.app_name;
82 private static final long POSITION_RIGHT = Build.VERSION.SDK_INT >= Build.VERS ION_CODES.GINGERBREAD ? Long.MIN_VALUE : Long.MAX_VALUE; 82 private static final long POSITION_RIGHT = Build.VERSION.SDK_INT >= Build.VERS ION_CODES.GINGERBREAD ? Long.MIN_VALUE : Long.MAX_VALUE;
83 private final static int NOTRAFFIC_NOTIFICATION_ID = R.string.app_name + 3; 83 private final static int NOTRAFFIC_NOTIFICATION_ID = R.string.app_name + 3;
84 84
85 /** 85 /**
86 * Broadcasted when service starts or stops. 86 * Broadcasted when service starts or stops.
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 @Override 873 @Override
874 public void log(int level, Object obj, String message) 874 public void log(int level, Object obj, String message)
875 { 875 {
876 if (level <= logLevel) 876 if (level <= logLevel)
877 { 877 {
878 Log.println(7 - level, obj != null ? obj.toString() : TAG, message); 878 Log.println(7 - level, obj != null ? obj.toString() : TAG, message);
879 } 879 }
880 } 880 }
881 } 881 }
882 } 882 }
OLDNEW
« no previous file with comments | « src/org/adblockplus/android/ProxyConfigurationActivity.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld