diff options
| author | Norbel AMBANUMBEN <aanorbel@gmail.com> | 2024-10-09 22:05:04 +0100 |
|---|---|---|
| committer | Norbel AMBANUMBEN <aanorbel@gmail.com> | 2024-10-09 22:05:04 +0100 |
| commit | 236ce1209278fae174713d605300b6ed3f16febb (patch) | |
| tree | 671a20ed4c9149fd61ce0d4ab8afbef270ce84e5 | |
| parent | 61106968cbdf96a4fa578d16aff03865b985e547 (diff) | |
configure provider setup after notifications
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/providersetup/SetupViewPagerAdapter.java | 4 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/SetupFragmentFactory.java | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/SetupViewPagerAdapter.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/SetupViewPagerAdapter.java index fb190dc2..4f7f2957 100644 --- a/app/src/main/java/se/leap/bitmaskclient/providersetup/SetupViewPagerAdapter.java +++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/SetupViewPagerAdapter.java @@ -38,7 +38,6 @@ public class SetupViewPagerAdapter extends FragmentStateAdapter { fragments.add(PROVIDER_SELECTION_FRAGMENT); } fragments.add(CIRCUMVENTION_SETUP_FRAGMENT); - fragments.add(CONFIGURE_PROVIDER_FRAGMENT); } if (vpnPermissionRequest != null) { @@ -49,6 +48,9 @@ public class SetupViewPagerAdapter extends FragmentStateAdapter { fragments.add(NOTIFICATION_PERMISSON_EDUCATIONAL_FRAGMENT); fragments.add(NOTIFICATION_PERMISSON_FRAGMENT); } + if (providerSetup) { + fragments.add(CONFIGURE_PROVIDER_FRAGMENT); + } fragments.add(SUCCESS_FRAGMENT); setupFragmentFactory = new SetupFragmentFactory(fragments, vpnPermissionRequest); } diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/SetupFragmentFactory.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/SetupFragmentFactory.java index eaf3fbfa..5cf15e7c 100644 --- a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/SetupFragmentFactory.java +++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/SetupFragmentFactory.java @@ -11,11 +11,11 @@ import java.util.ArrayList; public class SetupFragmentFactory { public static final int PROVIDER_SELECTION_FRAGMENT = 0; public static final int CIRCUMVENTION_SETUP_FRAGMENT = 1; - public static final int CONFIGURE_PROVIDER_FRAGMENT = 2; - public static final int VPN_PERMISSON_EDUCATIONAL_FRAGMENT = 3; - public static final int VPN_PERMISSON_FRAGMENT = 4; - public static final int NOTIFICATION_PERMISSON_EDUCATIONAL_FRAGMENT = 5; - public static final int NOTIFICATION_PERMISSON_FRAGMENT = 6; + public static final int VPN_PERMISSON_EDUCATIONAL_FRAGMENT = 2; + public static final int VPN_PERMISSON_FRAGMENT = 3; + public static final int NOTIFICATION_PERMISSON_EDUCATIONAL_FRAGMENT = 4; + public static final int NOTIFICATION_PERMISSON_FRAGMENT = 5; + public static final int CONFIGURE_PROVIDER_FRAGMENT = 6; public static final int SUCCESS_FRAGMENT = 7; |