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/test/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/test/java')
| -rw-r--r-- | app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java | 2 | ||||
| -rw-r--r-- | app/src/test/java/se/leap/bitmaskclient/testutils/MockSharedPreferences.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java b/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java index c0fc6531..1c205c83 100644 --- a/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java +++ b/app/src/test/java/se/leap/bitmaskclient/testutils/MockHelper.java @@ -9,7 +9,7 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.Parcelable; import android.os.ResultReceiver; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.json.JSONException; diff --git a/app/src/test/java/se/leap/bitmaskclient/testutils/MockSharedPreferences.java b/app/src/test/java/se/leap/bitmaskclient/testutils/MockSharedPreferences.java index af35af31..be0cf41f 100644 --- a/app/src/test/java/se/leap/bitmaskclient/testutils/MockSharedPreferences.java +++ b/app/src/test/java/se/leap/bitmaskclient/testutils/MockSharedPreferences.java @@ -18,7 +18,7 @@ package se.leap.bitmaskclient.testutils; import android.content.SharedPreferences; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.HashMap; import java.util.Map; |