From e4974ac4097b7b92b51134942b01e9ab300222de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 5 Aug 2014 23:50:59 +0200 Subject: Use CompressionAlgorithmTags instead of homebrew constants --- .../java/org/sufficientlysecure/keychain/Constants.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index d19233b3f..05676c5d0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -19,7 +19,6 @@ package org.sufficientlysecure.keychain; import android.os.Environment; -import org.spongycastle.bcpg.CompressionAlgorithmTags; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.sufficientlysecure.keychain.remote.ui.AppsListActivity; import org.sufficientlysecure.keychain.ui.DecryptActivity; @@ -50,7 +49,7 @@ public final class Constants { public static final String CUSTOM_CONTACT_DATA_MIME_TYPE = "vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"; - public static int TEMPFILE_TTL = 24*60*60*1000; // 1 day + public static int TEMPFILE_TTL = 24 * 60 * 60 * 1000; // 1 day public static final class Path { public static final File APP_DIR = new File(Environment.getExternalStorageDirectory(), "OpenKeychain"); @@ -90,16 +89,6 @@ public final class Constants { }; } - public static final class choice { - public static final class compression { - // TODO: legacy reasons :/ better: CompressionAlgorithmTags.UNCOMPRESSED - public static final int none = 0x21070001; - public static final int zlib = CompressionAlgorithmTags.ZLIB; - public static final int bzip2 = CompressionAlgorithmTags.BZIP2; - public static final int zip = CompressionAlgorithmTags.ZIP; - } - } - public static final class key { public static final int none = 0; public static final int symmetric = -1; -- cgit v1.2.3