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

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

Issue 29348632: Issue 4260 - Replace Apache Commons Lang classes (Closed)
Patch Set: full changeset including rene's comments Created July 26, 2016, 1:38 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 <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 package org.adblockplus.android; 18 package org.adblockplus.android;
19 19
20 import java.io.IOException; 20 import java.io.IOException;
21 import java.net.InetAddress; 21 import java.net.InetAddress;
22 import java.net.ServerSocket; 22 import java.net.ServerSocket;
23 import java.net.UnknownHostException; 23 import java.net.UnknownHostException;
24 import java.util.Properties; 24 import java.util.Properties;
25 25
26 import org.adblockplus.android.configurators.ProxyConfigurator; 26 import org.adblockplus.android.configurators.ProxyConfigurator;
27 import org.adblockplus.android.configurators.ProxyConfigurators; 27 import org.adblockplus.android.configurators.ProxyConfigurators;
28 import org.adblockplus.android.configurators.ProxyRegistrationType; 28 import org.adblockplus.android.configurators.ProxyRegistrationType;
29 import org.apache.commons.lang.StringUtils; 29 import org.adblockplus.android.StringUtils;
30 30
31 import sunlabs.brazil.server.Server; 31 import sunlabs.brazil.server.Server;
32 import sunlabs.brazil.util.Base64; 32 import sunlabs.brazil.util.Base64;
33 import android.annotation.SuppressLint; 33 import android.annotation.SuppressLint;
34 import android.app.Notification; 34 import android.app.Notification;
35 import android.app.NotificationManager; 35 import android.app.NotificationManager;
36 import android.app.PendingIntent; 36 import android.app.PendingIntent;
37 import android.app.Service; 37 import android.app.Service;
38 import android.content.BroadcastReceiver; 38 import android.content.BroadcastReceiver;
39 import android.content.Context; 39 import android.content.Context;
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 @Override 589 @Override
590 public void log(final int level, final Object obj, final String message) 590 public void log(final int level, final Object obj, final String message)
591 { 591 {
592 if (level <= logLevel) 592 if (level <= logLevel)
593 { 593 {
594 Log.println(7 - level, obj != null ? obj.toString() : TAG, message); 594 Log.println(7 - level, obj != null ? obj.toString() : TAG, message);
595 } 595 }
596 } 596 }
597 } 597 }
598 } 598 }
OLDNEW

Powered by Google App Engine
This is Rietveld