aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/org/apg/Apg.java4
-rw-r--r--src/org/apg/Constants.java38
-rw-r--r--src/org/apg/Id.java2
-rw-r--r--src/org/apg/Preferences.java46
-rw-r--r--src/org/apg/provider/ApgServiceBlobProvider.java2
-rw-r--r--src/org/apg/ui/AboutActivity.java51
-rw-r--r--src/org/apg/ui/BaseActivity.java53
-rw-r--r--src/org/apg/ui/DecryptActivity.java26
-rw-r--r--src/org/apg/ui/EditKeyActivity.java2
-rw-r--r--src/org/apg/ui/EncryptActivity.java4
-rw-r--r--src/org/apg/ui/ImportFromQRCodeActivity.java6
-rw-r--r--src/org/apg/ui/KeyListActivity.java10
-rw-r--r--src/org/apg/ui/KeyServerQueryActivity.java2
-rw-r--r--src/org/apg/ui/PreferencesActivity.java18
-rw-r--r--src/org/apg/ui/PublicKeyListActivity.java2
-rw-r--r--src/org/apg/ui/SecretKeyListActivity.java2
-rw-r--r--src/org/apg/ui/SendKeyActivity.java2
-rw-r--r--src/org/apg/ui/SignKeyActivity.java12
18 files changed, 154 insertions, 128 deletions
diff --git a/src/org/apg/Apg.java b/src/org/apg/Apg.java
index d0e54f4d8..2bfdb31e6 100644
--- a/src/org/apg/Apg.java
+++ b/src/org/apg/Apg.java
@@ -1966,8 +1966,8 @@ public class Apg {
}
if (signatureKey == null) {
Bundle pauseData = new Bundle();
- pauseData.putInt(Constants.extras.status, Id.message.unknown_signature_key);
- pauseData.putLong(Constants.extras.key_id, signatureKeyId);
+ pauseData.putInt(Constants.extras.STATUS, Id.message.unknown_signature_key);
+ pauseData.putLong(Constants.extras.KEY_ID, signatureKeyId);
Message msg = new Message();
msg.setData(pauseData);
context.sendMessage(msg);
diff --git a/src/org/apg/Constants.java b/src/org/apg/Constants.java
index 90822189a..9669d4b0d 100644
--- a/src/org/apg/Constants.java
+++ b/src/org/apg/Constants.java
@@ -20,35 +20,35 @@ import android.os.Environment;
public final class Constants {
- public static final String tag = "APG";
+ public static final String TAG = "APG";
public static final class path {
- public static final String app_dir = Environment.getExternalStorageDirectory() + "/APG";
+ public static final String APP_DIR = Environment.getExternalStorageDirectory() + "/APG";
}
public static final class pref {
- public static final String has_seen_help = "seenHelp";
- public static final String has_seen_change_log = "seenChangeLogDialog";
- public static final String default_encryption_algorithm = "defaultEncryptionAlgorithm";
- public static final String default_hash_algorithm = "defaultHashAlgorithm";
- public static final String default_ascii_armour = "defaultAsciiArmour";
- public static final String default_message_compression = "defaultMessageCompression";
- public static final String default_file_compression = "defaultFileCompression";
- public static final String pass_phrase_cache_ttl = "passPhraseCacheTtl";
- public static final String language = "language";
- public static final String force_v3_signatures = "forceV3Signatures";
- public static final String key_servers = "keyServers";
+ public static final String HAS_SEEN_HELP = "seenHelp";
+ public static final String HAS_SEEN_CHANGE_LOG = "seenChangeLogDialog";
+ public static final String DEFAULT_ENCRYPTION_ALGORITHM = "defaultEncryptionAlgorithm";
+ public static final String DEFAULT_HASH_ALGORITHM = "defaultHashAlgorithm";
+ public static final String DEFAULT_ASCII_ARMOUR = "defaultAsciiArmour";
+ public static final String DEFAULT_MESSAGE_COMPRESSION = "defaultMessageCompression";
+ public static final String DEFAULT_FILE_COMPRESSION = "defaultFileCompression";
+ public static final String PASS_PHRASE_CACHE_TTL = "passPhraseCacheTtl";
+ public static final String LANGUAGE = "language";
+ public static final String FORCE_V3_SIGNATURES = "forceV3Signatures";
+ public static final String KEY_SERVERS = "keyServers";
}
public static final class defaults {
- public static final String key_servers = "pool.sks-keyservers.net, subkeys.pgp.net, pgp.mit.edu";
+ public static final String KEY_SERVERS = "pool.sks-keyservers.net, subkeys.pgp.net, pgp.mit.edu";
}
public static final class extras {
- public static final String progress = "progress";
- public static final String progress_max = "max";
- public static final String status = "status";
- public static final String message = "message";
- public static final String key_id = "keyId";
+ public static final String PROGRESS = "progress";
+ public static final String PROGRESS_MAX = "max";
+ public static final String STATUS = "status";
+ public static final String MESSAGE = "message";
+ public static final String KEY_ID = "keyId";
}
}
diff --git a/src/org/apg/Id.java b/src/org/apg/Id.java
index e0ffa95cd..adcad0534 100644
--- a/src/org/apg/Id.java
+++ b/src/org/apg/Id.java
@@ -88,7 +88,7 @@ public final class Id {
public static final int export_keys = 0x2107000c;
public static final int exporting = 0x2107000d;
public static final int new_account = 0x2107000e;
- public static final int about = 0x2107000f;
+// public static final int about = 0x2107000f;
public static final int change_log = 0x21070010;
public static final int output_filename = 0x21070011;
public static final int delete_file = 0x21070012;
diff --git a/src/org/apg/Preferences.java b/src/org/apg/Preferences.java
index 0bd79290f..f4800e064 100644
--- a/src/org/apg/Preferences.java
+++ b/src/org/apg/Preferences.java
@@ -28,17 +28,17 @@ public class Preferences {
}
public String getLanguage() {
- return mSharedPreferences.getString(Constants.pref.language, "");
+ return mSharedPreferences.getString(Constants.pref.LANGUAGE, "");
}
public void setLanguage(String value) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
- editor.putString(Constants.pref.language, value);
+ editor.putString(Constants.pref.LANGUAGE, value);
editor.commit();
}
public int getPassPhraseCacheTtl() {
- int ttl = mSharedPreferences.getInt(Constants.pref.pass_phrase_cache_ttl, 180);
+ int ttl = mSharedPreferences.getInt(Constants.pref.PASS_PHRASE_CACHE_TTL, 180);
// fix the value if it was set to "never" in previous versions, which currently is not
// supported
if (ttl == 0) {
@@ -49,97 +49,97 @@ public class Preferences {
public void setPassPhraseCacheTtl(int value) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
- editor.putInt(Constants.pref.pass_phrase_cache_ttl, value);
+ editor.putInt(Constants.pref.PASS_PHRASE_CACHE_TTL, value);
editor.commit();
}
public int getDefaultEncryptionAlgorithm() {
- return mSharedPreferences.getInt(Constants.pref.default_encryption_algorithm,
+ return mSharedPreferences.getInt(Constants.pref.DEFAULT_ENCRYPTION_ALGORITHM,
PGPEncryptedData.AES_256);
}
public void setDefaultEncryptionAlgorithm(int value) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
- editor.putInt(Constants.pref.default_encryption_algorithm, value);
+ editor.putInt(Constants.pref.DEFAULT_ENCRYPTION_ALGORITHM, value);
editor.commit();
}
public int getDefaultHashAlgorithm() {
- return mSharedPreferences.getInt(Constants.pref.default_hash_algorithm,
+ return mSharedPreferences.getInt(Constants.pref.DEFAULT_HASH_ALGORITHM,
HashAlgorithmTags.SHA256);
}
public void setDefaultHashAlgorithm(int value) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
- editor.putInt(Constants.pref.default_hash_algorithm, value);
+ editor.putInt(Constants.pref.DEFAULT_HASH_ALGORITHM, value);
editor.commit();
}
public int getDefaultMessageCompression() {
- return mSharedPreferences.getInt(Constants.pref.default_message_compression,
+ return mSharedPreferences.getInt(Constants.pref.DEFAULT_MESSAGE_COMPRESSION,
Id.choice.compression.zlib);
}
public void setDefaultMessageCompression(int value) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
- editor.putInt(Constants.pref.default_message_compression, value);
+ editor.putInt(Constants.pref.DEFAULT_MESSAGE_COMPRESSION, value);
editor.commit();
}
public int getDefaultFileCompression() {
- return mSharedPreferences.getInt(Constants.pref.default_file_compression,
+ return mSharedPreferences.getInt(Constants.pref.DEFAULT_FILE_COMPRESSION,
Id.choice.compression.none);
}
public void setDefaultFileCompression(int value) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
- editor.putInt(Constants.pref.default_file_compression, value);
+ editor.putInt(Constants.pref.DEFAULT_FILE_COMPRESSION, value);
editor.commit();
}
public boolean getDefaultAsciiArmour() {
- return mSharedPreferences.getBoolean(Constants.pref.default_ascii_armour, false);
+ return mSharedPreferences.getBoolean(Constants.pref.DEFAULT_ASCII_ARMOUR, false);
}
public void setDefaultAsciiArmour(boolean value) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
- editor.putBoolean(Constants.pref.default_ascii_armour, value);
+ editor.putBoolean(Constants.pref.DEFAULT_ASCII_ARMOUR, value);
editor.commit();
}
public boolean getForceV3Signatures() {
- return mSharedPreferences.getBoolean(Constants.pref.force_v3_signatures, false);
+ return mSharedPreferences.getBoolean(Constants.pref.FORCE_V3_SIGNATURES, false);
}
public void setForceV3Signatures(boolean value) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
- editor.putBoolean(Constants.pref.force_v3_signatures, value);
+ editor.putBoolean(Constants.pref.FORCE_V3_SIGNATURES, value);
editor.commit();
}
public boolean hasSeenChangeLog(String version) {
- return mSharedPreferences.getBoolean(Constants.pref.has_seen_change_log + version, false);
+ return mSharedPreferences.getBoolean(Constants.pref.HAS_SEEN_CHANGE_LOG + version, false);
}
public void setHasSeenChangeLog(String version, boolean value) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
- editor.putBoolean(Constants.pref.has_seen_change_log + version, value);
+ editor.putBoolean(Constants.pref.HAS_SEEN_CHANGE_LOG + version, value);
editor.commit();
}
public boolean hasSeenHelp() {
- return mSharedPreferences.getBoolean(Constants.pref.has_seen_help, false);
+ return mSharedPreferences.getBoolean(Constants.pref.HAS_SEEN_HELP, false);
}
public void setHasSeenHelp(boolean value) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
- editor.putBoolean(Constants.pref.has_seen_help, value);
+ editor.putBoolean(Constants.pref.HAS_SEEN_HELP, value);
editor.commit();
}
public String[] getKeyServers() {
- String rawData = mSharedPreferences.getString(Constants.pref.key_servers,
- Constants.defaults.key_servers);
+ String rawData = mSharedPreferences.getString(Constants.pref.KEY_SERVERS,
+ Constants.defaults.KEY_SERVERS);
Vector<String> servers = new Vector<String>();
String chunks[] = rawData.split(",");
for (int i = 0; i < chunks.length; ++i) {
@@ -164,7 +164,7 @@ public class Preferences {
}
rawData += tmp;
}
- editor.putString(Constants.pref.key_servers, rawData);
+ editor.putString(Constants.pref.KEY_SERVERS, rawData);
editor.commit();
}
}
diff --git a/src/org/apg/provider/ApgServiceBlobProvider.java b/src/org/apg/provider/ApgServiceBlobProvider.java
index 18aa76d5e..f2d5377a4 100644
--- a/src/org/apg/provider/ApgServiceBlobProvider.java
+++ b/src/org/apg/provider/ApgServiceBlobProvider.java
@@ -24,7 +24,7 @@ public class ApgServiceBlobProvider extends ContentProvider {
private static final String COLUMN_KEY = "key";
- private static final String STORE_PATH = Constants.path.app_dir+"/ApgServiceBlobs";
+ private static final String STORE_PATH = Constants.path.APP_DIR+"/ApgServiceBlobs";
private ApgServiceBlobDatabase mDb = null;
diff --git a/src/org/apg/ui/AboutActivity.java b/src/org/apg/ui/AboutActivity.java
new file mode 100644
index 000000000..308a1e06e
--- /dev/null
+++ b/src/org/apg/ui/AboutActivity.java
@@ -0,0 +1,51 @@
+package org.apg.ui;
+
+import org.apg.Constants;
+import org.apg.R;
+
+import android.app.Activity;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.TextView;
+
+public class AboutActivity extends Activity {
+ Activity mActivity;
+
+ /**
+ * Instantiate View for this Activity
+ */
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.about_activity);
+
+ mActivity = this;
+
+ TextView versionText = (TextView) findViewById(R.id.about_version);
+ versionText.setText(getString(R.string.about_version) + " " + getVersion());
+ }
+
+ /**
+ * Get the current package version.
+ *
+ * @return The current version.
+ */
+ private String getVersion() {
+ String result = "";
+ try {
+ PackageManager manager = mActivity.getPackageManager();
+ PackageInfo info = manager.getPackageInfo(mActivity.getPackageName(), 0);
+
+ result = String.format("%s (%s)", info.versionName, info.versionCode);
+ } catch (NameNotFoundException e) {
+ Log.w(Constants.TAG, "Unable to get application version: " + e.getMessage());
+ result = "Unable to get application version.";
+ }
+
+ return result;
+ }
+}
diff --git a/src/org/apg/ui/BaseActivity.java b/src/org/apg/ui/BaseActivity.java
index 6e61b1412..9b5039a5d 100644
--- a/src/org/apg/ui/BaseActivity.java
+++ b/src/org/apg/ui/BaseActivity.java
@@ -79,7 +79,7 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp
Apg.initialize(this);
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
- File dir = new File(Constants.path.app_dir);
+ File dir = new File(Constants.path.APP_DIR);
if (!dir.exists() && !dir.mkdirs()) {
// ignore this for now, it's not crucial
// that the directory doesn't exist at this point
@@ -108,7 +108,7 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case Id.menu.option.about: {
- showDialog(Id.dialog.about);
+ startActivity(new Intent(this, AboutActivity.class));
return true;
}
@@ -187,31 +187,6 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp
mProgressDialog = null;
switch (id) {
- case Id.dialog.about: {
- AlertDialog.Builder alert = new AlertDialog.Builder(this);
-
- alert.setTitle("About " + Apg.getFullVersion(this));
-
- LayoutInflater inflater = (LayoutInflater) this
- .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- View layout = inflater.inflate(R.layout.info, null);
- TextView message = (TextView) layout.findViewById(R.id.message);
- message.setText("This is an attempt to bring OpenPGP to Android. "
- + "It is far from complete, but more features are planned (see website).\n\n"
- + "Feel free to send bug reports, suggestions, feature requests, feedback, "
- + "photographs.\n\n" + "mail: thi@thialfihar.org\n"
- + "site: http://apg.thialfihar.org\n\n"
- + "This software is provided \"as is\", without warranty of any kind.");
- alert.setView(layout);
-
- alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- BaseActivity.this.removeDialog(Id.dialog.about);
- }
- });
-
- return alert.create();
- }
case Id.dialog.pass_phrase: {
return AskForSecretKeyPassPhrase.createDialog(this, getSecretKeyId(), this);
@@ -266,7 +241,7 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp
mDeletingThread = new Thread(new Runnable() {
public void run() {
Bundle data = new Bundle();
- data.putInt(Constants.extras.status, Id.message.delete_done);
+ data.putInt(Constants.extras.STATUS, Id.message.delete_done);
try {
Apg.deleteFileSecurely(BaseActivity.this, file, BaseActivity.this);
} catch (FileNotFoundException e) {
@@ -330,9 +305,9 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp
public void setProgress(int progress, int max) {
Message msg = new Message();
Bundle data = new Bundle();
- data.putInt(Constants.extras.status, Id.message.progress_update);
- data.putInt(Constants.extras.progress, progress);
- data.putInt(Constants.extras.progress_max, max);
+ data.putInt(Constants.extras.STATUS, Id.message.progress_update);
+ data.putInt(Constants.extras.PROGRESS, progress);
+ data.putInt(Constants.extras.PROGRESS_MAX, max);
msg.setData(data);
mHandler.sendMessage(msg);
}
@@ -340,10 +315,10 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp
public void setProgress(String message, int progress, int max) {
Message msg = new Message();
Bundle data = new Bundle();
- data.putInt(Constants.extras.status, Id.message.progress_update);
- data.putString(Constants.extras.message, message);
- data.putInt(Constants.extras.progress, progress);
- data.putInt(Constants.extras.progress_max, max);
+ data.putInt(Constants.extras.STATUS, Id.message.progress_update);
+ data.putString(Constants.extras.MESSAGE, message);
+ data.putInt(Constants.extras.PROGRESS, progress);
+ data.putInt(Constants.extras.PROGRESS_MAX, max);
msg.setData(data);
mHandler.sendMessage(msg);
}
@@ -354,16 +329,16 @@ public class BaseActivity extends Activity implements Runnable, ProgressDialogUp
return;
}
- int type = data.getInt(Constants.extras.status);
+ int type = data.getInt(Constants.extras.STATUS);
switch (type) {
case Id.message.progress_update: {
- String message = data.getString(Constants.extras.message);
+ String message = data.getString(Constants.extras.MESSAGE);
if (mProgressDialog != null) {
if (message != null) {
mProgressDialog.setMessage(message);
}
- mProgressDialog.setMax(data.getInt(Constants.extras.progress_max));
- mProgressDialog.setProgress(data.getInt(Constants.extras.progress));
+ mProgressDialog.setMax(data.getInt(Constants.extras.PROGRESS_MAX));
+ mProgressDialog.setProgress(data.getInt(Constants.extras.PROGRESS));
}
break;
}
diff --git a/src/org/apg/ui/DecryptActivity.java b/src/org/apg/ui/DecryptActivity.java
index 48884cbfc..cb58dfb09 100644
--- a/src/org/apg/ui/DecryptActivity.java
+++ b/src/org/apg/ui/DecryptActivity.java
@@ -196,28 +196,28 @@ public class DecryptActivity extends BaseActivity {
// ignore, then
}
} else if (Apg.Intent.DECRYPT.equals(mIntent.getAction())) {
- Log.d(Constants.tag, "Apg Intent DECRYPT startet");
+ Log.d(Constants.TAG, "Apg Intent DECRYPT startet");
Bundle extras = mIntent.getExtras();
if (extras == null) {
- Log.d(Constants.tag, "extra bundle was null");
+ Log.d(Constants.TAG, "extra bundle was null");
extras = new Bundle();
} else {
- Log.d(Constants.tag, "got extras");
+ Log.d(Constants.TAG, "got extras");
}
mData = extras.getByteArray(Apg.EXTRA_DATA);
String textData = null;
if (mData == null) {
- Log.d(Constants.tag, "EXTRA_DATA was null");
+ Log.d(Constants.TAG, "EXTRA_DATA was null");
textData = extras.getString(Apg.EXTRA_TEXT);
} else {
- Log.d(Constants.tag, "Got data from EXTRA_DATA");
+ Log.d(Constants.TAG, "Got data from EXTRA_DATA");
}
if (textData != null) {
- Log.d(Constants.tag, "textData null, matching text ...");
+ Log.d(Constants.TAG, "textData null, matching text ...");
Matcher matcher = Apg.PGP_MESSAGE.matcher(textData);
if (matcher.matches()) {
- Log.d(Constants.tag, "PGP_MESSAGE matched");
+ Log.d(Constants.TAG, "PGP_MESSAGE matched");
textData = matcher.group(1);
// replace non breakable spaces
textData = textData.replaceAll("\\xa0", " ");
@@ -225,14 +225,14 @@ public class DecryptActivity extends BaseActivity {
} else {
matcher = Apg.PGP_SIGNED_MESSAGE.matcher(textData);
if (matcher.matches()) {
- Log.d(Constants.tag, "PGP_SIGNED_MESSAGE matched");
+ Log.d(Constants.TAG, "PGP_SIGNED_MESSAGE matched");
textData = matcher.group(1);
// replace non breakable spaces
textData = textData.replaceAll("\\xa0", " ");
mMessage.setText(textData);
mDecryptButton.setText(R.string.btn_verify);
} else {
- Log.d(Constants.tag, "Nothing matched!");
+ Log.d(Constants.TAG, "Nothing matched!");
}
}
}
@@ -377,7 +377,7 @@ public class DecryptActivity extends BaseActivity {
if (filename.endsWith(".asc") || filename.endsWith(".gpg") || filename.endsWith(".pgp")) {
filename = filename.substring(0, filename.length() - 4);
}
- mOutputFilename = Constants.path.app_dir + "/" + filename;
+ mOutputFilename = Constants.path.APP_DIR + "/" + filename;
}
private void updateSource() {
@@ -564,7 +564,7 @@ public class DecryptActivity extends BaseActivity {
error = "" + e;
}
- data.putInt(Constants.extras.status, Id.message.done);
+ data.putInt(Constants.extras.STATUS, Id.message.done);
if (error != null) {
data.putString(Apg.EXTRA_ERROR, error);
@@ -581,8 +581,8 @@ public class DecryptActivity extends BaseActivity {
return;
}
- if (data.getInt(Constants.extras.status) == Id.message.unknown_signature_key) {
- mUnknownSignatureKeyId = data.getLong(Constants.extras.key_id);
+ if (data.getInt(Constants.extras.STATUS) == Id.message.unknown_signature_key) {
+ mUnknownSignatureKeyId = data.getLong(Constants.extras.KEY_ID);
showDialog(Id.dialog.lookup_unknown_key);
return;
}
diff --git a/src/org/apg/ui/EditKeyActivity.java b/src/org/apg/ui/EditKeyActivity.java
index 6e1eab63e..c3945d4ed 100644
--- a/src/org/apg/ui/EditKeyActivity.java
+++ b/src/org/apg/ui/EditKeyActivity.java
@@ -257,7 +257,7 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener {
error = "" + e;
}
- data.putInt(Constants.extras.status, Id.message.done);
+ data.putInt(Constants.extras.STATUS, Id.message.done);
if (error != null) {
data.putString(Apg.EXTRA_ERROR, error);
diff --git a/src/org/apg/ui/EncryptActivity.java b/src/org/apg/ui/EncryptActivity.java
index 603d1a04d..e5892a4d5 100644
--- a/src/org/apg/ui/EncryptActivity.java
+++ b/src/org/apg/ui/EncryptActivity.java
@@ -421,7 +421,7 @@ public class EncryptActivity extends BaseActivity {
mInputFilename = mFilename.getText().toString();
File file = new File(mInputFilename);
String ending = (mAsciiArmour.isChecked() ? ".asc" : ".gpg");
- mOutputFilename = Constants.path.app_dir + "/" + file.getName() + ending;
+ mOutputFilename = Constants.path.APP_DIR + "/" + file.getName() + ending;
}
private void updateSource() {
@@ -731,7 +731,7 @@ public class EncryptActivity extends BaseActivity {
error = "" + e;
}
- data.putInt(Constants.extras.status, Id.message.done);
+ data.putInt(Constants.extras.STATUS, Id.message.done);
if (error != null) {
data.putString(Apg.EXTRA_ERROR, error);
diff --git a/src/org/apg/ui/ImportFromQRCodeActivity.java b/src/org/apg/ui/ImportFromQRCodeActivity.java
index 0d9209991..593c841df 100644
--- a/src/org/apg/ui/ImportFromQRCodeActivity.java
+++ b/src/org/apg/ui/ImportFromQRCodeActivity.java
@@ -69,11 +69,11 @@ public class ImportFromQRCodeActivity extends BaseActivity {
} catch (QueryException e) {
Log.e(TAG, "Failed to query KeyServer", e);
status.putString(Apg.EXTRA_ERROR, "Failed to query KeyServer");
- status.putInt(Constants.extras.status, Id.message.done);
+ status.putInt(Constants.extras.STATUS, Id.message.done);
} catch (IOException e) {
Log.e(TAG, "Failed to query KeyServer", e);
status.putString(Apg.EXTRA_ERROR, "Failed to query KeyServer");
- status.putInt(Constants.extras.status, Id.message.done);
+ status.putInt(Constants.extras.STATUS, Id.message.done);
}
}
};
@@ -107,7 +107,7 @@ public class ImportFromQRCodeActivity extends BaseActivity {
case Id.request.sign_key: {
// signals the end of processing. Signature was either applied, or it wasnt
- status.putInt(Constants.extras.status, Id.message.done);
+ status.putInt(Constants.extras.STATUS, Id.message.done);
msg.setData(status);
sendMessage(msg);
diff --git a/src/org/apg/ui/KeyListActivity.java b/src/org/apg/ui/KeyListActivity.java
index 00be0321a..6c76f02bc 100644
--- a/src/org/apg/ui/KeyListActivity.java
+++ b/src/org/apg/ui/KeyListActivity.java
@@ -74,8 +74,8 @@ public class KeyListActivity extends BaseActivity {
protected int mSelectedItem = -1;
protected int mTask = 0;
- protected String mImportFilename = Constants.path.app_dir + "/";
- protected String mExportFilename = Constants.path.app_dir + "/";
+ protected String mImportFilename = Constants.path.APP_DIR + "/";
+ protected String mExportFilename = Constants.path.APP_DIR + "/";
protected String mImportData;
protected boolean mDeleteAfterImport = false;
@@ -352,9 +352,9 @@ public class KeyListActivity extends BaseActivity {
mImportData = null;
if (mTask == Id.task.import_keys) {
- data.putInt(Constants.extras.status, Id.message.import_done);
+ data.putInt(Constants.extras.STATUS, Id.message.import_done);
} else {
- data.putInt(Constants.extras.status, Id.message.export_done);
+ data.putInt(Constants.extras.STATUS, Id.message.export_done);
}
if (error != null) {
@@ -381,7 +381,7 @@ public class KeyListActivity extends BaseActivity {
Bundle data = msg.getData();
if (data != null) {
- int type = data.getInt(Constants.extras.status);
+ int type = data.getInt(Constants.extras.STATUS);
switch (type) {
case Id.message.import_done: {
removeDialog(Id.dialog.importing);
diff --git a/src/org/apg/ui/KeyServerQueryActivity.java b/src/org/apg/ui/KeyServerQueryActivity.java
index f1f6466e3..606acb575 100644
--- a/src/org/apg/ui/KeyServerQueryActivity.java
+++ b/src/org/apg/ui/KeyServerQueryActivity.java
@@ -144,7 +144,7 @@ public class KeyServerQueryActivity extends BaseActivity {
error = "Too many responses.";
}
- data.putInt(Constants.extras.status, Id.message.done);
+ data.putInt(Constants.extras.STATUS, Id.message.done);
if (error != null) {
data.putString(Apg.EXTRA_ERROR, error);
diff --git a/src/org/apg/ui/PreferencesActivity.java b/src/org/apg/ui/PreferencesActivity.java
index 749f70657..421c9cc39 100644
--- a/src/org/apg/ui/PreferencesActivity.java
+++ b/src/org/apg/ui/PreferencesActivity.java
@@ -61,7 +61,7 @@ public class PreferencesActivity extends PreferenceActivity {
addPreferencesFromResource(R.xml.apg_preferences);
- mLanguage = (ListPreference) findPreference(Constants.pref.language);
+ mLanguage = (ListPreference) findPreference(Constants.pref.LANGUAGE);
Vector<CharSequence> entryVector = new Vector<CharSequence>(Arrays.asList(mLanguage.getEntries()));
Vector<CharSequence> entryValueVector = new Vector<CharSequence>(Arrays.asList(mLanguage.getEntryValues()));
String supportedLanguages[] = getResources().getStringArray(R.array.supported_languages);
@@ -90,7 +90,7 @@ public class PreferencesActivity extends PreferenceActivity {
}
});
- mPassPhraseCacheTtl = (IntegerListPreference) findPreference(Constants.pref.pass_phrase_cache_ttl);
+ mPassPhraseCacheTtl = (IntegerListPreference) findPreference(Constants.pref.PASS_PHRASE_CACHE_TTL);
mPassPhraseCacheTtl.setValue("" + mPreferences.getPassPhraseCacheTtl());
mPassPhraseCacheTtl.setSummary(mPassPhraseCacheTtl.getEntry());
mPassPhraseCacheTtl.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
@@ -105,7 +105,7 @@ public class PreferencesActivity extends PreferenceActivity {
}
});
- mEncryptionAlgorithm = (IntegerListPreference) findPreference(Constants.pref.default_encryption_algorithm);
+ mEncryptionAlgorithm = (IntegerListPreference) findPreference(Constants.pref.DEFAULT_ENCRYPTION_ALGORITHM);
int valueIds[] = {
PGPEncryptedData.AES_128, PGPEncryptedData.AES_192, PGPEncryptedData.AES_256,
PGPEncryptedData.BLOWFISH, PGPEncryptedData.TWOFISH, PGPEncryptedData.CAST5,
@@ -135,7 +135,7 @@ public class PreferencesActivity extends PreferenceActivity {
}
});
- mHashAlgorithm = (IntegerListPreference) findPreference(Constants.pref.default_hash_algorithm);
+ mHashAlgorithm = (IntegerListPreference) findPreference(Constants.pref.DEFAULT_HASH_ALGORITHM);
valueIds = new int[] {
HashAlgorithmTags.MD5, HashAlgorithmTags.RIPEMD160, HashAlgorithmTags.SHA1,
HashAlgorithmTags.SHA224, HashAlgorithmTags.SHA256, HashAlgorithmTags.SHA384,
@@ -165,7 +165,7 @@ public class PreferencesActivity extends PreferenceActivity {
}
});
- mMessageCompression = (IntegerListPreference) findPreference(Constants.pref.default_message_compression);
+ mMessageCompression = (IntegerListPreference) findPreference(Constants.pref.DEFAULT_MESSAGE_COMPRESSION);
valueIds = new int[] {
Id.choice.compression.none,
Id.choice.compression.zip,
@@ -197,7 +197,7 @@ public class PreferencesActivity extends PreferenceActivity {
}
});
- mFileCompression = (IntegerListPreference) findPreference(Constants.pref.default_file_compression);
+ mFileCompression = (IntegerListPreference) findPreference(Constants.pref.DEFAULT_FILE_COMPRESSION);
mFileCompression.setEntries(entries);
mFileCompression.setEntryValues(values);
mFileCompression.setValue("" + mPreferences.getDefaultFileCompression());
@@ -213,7 +213,7 @@ public class PreferencesActivity extends PreferenceActivity {
}
});
- mAsciiArmour = (CheckBoxPreference) findPreference(Constants.pref.default_ascii_armour);
+ mAsciiArmour = (CheckBoxPreference) findPreference(Constants.pref.DEFAULT_ASCII_ARMOUR);
mAsciiArmour.setChecked(mPreferences.getDefaultAsciiArmour());
mAsciiArmour.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
{
@@ -225,7 +225,7 @@ public class PreferencesActivity extends PreferenceActivity {
}
});
- mForceV3Signatures = (CheckBoxPreference) findPreference(Constants.pref.force_v3_signatures);
+ mForceV3Signatures = (CheckBoxPreference) findPreference(Constants.pref.FORCE_V3_SIGNATURES);
mForceV3Signatures.setChecked(mPreferences.getForceV3Signatures());
mForceV3Signatures.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
{
@@ -237,7 +237,7 @@ public class PreferencesActivity extends PreferenceActivity {
}
});
- mKeyServerPreference = (PreferenceScreen) findPreference(Constants.pref.key_servers);
+ mKeyServerPreference = (PreferenceScreen) findPreference(Constants.pref.KEY_SERVERS);
String servers[] = mPreferences.getKeyServers();
mKeyServerPreference.setSummary(getResources().getString(R.string.nKeyServers, servers.length));
mKeyServerPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
diff --git a/src/org/apg/ui/PublicKeyListActivity.java b/src/org/apg/ui/PublicKeyListActivity.java
index a9c5dbc15..81a79ce33 100644
--- a/src/org/apg/ui/PublicKeyListActivity.java
+++ b/src/org/apg/ui/PublicKeyListActivity.java
@@ -40,7 +40,7 @@ import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
public class PublicKeyListActivity extends KeyListActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
- mExportFilename = Constants.path.app_dir + "/pubexport.asc";
+ mExportFilename = Constants.path.APP_DIR + "/pubexport.asc";
mKeyType = Id.type.public_key;
super.onCreate(savedInstanceState);
}
diff --git a/src/org/apg/ui/SecretKeyListActivity.java b/src/org/apg/ui/SecretKeyListActivity.java
index c8a5c9866..a5d351bc6 100644
--- a/src/org/apg/ui/SecretKeyListActivity.java
+++ b/src/org/apg/ui/SecretKeyListActivity.java
@@ -45,7 +45,7 @@ import com.google.zxing.integration.android.IntentIntegrator;
public class SecretKeyListActivity extends KeyListActivity implements OnChildClickListener {
@Override
public void onCreate(Bundle savedInstanceState) {
- mExportFilename = Constants.path.app_dir + "/secexport.asc";
+ mExportFilename = Constants.path.APP_DIR + "/secexport.asc";
mKeyType = Id.type.secret_key;
super.onCreate(savedInstanceState);
mList.setOnChildClickListener(this);
diff --git a/src/org/apg/ui/SendKeyActivity.java b/src/org/apg/ui/SendKeyActivity.java
index 2dcb08d3d..c44e87469 100644
--- a/src/org/apg/ui/SendKeyActivity.java
+++ b/src/org/apg/ui/SendKeyActivity.java
@@ -73,7 +73,7 @@ public class SendKeyActivity extends BaseActivity {
}
}
- data.putInt(Constants.extras.status, Id.message.export_done);
+ data.putInt(Constants.extras.STATUS, Id.message.export_done);
if (error != null) {
data.putString(Apg.EXTRA_ERROR, error);
diff --git a/src/org/apg/ui/SignKeyActivity.java b/src/org/apg/ui/SignKeyActivity.java
index 6fad76dff..ab145c921 100644
--- a/src/org/apg/ui/SignKeyActivity.java
+++ b/src/org/apg/ui/SignKeyActivity.java
@@ -141,7 +141,7 @@ public class SignKeyActivity extends BaseActivity {
status.putString(Apg.EXTRA_ERROR, "Key has already been signed");
- status.putInt(Constants.extras.status, Id.message.done);
+ status.putInt(Constants.extras.STATUS, Id.message.done);
msg.setData(status);
sendMessage(msg);
@@ -221,26 +221,26 @@ public class SignKeyActivity extends BaseActivity {
} catch (PGPException e) {
Log.e(TAG, "Failed to sign key", e);
status.putString(Apg.EXTRA_ERROR, "Failed to sign key");
- status.putInt(Constants.extras.status, Id.message.done);
+ status.putInt(Constants.extras.STATUS, Id.message.done);
return;
} catch (NoSuchAlgorithmException e) {
Log.e(TAG, "Failed to sign key", e);
status.putString(Apg.EXTRA_ERROR, "Failed to sign key");
- status.putInt(Constants.extras.status, Id.message.done);
+ status.putInt(Constants.extras.STATUS, Id.message.done);
return;
} catch (NoSuchProviderException e) {
Log.e(TAG, "Failed to sign key", e);
status.putString(Apg.EXTRA_ERROR, "Failed to sign key");
- status.putInt(Constants.extras.status, Id.message.done);
+ status.putInt(Constants.extras.STATUS, Id.message.done);
return;
} catch (SignatureException e) {
Log.e(TAG, "Failed to sign key", e);
status.putString(Apg.EXTRA_ERROR, "Failed to sign key");
- status.putInt(Constants.extras.status, Id.message.done);
+ status.putInt(Constants.extras.STATUS, Id.message.done);
return;
}
- status.putInt(Constants.extras.status, Id.message.done);
+ status.putInt(Constants.extras.STATUS, Id.message.done);
msg.setData(status);
sendMessage(msg);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-05 10:51:36 +0000