Better selection of preferred algorithm

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
index a36af5c87..f1e9ccb28 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
@@ -210,6 +210,7 @@ public class Preferences {
         }
         return servers.toArray(chunks);
     }
+
     public String getPreferredKeyserver() {
         return getKeyServers()[0];
     }
@@ -246,6 +247,7 @@ public class Preferences {
         editor.putBoolean(Pref.SEARCH_KEYSERVER, searchKeyserver);
         editor.commit();
     }
+
     public void setSearchKeybase(boolean searchKeybase) {
         SharedPreferences.Editor editor = mSharedPreferences.edit();
         editor.putBoolean(Pref.SEARCH_KEYBASE, searchKeybase);
@@ -253,7 +255,7 @@ public class Preferences {
     }
 
     public CloudSearchPrefs getCloudSearchPrefs() {
-            return new CloudSearchPrefs(mSharedPreferences.getBoolean(Pref.SEARCH_KEYSERVER, true),
+        return new CloudSearchPrefs(mSharedPreferences.getBoolean(Pref.SEARCH_KEYSERVER, true),
                 mSharedPreferences.getBoolean(Pref.SEARCH_KEYBASE, true),
                 getPreferredKeyserver());
     }
@@ -322,6 +324,12 @@ public class Preferences {
                         setDefaultHashAlgorithm(HashAlgorithmTags.SHA256);
                     }
                 }
+                // fall through
+                case 5: {
+                    // use preferred hash and encryption algo setting
+                    setDefaultHashAlgorithm(Constants.OpenKeychainHashAlgorithmTags.USE_PREFERRED);
+                    setDefaultEncryptionAlgorithm(Constants.OpenKeychainSymmetricKeyAlgorithmTags.USE_PREFERRED);
+                }
             }
 
             // write new preference version