Revision 72b0db4c app/src/info/guardianproject/notepadbot/Settings.java

View differences:

app/src/info/guardianproject/notepadbot/Settings.java
77 77

  
78 78
	@Override
79 79
	public void onDestroy() {
80
		// reload preferences on exit from settings screen
81
		Context context = getApplicationContext();
82
		loadSettings(context);
83 80
		super.onDestroy();
84 81
	}
85

  
86
	/** Loads user settings to app. Called when settings change and users exits from 
87
	 *  settings screen or when the app first starts. 
88
	 *  */
89
	public static void loadSettings(Context context) {
90
		
91
	}
92 82
	
93 83
	private Preference.OnPreferenceClickListener changeLockTimeoutListener = 
94 84
			new Preference.OnPreferenceClickListener() {
......
115 105
	}
116 106
	
117 107
	private void changeTimeoutPrompt() {
108
		if (mCacheWord.isLocked())
109
            return;
110
		
118 111
        AlertDialog.Builder builder = new AlertDialog.Builder(this);
119 112
        builder.setTitle(R.string.change_timeout_prompt_title);
120 113
        builder.setMessage(R.string.change_timeout_prompt);

Also available in: Unified diff