X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/066324f60a25ff064c8c61f56e3ee849189a00ff..dde5e5575cd7358ebed3390ca384e78bf9e3d17b:/src/com/owncloud/android/ui/activity/PassCodeActivity.java diff --git a/src/com/owncloud/android/ui/activity/PassCodeActivity.java b/src/com/owncloud/android/ui/activity/PassCodeActivity.java index 7b8182c1..39727dcd 100644 --- a/src/com/owncloud/android/ui/activity/PassCodeActivity.java +++ b/src/com/owncloud/android/ui/activity/PassCodeActivity.java @@ -101,12 +101,11 @@ public class PassCodeActivity extends ActionBarActivity { if (savedInstanceState != null) { mConfirmingPassCode = savedInstanceState.getBoolean(PassCodeActivity.KEY_CONFIRMING_PASSCODE); mPassCodeDigits = savedInstanceState.getStringArray(PassCodeActivity.KEY_PASSCODE_DIGITS); - if(mConfirmingPassCode){ - //the app was in the passcodeconfirmation - requestPassCodeConfirmation(); - } } - if(savedInstanceState == null || (savedInstanceState != null && !mConfirmingPassCode)){ + if(mConfirmingPassCode){ + //the app was in the passcodeconfirmation + requestPassCodeConfirmation(); + }else{ /// pass code preference has just been activated in Preferences; // will receive and confirm pass code value mPassCodeHdr.setText(R.string.pass_code_configure_your_pass_code); @@ -129,9 +128,6 @@ public class PassCodeActivity extends ActionBarActivity { } setTextListeners(); - - ActionBar actionBar = getSupportActionBar(); - actionBar.setIcon(DisplayUtils.getSeasonalIconId()); }