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/Provider.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/Provider.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Provider.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java index 11d685f5..4dd7c76e 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Provider.java +++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java @@ -18,7 +18,7 @@ package se.leap.bitmaskclient; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.gson.Gson; @@ -30,8 +30,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Locale; -import se.leap.bitmaskclient.utils.IPAddress; - import static de.blinkt.openvpn.core.connection.Connection.TransportType.OBFS4; import static se.leap.bitmaskclient.Constants.CAPABILITIES; import static se.leap.bitmaskclient.Constants.GATEWAYS; |