moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

keep prefernces individual per dialog (affects only compression)

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-06-03 01:21:06 +02:00
parent cf5fadae76
commit ecfbc743f3
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
View File

@ -85,7 +85,8 @@ public final class Constants {
public static final String USE_DEFAULT_YUBIKEY_PIN = "useDefaultYubikeyPin"; public static final String USE_DEFAULT_YUBIKEY_PIN = "useDefaultYubikeyPin";
public static final String USE_NUMKEYPAD_FOR_YUBIKEY_PIN = "useNumKeypadForYubikeyPin"; public static final String USE_NUMKEYPAD_FOR_YUBIKEY_PIN = "useNumKeypadForYubikeyPin";
public static final String ENCRYPT_FILENAMES = "encryptFilenames"; public static final String ENCRYPT_FILENAMES = "encryptFilenames";
public static final String USE_COMPRESSION = "useCompression"; public static final String FILE_USE_COMPRESSION = "useFileCompression";
public static final String TEXT_USE_COMPRESSION = "useTextCompression";
public static final String USE_ARMOR = "useArmor"; public static final String USE_ARMOR = "useArmor";
} }

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
View File

@ -41,7 +41,6 @@ import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.nispok.snackbar.Snackbar;
import org.spongycastle.bcpg.CompressionAlgorithmTags; import org.spongycastle.bcpg.CompressionAlgorithmTags;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
@ -184,7 +183,7 @@ public class EncryptFilesFragment extends CachingCryptoOperationFragment<SignEnc
if (args.containsKey(ARG_USE_COMPRESSION)) { if (args.containsKey(ARG_USE_COMPRESSION)) {
mUseCompression = args.getBoolean(ARG_USE_COMPRESSION, true); mUseCompression = args.getBoolean(ARG_USE_COMPRESSION, true);
} else { } else {
mUseCompression = prefs.getUseCompression(); mUseCompression = prefs.getFilesUseCompression();
} }
if (args.containsKey(ARG_ENCRYPT_FILENAMES)) { if (args.containsKey(ARG_ENCRYPT_FILENAMES)) {
@ -343,7 +342,7 @@ public class EncryptFilesFragment extends CachingCryptoOperationFragment<SignEnc
Notify.LENGTH_LONG, Style.OK, new ActionListener() { Notify.LENGTH_LONG, Style.OK, new ActionListener() {
@Override @Override
public void onAction() { public void onAction() {
Preferences.getPreferences(getActivity()).setUseCompression(compress); Preferences.getPreferences(getActivity()).setFilesUseCompression(compress);
Notify.create(getActivity(), compress Notify.create(getActivity(), compress
? R.string.snack_compression_on ? R.string.snack_compression_on
: R.string.snack_compression_off, : R.string.snack_compression_off,

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
View File

@ -142,7 +142,7 @@ public class EncryptTextFragment extends CachingCryptoOperationFragment<SignEncr
if (args.containsKey(ARG_USE_COMPRESSION)) { if (args.containsKey(ARG_USE_COMPRESSION)) {
mUseCompression = args.getBoolean(ARG_USE_COMPRESSION, true); mUseCompression = args.getBoolean(ARG_USE_COMPRESSION, true);
} else { } else {
mUseCompression = prefs.getUseCompression(); mUseCompression = prefs.getTextUseCompression();
} }
setHasOptionsMenu(true); setHasOptionsMenu(true);
@ -194,7 +194,7 @@ public class EncryptTextFragment extends CachingCryptoOperationFragment<SignEncr
Notify.LENGTH_LONG, Style.OK, new ActionListener() { Notify.LENGTH_LONG, Style.OK, new ActionListener() {
@Override @Override
public void onAction() { public void onAction() {
Preferences.getPreferences(getActivity()).setUseCompression(compress); Preferences.getPreferences(getActivity()).setTextUseCompression(compress);
Notify.create(getActivity(), compress Notify.create(getActivity(), compress
? R.string.snack_compression_on ? R.string.snack_compression_on
: R.string.snack_compression_off, : R.string.snack_compression_off,

20
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
View File

@ -182,16 +182,28 @@ public class Preferences {
editor.commit(); editor.commit();
} }
public void setUseCompression(boolean compress) { public void setFilesUseCompression(boolean compress) {
SharedPreferences.Editor editor = mSharedPreferences.edit(); SharedPreferences.Editor editor = mSharedPreferences.edit();
editor.putBoolean(Pref.USE_COMPRESSION, compress); editor.putBoolean(Pref.FILE_USE_COMPRESSION, compress);
editor.commit(); editor.commit();
} }
public boolean getUseCompression() { public boolean getFilesUseCompression() {
return mSharedPreferences.getBoolean(Pref.USE_COMPRESSION, true); return mSharedPreferences.getBoolean(Pref.FILE_USE_COMPRESSION, true);
} }
public void setTextUseCompression(boolean compress) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
editor.putBoolean(Pref.TEXT_USE_COMPRESSION, compress);
editor.commit();
}
public boolean getTextUseCompression() {
return mSharedPreferences.getBoolean(Pref.TEXT_USE_COMPRESSION, true);
}
public void setUseArmor(boolean useArmor) { public void setUseArmor(boolean useArmor) {
SharedPreferences.Editor editor = mSharedPreferences.edit(); SharedPreferences.Editor editor = mSharedPreferences.edit();
editor.putBoolean(Pref.USE_ARMOR, useArmor); editor.putBoolean(Pref.USE_ARMOR, useArmor);