From cd160c98328dd2dab301d40d13364cf248419606 Mon Sep 17 00:00:00 2001 From: dtvv Date: Sun, 14 Oct 2018 02:24:46 -0500 Subject: [PATCH] -When PIN is configured it should not be showed at the beginning of the app -When PIN is configuren it should not be showed at the beginning of security settings app --- .../cy/agorise/crystalwallet/activities/IntroActivity.java | 2 +- .../crystalwallet/fragments/SecuritySettingsFragment.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/IntroActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/IntroActivity.java index 7a2f75f..1d76247 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/IntroActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/IntroActivity.java @@ -111,7 +111,7 @@ public class IntroActivity extends CustomActivity { } }); - this.getApplication().registerActivityLifecycleCallbacks(CrystalSecurityMonitor.getInstance(this)); + //this.getApplication().registerActivityLifecycleCallbacks(CrystalSecurityMonitor.getInstance(this)); diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java index b48a029..7b5ee8c 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java +++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java @@ -86,7 +86,7 @@ public class SecuritySettingsFragment extends Fragment { securityPagerAdapter = new SecurityPagerAdapter(getChildFragmentManager()); mPager.setAdapter(securityPagerAdapter); - switch(CrystalSecurityMonitor.getInstance(null).actualSecurity()) { + switch(CrystalSecurityMonitor.getInstance(getActivity()).actualSecurity()) { case GeneralSetting.SETTING_PASSWORD: mPager.setCurrentItem(1); break; @@ -117,7 +117,7 @@ public class SecuritySettingsFragment extends Fragment { public void setUserVisibleHint(boolean isVisibleToUser) { super.setUserVisibleHint(isVisibleToUser); if (isVisibleToUser) { - CrystalSecurityMonitor.getInstance(null).callPasswordRequest(this.getActivity()); + //CrystalSecurityMonitor.getInstance(null).callPasswordRequest(this.getActivity()); } }