From 16de988ba4a34ef816177f65601ae3b3ead93c51 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 17 Nov 2018 17:32:36 +0100 Subject: [PATCH] Convert to AndroidX --- app/build.gradle | 5 +++-- app/proguard-rules.pro | 8 +++---- .../eu/faircode/netguard/ActivityDns.java | 3 ++- .../faircode/netguard/ActivityForwarding.java | 5 +++-- .../eu/faircode/netguard/ActivityLog.java | 9 ++++---- .../eu/faircode/netguard/ActivityMain.java | 21 ++++++++++--------- .../eu/faircode/netguard/ActivityPro.java | 7 ++++--- .../faircode/netguard/ActivitySettings.java | 11 +++++----- .../eu/faircode/netguard/AdapterAccess.java | 5 +++-- .../java/eu/faircode/netguard/AdapterLog.java | 7 +++---- .../eu/faircode/netguard/AdapterRule.java | 14 ++++++------- .../eu/faircode/netguard/ApplicationEx.java | 1 - .../eu/faircode/netguard/DownloadTask.java | 5 +++-- .../java/eu/faircode/netguard/IPUtil.java | 3 ++- .../netguard/ReceiverPackageRemoved.java | 6 +----- .../eu/faircode/netguard/ServiceExternal.java | 3 ++- .../eu/faircode/netguard/ServiceSinkhole.java | 9 ++++---- .../main/java/eu/faircode/netguard/Util.java | 5 +++-- app/src/main/res/layout/actionlog.xml | 2 +- app/src/main/res/layout/actionmain.xml | 2 +- app/src/main/res/layout/main.xml | 6 +++--- app/src/main/res/menu/logging.xml | 2 +- app/src/main/res/menu/main.xml | 2 +- gradle.properties | 2 ++ 24 files changed, 76 insertions(+), 67 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6b9ffbdb..4084d338 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index d614e1cc..501b6193 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -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 { (...); } +-keepclassmembers class * implements android.os.Parcelable { static ** CREATOR; } #Glide -keep public class * implements com.bumptech.glide.module.GlideModule diff --git a/app/src/main/java/eu/faircode/netguard/ActivityDns.java b/app/src/main/java/eu/faircode/netguard/ActivityDns.java index 51cad32c..1b3d57a0 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityDns.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityDns.java @@ -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"; diff --git a/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java b/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java index 6fab1c5d..0b15a8c6 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java @@ -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; diff --git a/app/src/main/java/eu/faircode/netguard/ActivityLog.java b/app/src/main/java/eu/faircode/netguard/ActivityLog.java index 53008993..ec4d645d 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityLog.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityLog.java @@ -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"; diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java index b6d9b935..0e1771e4 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java @@ -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"; diff --git a/app/src/main/java/eu/faircode/netguard/ActivityPro.java b/app/src/main/java/eu/faircode/netguard/ActivityPro.java index bdbbb3f8..32622ef7 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityPro.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityPro.java @@ -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"; diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index 5593afec..acf50fb6 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -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"; diff --git a/app/src/main/java/eu/faircode/netguard/AdapterAccess.java b/app/src/main/java/eu/faircode/netguard/AdapterAccess.java index 45398d35..cddeec02 100644 --- a/app/src/main/java/eu/faircode/netguard/AdapterAccess.java +++ b/app/src/main/java/eu/faircode/netguard/AdapterAccess.java @@ -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; diff --git a/app/src/main/java/eu/faircode/netguard/AdapterLog.java b/app/src/main/java/eu/faircode/netguard/AdapterLog.java index 3b43b8b0..d46ff42a 100644 --- a/app/src/main/java/eu/faircode/netguard/AdapterLog.java +++ b/app/src/main/java/eu/faircode/netguard/AdapterLog.java @@ -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"; diff --git a/app/src/main/java/eu/faircode/netguard/AdapterRule.java b/app/src/main/java/eu/faircode/netguard/AdapterRule.java index 32608de0..44d7791a 100644 --- a/app/src/main/java/eu/faircode/netguard/AdapterRule.java +++ b/app/src/main/java/eu/faircode/netguard/AdapterRule.java @@ -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 implements Filterable { private static final String TAG = "NetGuard.Adapter"; diff --git a/app/src/main/java/eu/faircode/netguard/ApplicationEx.java b/app/src/main/java/eu/faircode/netguard/ApplicationEx.java index 22c98660..2395ebb0 100644 --- a/app/src/main/java/eu/faircode/netguard/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/netguard/ApplicationEx.java @@ -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; diff --git a/app/src/main/java/eu/faircode/netguard/DownloadTask.java b/app/src/main/java/eu/faircode/netguard/DownloadTask.java index 93b973d7..ae5e3091 100644 --- a/app/src/main/java/eu/faircode/netguard/DownloadTask.java +++ b/app/src/main/java/eu/faircode/netguard/DownloadTask.java @@ -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 { private static final String TAG = "NetGuard.Download"; diff --git a/app/src/main/java/eu/faircode/netguard/IPUtil.java b/app/src/main/java/eu/faircode/netguard/IPUtil.java index 198ad2af..81636f6e 100644 --- a/app/src/main/java/eu/faircode/netguard/IPUtil.java +++ b/app/src/main/java/eu/faircode/netguard/IPUtil.java @@ -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"; diff --git a/app/src/main/java/eu/faircode/netguard/ReceiverPackageRemoved.java b/app/src/main/java/eu/faircode/netguard/ReceiverPackageRemoved.java index 7578f335..158a6ad4 100644 --- a/app/src/main/java/eu/faircode/netguard/ReceiverPackageRemoved.java +++ b/app/src/main/java/eu/faircode/netguard/ReceiverPackageRemoved.java @@ -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"; diff --git a/app/src/main/java/eu/faircode/netguard/ServiceExternal.java b/app/src/main/java/eu/faircode/netguard/ServiceExternal.java index 39ce2f90..6f2fc8ae 100644 --- a/app/src/main/java/eu/faircode/netguard/ServiceExternal.java +++ b/app/src/main/java/eu/faircode/netguard/ServiceExternal.java @@ -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"; diff --git a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java index 474e26a4..a689f660 100644 --- a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java +++ b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java @@ -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"; diff --git a/app/src/main/java/eu/faircode/netguard/Util.java b/app/src/main/java/eu/faircode/netguard/Util.java index bebbf3ca..e7571ad2 100644 --- a/app/src/main/java/eu/faircode/netguard/Util.java +++ b/app/src/main/java/eu/faircode/netguard/Util.java @@ -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"; diff --git a/app/src/main/res/layout/actionlog.xml b/app/src/main/res/layout/actionlog.xml index 4fc905e3..95340ba8 100644 --- a/app/src/main/res/layout/actionlog.xml +++ b/app/src/main/res/layout/actionlog.xml @@ -4,7 +4,7 @@ android:background="?attr/colorPrimary" android:orientation="horizontal"> - - - - - +