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/main/java/se/leap/bitmaskclient/eip/EipCommand.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/main/java/se/leap/bitmaskclient/eip/EipCommand.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java b/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java index d2667e42..1f5b3741 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java @@ -4,15 +4,13 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.os.ResultReceiver; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.ContextCompat; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import se.leap.bitmaskclient.Provider; - import static se.leap.bitmaskclient.Constants.EIP_ACTION_CHECK_CERT_VALIDITY; import static se.leap.bitmaskclient.Constants.EIP_ACTION_CONFIGURE_TETHERING; import static se.leap.bitmaskclient.Constants.EIP_ACTION_START; |