diff options
Diffstat (limited to 'app/src/main/java/com/wireguard')
55 files changed, 133 insertions, 133 deletions
diff --git a/app/src/main/java/com/wireguard/android/Application.java b/app/src/main/java/com/wireguard/android/Application.java index 65b5a66e..c3761102 100644 --- a/app/src/main/java/com/wireguard/android/Application.java +++ b/app/src/main/java/com/wireguard/android/Application.java @@ -13,8 +13,8 @@ import android.os.Build; import android.os.Handler; import android.os.Looper; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatDelegate; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatDelegate; import com.wireguard.android.backend.Backend; import com.wireguard.android.backend.GoBackend; diff --git a/app/src/main/java/com/wireguard/android/QuickTileService.java b/app/src/main/java/com/wireguard/android/QuickTileService.java index 198684c1..29257935 100644 --- a/app/src/main/java/com/wireguard/android/QuickTileService.java +++ b/app/src/main/java/com/wireguard/android/QuickTileService.java @@ -7,8 +7,8 @@ package com.wireguard.android; import android.annotation.TargetApi; import android.content.Intent; -import android.databinding.Observable; -import android.databinding.Observable.OnPropertyChangedCallback; +import androidx.databinding.Observable; +import androidx.databinding.Observable.OnPropertyChangedCallback; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.drawable.Icon; @@ -16,7 +16,7 @@ import android.os.Build; import android.os.IBinder; import android.service.quicksettings.Tile; import android.service.quicksettings.TileService; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/java/com/wireguard/android/activity/BaseActivity.java b/app/src/main/java/com/wireguard/android/activity/BaseActivity.java index 1a02d904..c1a10dbc 100644 --- a/app/src/main/java/com/wireguard/android/activity/BaseActivity.java +++ b/app/src/main/java/com/wireguard/android/activity/BaseActivity.java @@ -5,10 +5,10 @@ package com.wireguard.android.activity; -import android.databinding.CallbackRegistry; -import android.databinding.CallbackRegistry.NotifierCallback; +import androidx.databinding.CallbackRegistry; +import androidx.databinding.CallbackRegistry.NotifierCallback; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.wireguard.android.Application; import com.wireguard.android.model.Tunnel; diff --git a/app/src/main/java/com/wireguard/android/activity/MainActivity.java b/app/src/main/java/com/wireguard/android/activity/MainActivity.java index 4f146cb2..8b4ce88a 100644 --- a/app/src/main/java/com/wireguard/android/activity/MainActivity.java +++ b/app/src/main/java/com/wireguard/android/activity/MainActivity.java @@ -8,10 +8,10 @@ package com.wireguard.android.activity; import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.ActionBar; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.appcompat.app.ActionBar; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/wireguard/android/activity/SettingsActivity.java b/app/src/main/java/com/wireguard/android/activity/SettingsActivity.java index b827ca1b..fb818864 100644 --- a/app/src/main/java/com/wireguard/android/activity/SettingsActivity.java +++ b/app/src/main/java/com/wireguard/android/activity/SettingsActivity.java @@ -7,12 +7,12 @@ package com.wireguard.android.activity; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceFragmentCompat; -import android.support.v7.preference.PreferenceScreen; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; import android.util.SparseArray; import android.view.MenuItem; diff --git a/app/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.java b/app/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.java index fbae2165..3c3dd92f 100644 --- a/app/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.java +++ b/app/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.java @@ -8,9 +8,9 @@ package com.wireguard.android.activity; import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.app.AppCompatDelegate; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import android.util.Log; import com.wireguard.android.Application; diff --git a/app/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.java b/app/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.java index 568a39c7..26f4af21 100644 --- a/app/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.java +++ b/app/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.java @@ -6,7 +6,7 @@ package com.wireguard.android.activity; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.wireguard.android.fragment.TunnelEditorFragment; import com.wireguard.android.model.Tunnel; diff --git a/app/src/main/java/com/wireguard/android/backend/GoBackend.java b/app/src/main/java/com/wireguard/android/backend/GoBackend.java index 301bbd76..dc9ec00c 100644 --- a/app/src/main/java/com/wireguard/android/backend/GoBackend.java +++ b/app/src/main/java/com/wireguard/android/backend/GoBackend.java @@ -9,8 +9,8 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.os.ParcelFileDescriptor; -import android.support.annotation.Nullable; -import android.support.v4.util.ArraySet; +import androidx.annotation.Nullable; +import androidx.collection.ArraySet; import android.util.Log; import com.wireguard.android.Application; diff --git a/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java index 25f48d07..1cdac45a 100644 --- a/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java +++ b/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java @@ -6,7 +6,7 @@ package com.wireguard.android.backend; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.wireguard.android.Application; diff --git a/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java index fe01bf10..d13c1b86 100644 --- a/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java +++ b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java @@ -5,14 +5,14 @@ package com.wireguard.android.databinding; -import android.databinding.BindingAdapter; -import android.databinding.DataBindingUtil; -import android.databinding.ObservableList; -import android.databinding.ViewDataBinding; -import android.databinding.adapters.ListenerUtil; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.BindingAdapter; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableList; +import androidx.databinding.ViewDataBinding; +import androidx.databinding.adapters.ListenerUtil; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.InputFilter; import android.view.LayoutInflater; import android.widget.LinearLayout; diff --git a/app/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java b/app/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java index b913d17f..adf49c51 100644 --- a/app/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java +++ b/app/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java @@ -5,10 +5,10 @@ package com.wireguard.android.databinding; -import android.databinding.DataBindingUtil; -import android.databinding.ObservableList; -import android.databinding.ViewDataBinding; -import android.support.annotation.Nullable; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableList; +import androidx.databinding.ViewDataBinding; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.java b/app/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.java index 5bfa64f1..c74b2eea 100644 --- a/app/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.java +++ b/app/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.java @@ -6,12 +6,12 @@ package com.wireguard.android.databinding; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.databinding.ObservableList; -import android.databinding.ViewDataBinding; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.Adapter; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableList; +import androidx.databinding.ViewDataBinding; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.Adapter; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java b/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java index 49cb51ee..ae6fd822 100644 --- a/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java @@ -12,10 +12,10 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.widget.Toast; import com.wireguard.android.Application; diff --git a/app/src/main/java/com/wireguard/android/fragment/BaseFragment.java b/app/src/main/java/com/wireguard/android/fragment/BaseFragment.java index 3b2199aa..d0e0bd41 100644 --- a/app/src/main/java/com/wireguard/android/fragment/BaseFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/BaseFragment.java @@ -7,11 +7,11 @@ package com.wireguard.android.fragment; import android.content.Context; import android.content.Intent; -import android.databinding.DataBindingUtil; -import android.databinding.ViewDataBinding; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ViewDataBinding; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java b/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java index e56b4286..cad95067 100644 --- a/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java @@ -10,9 +10,9 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; import android.view.inputmethod.InputMethodManager; import com.wireguard.android.Application; diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.java index b4e7202f..adcc5745 100644 --- a/app/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.java @@ -6,7 +6,7 @@ package com.wireguard.android.fragment; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java index 7c4a162a..2f70534a 100644 --- a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java @@ -7,11 +7,11 @@ package com.wireguard.android.fragment; import android.app.Activity; import android.content.Context; -import android.databinding.ObservableList; +import androidx.databinding.ObservableList; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v4.app.FragmentManager; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.FragmentManager; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java index 5871f262..5f84f90d 100644 --- a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java @@ -14,13 +14,13 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.provider.OpenableColumns; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v4.app.FragmentManager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.view.ActionMode; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.FragmentManager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.view.ActionMode; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/com/wireguard/android/model/ApplicationData.java b/app/src/main/java/com/wireguard/android/model/ApplicationData.java index f7c335de..62d6d577 100644 --- a/app/src/main/java/com/wireguard/android/model/ApplicationData.java +++ b/app/src/main/java/com/wireguard/android/model/ApplicationData.java @@ -5,8 +5,8 @@ package com.wireguard.android.model; -import android.databinding.BaseObservable; -import android.databinding.Bindable; +import androidx.databinding.BaseObservable; +import androidx.databinding.Bindable; import android.graphics.drawable.Drawable; import com.wireguard.android.BR; diff --git a/app/src/main/java/com/wireguard/android/model/Tunnel.java b/app/src/main/java/com/wireguard/android/model/Tunnel.java index 9092b288..188b16e4 100644 --- a/app/src/main/java/com/wireguard/android/model/Tunnel.java +++ b/app/src/main/java/com/wireguard/android/model/Tunnel.java @@ -5,9 +5,9 @@ package com.wireguard.android.model; -import android.databinding.BaseObservable; -import android.databinding.Bindable; -import android.support.annotation.Nullable; +import androidx.databinding.BaseObservable; +import androidx.databinding.Bindable; +import androidx.annotation.Nullable; import com.wireguard.android.BR; import com.wireguard.android.util.ExceptionLoggers; diff --git a/app/src/main/java/com/wireguard/android/model/TunnelManager.java b/app/src/main/java/com/wireguard/android/model/TunnelManager.java index 83df3595..d2aa254a 100644 --- a/app/src/main/java/com/wireguard/android/model/TunnelManager.java +++ b/app/src/main/java/com/wireguard/android/model/TunnelManager.java @@ -8,9 +8,9 @@ package com.wireguard.android.model; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.databinding.BaseObservable; -import android.databinding.Bindable; -import android.support.annotation.Nullable; +import androidx.databinding.BaseObservable; +import androidx.databinding.Bindable; +import androidx.annotation.Nullable; import com.wireguard.android.Application; import com.wireguard.android.BR; diff --git a/app/src/main/java/com/wireguard/android/preference/LogExporterPreference.java b/app/src/main/java/com/wireguard/android/preference/LogExporterPreference.java index 3f59c7f8..03e5c33f 100644 --- a/app/src/main/java/com/wireguard/android/preference/LogExporterPreference.java +++ b/app/src/main/java/com/wireguard/android/preference/LogExporterPreference.java @@ -9,9 +9,9 @@ import android.Manifest; import android.content.Context; import android.content.pm.PackageManager; import android.os.Environment; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; +import androidx.preference.Preference; import android.util.AttributeSet; import android.util.Log; diff --git a/app/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java b/app/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java index 4e20c7e5..f28d841e 100644 --- a/app/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java +++ b/app/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java @@ -6,8 +6,8 @@ package com.wireguard.android.preference; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import androidx.preference.Preference; import android.util.AttributeSet; import com.wireguard.android.Application; diff --git a/app/src/main/java/com/wireguard/android/preference/VersionPreference.java b/app/src/main/java/com/wireguard/android/preference/VersionPreference.java index 2273d6de..a8d7f75d 100644 --- a/app/src/main/java/com/wireguard/android/preference/VersionPreference.java +++ b/app/src/main/java/com/wireguard/android/preference/VersionPreference.java @@ -9,8 +9,8 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.annotation.Nullable; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import androidx.preference.Preference; import android.util.AttributeSet; import com.wireguard.android.Application; diff --git a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java index a2646053..ecba734c 100644 --- a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java +++ b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java @@ -9,9 +9,9 @@ import android.Manifest; import android.content.Context; import android.content.pm.PackageManager; import android.os.Environment; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; +import androidx.preference.Preference; import android.util.AttributeSet; import android.util.Log; diff --git a/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java b/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java index 1fb6eed5..e826cba8 100644 --- a/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java +++ b/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java @@ -8,7 +8,7 @@ package com.wireguard.android.util; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; -import android.support.design.widget.Snackbar; +import com.google.android.material.snackbar.Snackbar; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/com/wireguard/android/util/ErrorMessages.java b/app/src/main/java/com/wireguard/android/util/ErrorMessages.java index 0f49448c..0835e83c 100644 --- a/app/src/main/java/com/wireguard/android/util/ErrorMessages.java +++ b/app/src/main/java/com/wireguard/android/util/ErrorMessages.java @@ -6,7 +6,7 @@ package com.wireguard.android.util; import android.content.res.Resources; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.wireguard.android.Application; import com.wireguard.android.R; diff --git a/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java b/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java index 5188112c..c4bd0ed9 100644 --- a/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java +++ b/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java @@ -5,7 +5,7 @@ package com.wireguard.android.util; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import java9.util.function.BiConsumer; diff --git a/app/src/main/java/com/wireguard/android/util/FragmentUtils.java b/app/src/main/java/com/wireguard/android/util/FragmentUtils.java index b7fdd095..47b1d0a7 100644 --- a/app/src/main/java/com/wireguard/android/util/FragmentUtils.java +++ b/app/src/main/java/com/wireguard/android/util/FragmentUtils.java @@ -5,7 +5,7 @@ package com.wireguard.android.util; import android.content.Context; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.view.ContextThemeWrapper; import com.wireguard.android.activity.SettingsActivity; diff --git a/app/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java b/app/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java index 7af829fb..a58bd5ea 100644 --- a/app/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java +++ b/app/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java @@ -5,8 +5,8 @@ package com.wireguard.android.util; -import android.databinding.ObservableArrayList; -import android.support.annotation.Nullable; +import androidx.databinding.ObservableArrayList; +import androidx.annotation.Nullable; import com.wireguard.util.Keyed; diff --git a/app/src/main/java/com/wireguard/android/util/ObservableKeyedList.java b/app/src/main/java/com/wireguard/android/util/ObservableKeyedList.java index d7b06ad7..86d96e7b 100644 --- a/app/src/main/java/com/wireguard/android/util/ObservableKeyedList.java +++ b/app/src/main/java/com/wireguard/android/util/ObservableKeyedList.java @@ -5,7 +5,7 @@ package com.wireguard.android.util; -import android.databinding.ObservableList; +import androidx.databinding.ObservableList; import com.wireguard.util.Keyed; import com.wireguard.util.KeyedList; diff --git a/app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java b/app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java index d287d33d..e123dd2b 100644 --- a/app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java +++ b/app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java @@ -5,7 +5,7 @@ package com.wireguard.android.util; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.wireguard.util.Keyed; import com.wireguard.util.SortedKeyedList; diff --git a/app/src/main/java/com/wireguard/android/util/RootShell.java b/app/src/main/java/com/wireguard/android/util/RootShell.java index 2dc02b56..409cdcde 100644 --- a/app/src/main/java/com/wireguard/android/util/RootShell.java +++ b/app/src/main/java/com/wireguard/android/util/RootShell.java @@ -6,7 +6,7 @@ package com.wireguard.android.util; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.wireguard.android.BuildConfig; diff --git a/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java b/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java index dd381a18..d4a620e8 100644 --- a/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java +++ b/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java @@ -6,7 +6,7 @@ package com.wireguard.android.util; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.system.OsConstants; import android.util.Log; diff --git a/app/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.java b/app/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.java index 62523298..494a2051 100644 --- a/app/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.java +++ b/app/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.java @@ -5,8 +5,8 @@ package com.wireguard.android.viewmodel; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableList; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableList; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.java b/app/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.java index 3b303f42..2b6ce3f3 100644 --- a/app/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.java +++ b/app/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.java @@ -5,10 +5,10 @@ package com.wireguard.android.viewmodel; -import android.databinding.BaseObservable; -import android.databinding.Bindable; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableList; +import androidx.databinding.BaseObservable; +import androidx.databinding.Bindable; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableList; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/wireguard/android/viewmodel/PeerProxy.java b/app/src/main/java/com/wireguard/android/viewmodel/PeerProxy.java index c9bae98f..6336abab 100644 --- a/app/src/main/java/com/wireguard/android/viewmodel/PeerProxy.java +++ b/app/src/main/java/com/wireguard/android/viewmodel/PeerProxy.java @@ -5,13 +5,13 @@ package com.wireguard.android.viewmodel; -import android.databinding.BaseObservable; -import android.databinding.Bindable; -import android.databinding.Observable; -import android.databinding.ObservableList; +import androidx.databinding.BaseObservable; +import androidx.databinding.Bindable; +import androidx.databinding.Observable; +import androidx.databinding.ObservableList; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.wireguard.android.BR; import com.wireguard.config.Attribute; diff --git a/app/src/main/java/com/wireguard/android/widget/KeyInputFilter.java b/app/src/main/java/com/wireguard/android/widget/KeyInputFilter.java index 6332b856..74903ac6 100644 --- a/app/src/main/java/com/wireguard/android/widget/KeyInputFilter.java +++ b/app/src/main/java/com/wireguard/android/widget/KeyInputFilter.java @@ -5,7 +5,7 @@ package com.wireguard.android.widget; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.InputFilter; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/app/src/main/java/com/wireguard/android/widget/NameInputFilter.java b/app/src/main/java/com/wireguard/android/widget/NameInputFilter.java index 2352630e..c95471e5 100644 --- a/app/src/main/java/com/wireguard/android/widget/NameInputFilter.java +++ b/app/src/main/java/com/wireguard/android/widget/NameInputFilter.java @@ -5,7 +5,7 @@ package com.wireguard.android.widget; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.InputFilter; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/app/src/main/java/com/wireguard/android/widget/SlashDrawable.java b/app/src/main/java/com/wireguard/android/widget/SlashDrawable.java index 408d7888..a62da5d7 100644 --- a/app/src/main/java/com/wireguard/android/widget/SlashDrawable.java +++ b/app/src/main/java/com/wireguard/android/widget/SlashDrawable.java @@ -23,9 +23,9 @@ import android.graphics.RectF; import android.graphics.Region; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.IntRange; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.IntRange; +import androidx.annotation.Nullable; import android.util.FloatProperty; @TargetApi(Build.VERSION_CODES.N) diff --git a/app/src/main/java/com/wireguard/android/widget/ToggleSwitch.java b/app/src/main/java/com/wireguard/android/widget/ToggleSwitch.java index b9b06842..a342272c 100644 --- a/app/src/main/java/com/wireguard/android/widget/ToggleSwitch.java +++ b/app/src/main/java/com/wireguard/android/widget/ToggleSwitch.java @@ -8,7 +8,7 @@ package com.wireguard.android.widget; import android.content.Context; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.Switch; diff --git a/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionButtonBehavior.java b/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionButtonBehavior.java index 3741c29e..a351f4cf 100644 --- a/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionButtonBehavior.java +++ b/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionButtonBehavior.java @@ -10,9 +10,9 @@ import android.animation.AnimatorListenerAdapter; import android.animation.TimeInterpolator; import android.animation.ValueAnimator; import android.content.Context; -import android.support.design.widget.CoordinatorLayout; -import android.support.design.widget.Snackbar; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import com.google.android.material.snackbar.Snackbar; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenu.java b/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenu.java index 8b69ce35..2fee71f1 100644 --- a/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenu.java +++ b/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenu.java @@ -20,11 +20,11 @@ import android.graphics.drawable.LayerDrawable; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Keep; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v7.widget.AppCompatTextView; +import androidx.annotation.Keep; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.core.content.res.ResourcesCompat; +import androidx.appcompat.widget.AppCompatTextView; import android.util.AttributeSet; import android.view.ContextThemeWrapper; import android.view.TouchDelegate; diff --git a/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenuRecyclerViewScrollListener.java b/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenuRecyclerViewScrollListener.java index 5ca05024..2e516003 100644 --- a/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenuRecyclerViewScrollListener.java +++ b/app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenuRecyclerViewScrollListener.java @@ -5,7 +5,7 @@ package com.wireguard.android.widget.fab; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; public class FloatingActionsMenuRecyclerViewScrollListener extends RecyclerView.OnScrollListener { private static final float SCALE_FACTOR = 1.5f; diff --git a/app/src/main/java/com/wireguard/android/widget/fab/LabeledFloatingActionButton.java b/app/src/main/java/com/wireguard/android/widget/fab/LabeledFloatingActionButton.java index d45f6a58..17512ba3 100644 --- a/app/src/main/java/com/wireguard/android/widget/fab/LabeledFloatingActionButton.java +++ b/app/src/main/java/com/wireguard/android/widget/fab/LabeledFloatingActionButton.java @@ -8,8 +8,8 @@ package com.wireguard.android.widget.fab; import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import android.util.AttributeSet; import android.widget.TextView; diff --git a/app/src/main/java/com/wireguard/android/widget/fab/TouchDelegateGroup.java b/app/src/main/java/com/wireguard/android/widget/fab/TouchDelegateGroup.java index ddb2899b..88bf838d 100644 --- a/app/src/main/java/com/wireguard/android/widget/fab/TouchDelegateGroup.java +++ b/app/src/main/java/com/wireguard/android/widget/fab/TouchDelegateGroup.java @@ -7,7 +7,7 @@ package com.wireguard.android.widget.fab; import android.graphics.Rect; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.MotionEvent; import android.view.TouchDelegate; import android.view.View; diff --git a/app/src/main/java/com/wireguard/config/BadConfigException.java b/app/src/main/java/com/wireguard/config/BadConfigException.java index 7f794a35..edf3216e 100644 --- a/app/src/main/java/com/wireguard/config/BadConfigException.java +++ b/app/src/main/java/com/wireguard/config/BadConfigException.java @@ -5,7 +5,7 @@ package com.wireguard.config; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.wireguard.crypto.KeyFormatException; diff --git a/app/src/main/java/com/wireguard/config/Config.java b/app/src/main/java/com/wireguard/config/Config.java index 8b393bef..e1e11eec 100644 --- a/app/src/main/java/com/wireguard/config/Config.java +++ b/app/src/main/java/com/wireguard/config/Config.java @@ -5,7 +5,7 @@ package com.wireguard.config; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.wireguard.config.BadConfigException.Location; import com.wireguard.config.BadConfigException.Reason; diff --git a/app/src/main/java/com/wireguard/config/InetEndpoint.java b/app/src/main/java/com/wireguard/config/InetEndpoint.java index 5f6a90d5..4fbfe0c3 100644 --- a/app/src/main/java/com/wireguard/config/InetEndpoint.java +++ b/app/src/main/java/com/wireguard/config/InetEndpoint.java @@ -5,7 +5,7 @@ package com.wireguard.config; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.threeten.bp.Duration; import org.threeten.bp.Instant; diff --git a/app/src/main/java/com/wireguard/config/Interface.java b/app/src/main/java/com/wireguard/config/Interface.java index 2fd34a32..5876ad74 100644 --- a/app/src/main/java/com/wireguard/config/Interface.java +++ b/app/src/main/java/com/wireguard/config/Interface.java @@ -5,7 +5,7 @@ package com.wireguard.config; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.wireguard.config.BadConfigException.Location; import com.wireguard.config.BadConfigException.Reason; diff --git a/app/src/main/java/com/wireguard/config/ParseException.java b/app/src/main/java/com/wireguard/config/ParseException.java index c8482af2..67486294 100644 --- a/app/src/main/java/com/wireguard/config/ParseException.java +++ b/app/src/main/java/com/wireguard/config/ParseException.java @@ -5,7 +5,7 @@ package com.wireguard.config; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** */ diff --git a/app/src/main/java/com/wireguard/config/Peer.java b/app/src/main/java/com/wireguard/config/Peer.java index cdea030a..7ee7d7c9 100644 --- a/app/src/main/java/com/wireguard/config/Peer.java +++ b/app/src/main/java/com/wireguard/config/Peer.java @@ -5,7 +5,7 @@ package com.wireguard.config; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.wireguard.config.BadConfigException.Location; import com.wireguard.config.BadConfigException.Reason; diff --git a/app/src/main/java/com/wireguard/crypto/Curve25519.java b/app/src/main/java/com/wireguard/crypto/Curve25519.java index 6cb06d71..1aa24994 100644 --- a/app/src/main/java/com/wireguard/crypto/Curve25519.java +++ b/app/src/main/java/com/wireguard/crypto/Curve25519.java @@ -6,7 +6,7 @@ package com.wireguard.crypto; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.Arrays; diff --git a/app/src/main/java/com/wireguard/util/KeyedList.java b/app/src/main/java/com/wireguard/util/KeyedList.java index 48857905..c890b04c 100644 --- a/app/src/main/java/com/wireguard/util/KeyedList.java +++ b/app/src/main/java/com/wireguard/util/KeyedList.java @@ -5,7 +5,7 @@ package com.wireguard.util; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.Collection; import java.util.List; diff --git a/app/src/main/java/com/wireguard/util/SortedKeyedList.java b/app/src/main/java/com/wireguard/util/SortedKeyedList.java index fd38dcea..78cbb752 100644 --- a/app/src/main/java/com/wireguard/util/SortedKeyedList.java +++ b/app/src/main/java/com/wireguard/util/SortedKeyedList.java @@ -5,7 +5,7 @@ package com.wireguard.util; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.Collection; import java.util.Comparator; |