diff options
| author | cyberta <cyberta@riseup.net> | 2020-03-17 08:15:56 -0700 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2020-03-17 08:15:56 -0700 |
| commit | e0fb2a88c633908bba9e465e1bf1e19a4a5686e6 (patch) | |
| tree | 781613cce835be44ea86178f8af6cb60a84a703e /app/src/production/java | |
| parent | 05205190ee65a5fa14f18d12f86f5427368bea44 (diff) | |
| parent | cea55aaaab23a74dc790afca12671303fc344f97 (diff) | |
Merge branch 'androidx' into 'master'
Androidx
See merge request leap/bitmask_android!103
Diffstat (limited to 'app/src/production/java')
3 files changed, 2 insertions, 7 deletions
diff --git a/app/src/production/java/se/leap/bitmaskclient/AddProviderActivity.java b/app/src/production/java/se/leap/bitmaskclient/AddProviderActivity.java index 32c78c38..ed076d3f 100644 --- a/app/src/production/java/se/leap/bitmaskclient/AddProviderActivity.java +++ b/app/src/production/java/se/leap/bitmaskclient/AddProviderActivity.java @@ -1,11 +1,6 @@ package se.leap.bitmaskclient; -import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TextInputEditText; -import android.support.design.widget.TextInputLayout; -import android.text.Editable; -import android.text.TextWatcher; import android.view.View; import android.widget.Button; diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderApiManager.java b/app/src/production/java/se/leap/bitmaskclient/ProviderApiManager.java index 6f1e3034..ceaeebc0 100644 --- a/app/src/production/java/se/leap/bitmaskclient/ProviderApiManager.java +++ b/app/src/production/java/se/leap/bitmaskclient/ProviderApiManager.java @@ -20,7 +20,7 @@ package se.leap.bitmaskclient; import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Bundle; -import android.support.multidex.BuildConfig; +import androidx.multidex.BuildConfig; import android.util.Pair; import org.json.JSONException; diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java b/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java index 7c617e29..cf327791 100644 --- a/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java +++ b/app/src/production/java/se/leap/bitmaskclient/ProviderListActivity.java @@ -16,7 +16,7 @@ */ package se.leap.bitmaskclient; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import static se.leap.bitmaskclient.ProviderAPI.SET_UP_PROVIDER; import static se.leap.bitmaskclient.ProviderSetupInterface.ProviderConfigState.SETTING_UP_PROVIDER; |