cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into yubikey

Browse Source 
Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
This commit is contained in:
Dominik Schürmann
2014-08-01 11:09:25 +02:00
parent bef3e62111 acbf2a1861
commit e10cbc54c6
317 changed files with 5053 additions and 3006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
View File

@@ -129,7 +129,7 @@ public class Preferences {
editor.commit();
}
public boolean getFirstTime() {
public boolean isFirstTime() {
return mSharedPreferences.getBoolean(Constants.Pref.FIRST_TIME, true);
}