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/ProviderSetupBaseActivity.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/ProviderSetupBaseActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ProviderSetupBaseActivity.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderSetupBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupBaseActivity.java index b1bb3b07..396b8b26 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderSetupBaseActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupBaseActivity.java @@ -20,10 +20,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.content.LocalBroadcastManager; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; import org.jetbrains.annotations.NotNull; |