mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Convert to AndroidX

This commit is contained in:
M66B 2018-11-17 17:32:36 +01:00
parent 5ed8cae8ef
commit 16de988ba4
24 changed files with 76 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -53,10 +53,11 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
// https://developer.android.com/topic/libraries/support-library/revisions.html
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
// https://bumptech.github.io/glide/
implementation 'com.github.bumptech.glide:glide:4.8.0'
annotationProcessor 'androidx.annotation:annotation:1.0.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
}

8
app/proguard-rules.pro vendored
View File

@ -43,10 +43,10 @@
void accountUsage(eu.faircode.netguard.Usage);
}
#Support library
-keep class android.support.v7.widget.** { *; }
-dontwarn android.support.v4.**
-keepclassmembers class * implements android.os.Parcelable {static ** CREATOR;}
#AndroidX
-keep class androidx.appcompat.widget.** { *; }
-keep class androidx.appcompat.app.AppCompatViewInflater { <init>(...); }
-keepclassmembers class * implements android.os.Parcelable { static ** CREATOR; }
#Glide
-keep public class * implements com.bumptech.glide.module.GlideModule

3
app/src/main/java/eu/faircode/netguard/ActivityDns.java
View File

@ -25,7 +25,6 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.util.Xml;
import android.view.Menu;
@ -43,6 +42,8 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import androidx.appcompat.app.AppCompatActivity;
public class ActivityDns extends AppCompatActivity {
private static final String TAG = "NetGuard.DNS";

5
app/src/main/java/eu/faircode/netguard/ActivityForwarding.java
View File

@ -23,8 +23,6 @@ import android.content.DialogInterface;
import android.database.Cursor;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -42,6 +40,9 @@ import android.widget.Toast;
import java.net.InetAddress;
import java.util.List;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
public class ActivityForwarding extends AppCompatActivity {
private boolean running;
private ListView lvForwarding;

9
app/src/main/java/eu/faircode/netguard/ActivityLog.java
View File

@ -30,10 +30,6 @@ import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.app.NavUtils;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.SwitchCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.Menu;
@ -57,6 +53,11 @@ import java.net.UnknownHostException;
import java.text.SimpleDateFormat;
import java.util.Date;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.SearchView;
import androidx.appcompat.widget.SwitchCompat;
import androidx.core.app.NavUtils;
public class ActivityLog extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "NetGuard.Log";

21
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -36,16 +36,6 @@ import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.SwitchCompat;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
@ -71,6 +61,17 @@ import android.widget.Toast;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.SearchView;
import androidx.appcompat.widget.SwitchCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
public class ActivityMain extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "NetGuard.Main";

7
app/src/main/java/eu/faircode/netguard/ActivityPro.java
View File

@ -26,9 +26,6 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.support.v4.app.NavUtils;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
@ -42,6 +39,10 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.NavUtils;
public class ActivityPro extends AppCompatActivity {
private static final String TAG = "NetGuard.Pro";

11
app/src/main/java/eu/faircode/netguard/ActivitySettings.java
View File

@ -47,11 +47,6 @@ import android.preference.PreferenceGroup;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
import android.preference.TwoStatePreference;
import android.support.annotation.NonNull;
import android.support.v4.app.NavUtils;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
@ -91,6 +86,12 @@ import java.util.Set;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.NavUtils;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
public class ActivitySettings extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "NetGuard.Settings";

5
app/src/main/java/eu/faircode/netguard/AdapterAccess.java
View File

@ -25,8 +25,6 @@ import android.database.Cursor;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Build;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v4.view.ViewCompat;
import android.text.SpannableString;
import android.text.style.UnderlineSpan;
import android.util.TypedValue;
@ -42,6 +40,9 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.text.SimpleDateFormat;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat;
public class AdapterAccess extends CursorAdapter {
private int colVersion;
private int colProtocol;

7
app/src/main/java/eu/faircode/netguard/AdapterLog.java
View File

@ -29,8 +29,6 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.preference.PreferenceManager;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v4.view.ViewCompat;
import android.text.TextUtils;
import android.util.Log;
import android.util.TypedValue;
@ -41,13 +39,14 @@ import android.widget.CursorAdapter;
import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.text.SimpleDateFormat;
import java.util.List;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat;
public class AdapterLog extends CursorAdapter {
private static String TAG = "NetGuard.Log";

14
app/src/main/java/eu/faircode/netguard/AdapterRule.java
View File

@ -35,12 +35,6 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.preference.PreferenceManager;
import android.support.v4.app.NotificationManagerCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v4.widget.CompoundButtonCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.RecyclerView;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.ImageSpan;
@ -69,13 +63,19 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.bumptech.glide.load.DecodeFormat;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import androidx.appcompat.app.AlertDialog;
import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.widget.CompoundButtonCompat;
import androidx.recyclerview.widget.RecyclerView;
public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> implements Filterable {
private static final String TAG = "NetGuard.Adapter";

1
app/src/main/java/eu/faircode/netguard/ApplicationEx.java
View File

@ -25,7 +25,6 @@ import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.Context;
import android.media.AudioAttributes;
import android.os.Build;
import android.util.Log;

5
app/src/main/java/eu/faircode/netguard/DownloadTask.java
View File

@ -26,8 +26,6 @@ import android.content.Intent;
import android.os.AsyncTask;
import android.os.Build;
import android.os.PowerManager;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationManagerCompat;
import android.util.Log;
import android.util.TypedValue;
import android.widget.Toast;
@ -41,6 +39,9 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
public class DownloadTask extends AsyncTask<Object, Integer, Object> {
private static final String TAG = "NetGuard.Download";

3
app/src/main/java/eu/faircode/netguard/IPUtil.java
View File

@ -19,7 +19,6 @@ package eu.faircode.netguard;
Copyright 2015-2018 by Marcel Bokhorst (M66B)
*/
import android.support.annotation.NonNull;
import android.util.Log;
import java.net.InetAddress;
@ -27,6 +26,8 @@ import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
public class IPUtil {
private static final String TAG = "NetGuard.IPUtil";

6
app/src/main/java/eu/faircode/netguard/ReceiverPackageRemoved.java
View File

@ -22,13 +22,9 @@ package eu.faircode.netguard;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Build;
import android.preference.PreferenceManager;
import android.support.v4.app.NotificationManagerCompat;
import android.util.Log;
import java.util.Map;
import androidx.core.app.NotificationManagerCompat;
public class ReceiverPackageRemoved extends BroadcastReceiver {
private static final String TAG = "NetGuard.Receiver";

3
app/src/main/java/eu/faircode/netguard/ServiceExternal.java
View File

@ -25,7 +25,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.support.v4.app.NotificationCompat;
import android.util.Log;
import java.io.File;
@ -39,6 +38,8 @@ import java.net.URLConnection;
import java.text.SimpleDateFormat;
import java.util.Date;
import androidx.core.app.NotificationCompat;
public class ServiceExternal extends IntentService {
private static final String TAG = "NetGuard.External";
private static final String ACTION_DOWNLOAD_HOSTS_FILE = "eu.faircode.netguard.DOWNLOAD_HOSTS_FILE";

9
app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View File

@ -58,10 +58,6 @@ import android.os.PowerManager;
import android.os.Process;
import android.os.SystemClock;
import android.preference.PreferenceManager;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationManagerCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
import android.text.Spannable;
@ -112,6 +108,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.net.ssl.HttpsURLConnection;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
public class ServiceSinkhole extends VpnService implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "NetGuard.Service";

5
app/src/main/java/eu/faircode/netguard/Util.java
View File

@ -47,8 +47,6 @@ import android.os.Build;
import android.os.Bundle;
import android.os.PowerManager;
import android.preference.PreferenceManager;
import android.support.v4.net.ConnectivityManagerCompat;
import android.support.v7.app.AlertDialog;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
@ -84,6 +82,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import androidx.appcompat.app.AlertDialog;
import androidx.core.net.ConnectivityManagerCompat;
public class Util {
private static final String TAG = "NetGuard.Util";

2
app/src/main/res/layout/actionlog.xml
View File

@ -4,7 +4,7 @@
android:background="?attr/colorPrimary"
android:orientation="horizontal">
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swEnabled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/actionmain.xml
View File

@ -21,7 +21,7 @@
android:src="@drawable/ic_hourglass_empty_white_24dp"
android:visibility="gone" />
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swEnabled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

6
app/src/main/res/layout/main.xml
View File

@ -54,19 +54,19 @@
android:textAppearance="@style/TextSmall" />
</LinearLayout>
<android.support.v4.widget.SwipeRefreshLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefresh"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvApplication"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarStyle="insideOverlay"
android:scrollbars="vertical" />
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<LinearLayout
android:id="@+id/llWhitelist"

2
app/src/main/res/menu/logging.xml
View File

@ -5,7 +5,7 @@
android:id="@+id/menu_search"
android:icon="@drawable/ic_search_white_24dp"
android:title="@string/menu_search"
netguard:actionViewClass="android.support.v7.widget.SearchView"
netguard:actionViewClass="androidx.appcompat.widget.SearchView"
netguard:showAsAction="always|collapseActionView" />
<item

2
app/src/main/res/menu/main.xml
View File

@ -5,7 +5,7 @@
android:id="@+id/menu_search"
android:icon="@drawable/ic_search_white_24dp"
android:title="@string/menu_search"
netguard:actionViewClass="android.support.v7.widget.SearchView"
netguard:actionViewClass="androidx.appcompat.widget.SearchView"
netguard:showAsAction="always|collapseActionView"/>
<item
android:id="@+id/menu_filter"

2
gradle.properties
View File

@ -20,3 +20,5 @@ org.gradle.jvmargs=-Xmx500m
# http://android-developers.googleblog.com/2017/08/next-generation-dex-compiler-now-in.html
android.enableD8=true
android.useAndroidX=true
android.enableJetifier=true