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/ProviderSetupFailedDialog.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/ProviderSetupFailedDialog.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java index e2f3e173..d64f34d8 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java @@ -21,9 +21,9 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; import org.json.JSONObject; |