diff options
Diffstat (limited to 'org_apg/src/org/thialfihar/android/apg/ui')
12 files changed, 76 insertions, 93 deletions
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/BaseActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/BaseActivity.java index 542f65d3c..f8df4b1f2 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/BaseActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/BaseActivity.java @@ -17,25 +17,20 @@ package org.thialfihar.android.apg.ui; import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; import org.thialfihar.android.apg.R; import org.thialfihar.android.apg.Constants; import org.thialfihar.android.apg.Id; import org.thialfihar.android.apg.ProgressDialogUpdater; +import org.thialfihar.android.apg.deprecated.AskForPassphrase; import org.thialfihar.android.apg.deprecated.PausableThread; import org.thialfihar.android.apg.helper.PGPMain; import org.thialfihar.android.apg.helper.Preferences; -import org.thialfihar.android.apg.passphrase.AskForPassphrase; -import org.thialfihar.android.apg.passphrase.PassphraseCacheService; import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.SherlockActivity; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.MenuItem; -import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.app.ProgressDialog; @@ -45,9 +40,6 @@ import android.os.Bundle; import android.os.Environment; import android.os.Handler; import android.os.Message; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.widget.Toast; public class BaseActivity extends SherlockFragmentActivity implements Runnable, ProgressDialogUpdater, AskForPassphrase.PassPhraseCallbackInterface { @@ -89,14 +81,14 @@ public class BaseActivity extends SherlockFragmentActivity implements Runnable, } } -// startCacheService(this, mPreferences); + // startCacheService(this, mPreferences); } -// public static void startCacheService(Activity activity, Preferences preferences) { -// Intent intent = new Intent(activity, PassphraseCacheService.class); -// intent.putExtra(PassphraseCacheService.EXTRA_TTL, preferences.getPassPhraseCacheTtl()); -// activity.startService(intent); -// } + // public static void startCacheService(Activity activity, Preferences preferences) { + // Intent intent = new Intent(activity, PassphraseCacheService.class); + // intent.putExtra(PassphraseCacheService.EXTRA_TTL, preferences.getPassPhraseCacheTtl()); + // activity.startService(intent); + // } @Override public boolean onOptionsItemSelected(MenuItem item) { @@ -218,48 +210,48 @@ public class BaseActivity extends SherlockFragmentActivity implements Runnable, return alert.create(); } -// case Id.dialog.delete_file: { -// AlertDialog.Builder alert = new AlertDialog.Builder(this); -// -// alert.setIcon(android.R.drawable.ic_dialog_alert); -// alert.setTitle(R.string.warning); -// alert.setMessage(this.getString(R.string.fileDeleteConfirmation, getDeleteFile())); -// -// alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { -// public void onClick(DialogInterface dialog, int id) { -// removeDialog(Id.dialog.delete_file); -// final File file = new File(getDeleteFile()); -// showDialog(Id.dialog.deleting); -// mDeletingThread = new Thread(new Runnable() { -// public void run() { -// Bundle data = new Bundle(); -// data.putInt(Constants.extras.STATUS, Id.message.delete_done); -// try { -// Apg.deleteFileSecurely(BaseActivity.this, file, BaseActivity.this); -// } catch (FileNotFoundException e) { -// data.putString(Apg.EXTRA_ERROR, BaseActivity.this.getString( -// R.string.error_fileNotFound, file)); -// } catch (IOException e) { -// data.putString(Apg.EXTRA_ERROR, BaseActivity.this.getString( -// R.string.error_fileDeleteFailed, file)); -// } -// Message msg = new Message(); -// msg.setData(data); -// sendMessage(msg); -// } -// }); -// mDeletingThread.start(); -// } -// }); -// alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { -// public void onClick(DialogInterface dialog, int id) { -// removeDialog(Id.dialog.delete_file); -// } -// }); -// alert.setCancelable(true); -// -// return alert.create(); -// } + // case Id.dialog.delete_file: { + // AlertDialog.Builder alert = new AlertDialog.Builder(this); + // + // alert.setIcon(android.R.drawable.ic_dialog_alert); + // alert.setTitle(R.string.warning); + // alert.setMessage(this.getString(R.string.fileDeleteConfirmation, getDeleteFile())); + // + // alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + // public void onClick(DialogInterface dialog, int id) { + // removeDialog(Id.dialog.delete_file); + // final File file = new File(getDeleteFile()); + // showDialog(Id.dialog.deleting); + // mDeletingThread = new Thread(new Runnable() { + // public void run() { + // Bundle data = new Bundle(); + // data.putInt(Constants.extras.STATUS, Id.message.delete_done); + // try { + // Apg.deleteFileSecurely(BaseActivity.this, file, BaseActivity.this); + // } catch (FileNotFoundException e) { + // data.putString(Apg.EXTRA_ERROR, BaseActivity.this.getString( + // R.string.error_fileNotFound, file)); + // } catch (IOException e) { + // data.putString(Apg.EXTRA_ERROR, BaseActivity.this.getString( + // R.string.error_fileDeleteFailed, file)); + // } + // Message msg = new Message(); + // msg.setData(data); + // sendMessage(msg); + // } + // }); + // mDeletingThread.start(); + // } + // }); + // alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { + // public void onClick(DialogInterface dialog, int id) { + // removeDialog(Id.dialog.delete_file); + // } + // }); + // alert.setCancelable(true); + // + // return alert.create(); + // } default: { break; @@ -335,11 +327,11 @@ public class BaseActivity extends SherlockFragmentActivity implements Runnable, break; } -// case Id.message.delete_done: { -// mProgressDialog = null; -// deleteDoneCallback(msg); -// break; -// } + // case Id.message.delete_done: { + // mProgressDialog = null; + // deleteDoneCallback(msg); + // break; + // } case Id.message.import_done: // intentionally no break case Id.message.export_done: // intentionally no break @@ -360,21 +352,21 @@ public class BaseActivity extends SherlockFragmentActivity implements Runnable, } -// public void deleteDoneCallback(Message msg) { -// removeDialog(Id.dialog.deleting); -// mDeletingThread = null; -// -// Bundle data = msg.getData(); -// String error = data.getString(Apg.EXTRA_ERROR); -// String message; -// if (error != null) { -// message = getString(R.string.errorMessage, error); -// } else { -// message = getString(R.string.fileDeleteSuccessful); -// } -// -// Toast.makeText(this, message, Toast.LENGTH_SHORT).show(); -// } + // public void deleteDoneCallback(Message msg) { + // removeDialog(Id.dialog.deleting); + // mDeletingThread = null; + // + // Bundle data = msg.getData(); + // String error = data.getString(Apg.EXTRA_ERROR); + // String message; + // if (error != null) { + // message = getString(R.string.errorMessage, error); + // } else { + // message = getString(R.string.fileDeleteSuccessful); + // } + // + // Toast.makeText(this, message, Toast.LENGTH_SHORT).show(); + // } public void passPhraseCallback(long keyId, String passPhrase) { // TODO: Not needed anymore, now implemented in AskForSecretKeyPass diff --git a/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java index 8a87a77ab..b491ca4c2 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/DecryptActivity.java @@ -770,9 +770,9 @@ public class DecryptActivity extends SherlockFragmentActivity { } } - if (data.getBoolean(ApgService.EXTRA_SIGNATURE)) { - String userId = data.getString(ApgService.EXTRA_SIGNATURE_USER_ID); - mSignatureKeyId = data.getLong(ApgService.EXTRA_SIGNATURE_KEY_ID); + if (data.getBoolean(ApgService.RESULT_SIGNATURE)) { + String userId = data.getString(ApgService.RESULT_SIGNATURE_USER_ID); + mSignatureKeyId = data.getLong(ApgService.RESULT_SIGNATURE_KEY_ID); mUserIdRest .setText("id: " + PGPHelper.getSmallFingerPrint(mSignatureKeyId)); if (userId == null) { @@ -785,9 +785,9 @@ public class DecryptActivity extends SherlockFragmentActivity { } mUserId.setText(userId); - if (data.getBoolean(ApgService.EXTRA_SIGNATURE_SUCCESS)) { + if (data.getBoolean(ApgService.RESULT_SIGNATURE_SUCCESS)) { mSignatureStatusImage.setImageResource(R.drawable.overlay_ok); - } else if (data.getBoolean(ApgService.EXTRA_SIGNATURE_UNKNOWN)) { + } else if (data.getBoolean(ApgService.RESULT_SIGNATURE_UNKNOWN)) { mSignatureStatusImage.setImageResource(R.drawable.overlay_error); Toast.makeText(DecryptActivity.this, R.string.unknownSignatureKeyTouchToLookUp, Toast.LENGTH_LONG) diff --git a/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java index 17ce7d5c9..b9270e22f 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java @@ -23,7 +23,6 @@ import org.thialfihar.android.apg.Constants; import org.thialfihar.android.apg.Id; import org.thialfihar.android.apg.helper.PGPHelper; import org.thialfihar.android.apg.helper.PGPMain; -import org.thialfihar.android.apg.helper.OtherHelper; import org.thialfihar.android.apg.helper.PGPConversionHelper; import org.thialfihar.android.apg.service.ApgHandler; import org.thialfihar.android.apg.service.ApgService; diff --git a/org_apg/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java index 1cb7ecaca..ec140e8d2 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java @@ -21,7 +21,6 @@ import org.thialfihar.android.apg.R; import org.thialfihar.android.apg.Constants; import org.thialfihar.android.apg.Id; import org.thialfihar.android.apg.helper.PGPHelper; -import org.thialfihar.android.apg.helper.PGPMain; import org.thialfihar.android.apg.util.HkpKeyServer; import org.thialfihar.android.apg.util.KeyServer.InsufficientQuery; import org.thialfihar.android.apg.util.KeyServer.KeyInfo; diff --git a/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java index db30b0671..dafc2924b 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java @@ -22,7 +22,6 @@ import java.security.Security; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.thialfihar.android.apg.Id; import org.thialfihar.android.apg.R; -import org.thialfihar.android.apg.helper.PGPMain; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockActivity; diff --git a/org_apg/src/org/thialfihar/android/apg/ui/PreferencesActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/PreferencesActivity.java index 84beee428..81a0545d1 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/PreferencesActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/PreferencesActivity.java @@ -20,9 +20,8 @@ import org.spongycastle.bcpg.HashAlgorithmTags; import org.spongycastle.openpgp.PGPEncryptedData; import org.thialfihar.android.apg.Constants; import org.thialfihar.android.apg.Id; -import org.thialfihar.android.apg.helper.PGPMain; import org.thialfihar.android.apg.helper.Preferences; -import org.thialfihar.android.apg.passphrase.PassphraseCacheService; +import org.thialfihar.android.apg.service.PassphraseCacheService; import org.thialfihar.android.apg.ui.widget.IntegerListPreference; import org.thialfihar.android.apg.R; diff --git a/org_apg/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java index ee193cdd5..b54cbde71 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java @@ -20,7 +20,6 @@ import java.util.Vector; import org.thialfihar.android.apg.Id; import org.thialfihar.android.apg.R; -import org.thialfihar.android.apg.helper.PGPMain; import org.thialfihar.android.apg.ui.widget.Editor; import org.thialfihar.android.apg.ui.widget.KeyServerEditor; import org.thialfihar.android.apg.ui.widget.Editor.EditorListener; diff --git a/org_apg/src/org/thialfihar/android/apg/ui/PublicKeyListActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/PublicKeyListActivity.java index 601f467aa..d5b05b64e 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/PublicKeyListActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/PublicKeyListActivity.java @@ -26,7 +26,6 @@ import org.thialfihar.android.apg.helper.PGPMain; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; -import android.app.ListActivity; import android.content.Intent; import android.os.Bundle; import android.view.ContextMenu; diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SecretKeyListActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/SecretKeyListActivity.java index 60c6a6ef6..2d5108cad 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/SecretKeyListActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/SecretKeyListActivity.java @@ -19,9 +19,9 @@ package org.thialfihar.android.apg.ui; import org.thialfihar.android.apg.R; import org.thialfihar.android.apg.Constants; import org.thialfihar.android.apg.Id; +import org.thialfihar.android.apg.deprecated.AskForPassphrase; import org.thialfihar.android.apg.helper.PGPHelper; import org.thialfihar.android.apg.helper.PGPMain; -import org.thialfihar.android.apg.passphrase.AskForPassphrase; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyListActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyListActivity.java index fb7e5a0dd..545db98f9 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyListActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyListActivity.java @@ -21,7 +21,6 @@ import java.util.Vector; import org.thialfihar.android.apg.Constants; import org.thialfihar.android.apg.R; import org.thialfihar.android.apg.Id; -import org.thialfihar.android.apg.helper.PGPMain; import org.thialfihar.android.apg.ui.widget.SelectPublicKeyListAdapter; import com.actionbarsherlock.app.ActionBar; diff --git a/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyListActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyListActivity.java index 865fab789..b36278a74 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyListActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyListActivity.java @@ -19,7 +19,6 @@ package org.thialfihar.android.apg.ui; import org.thialfihar.android.apg.Constants; import org.thialfihar.android.apg.R; import org.thialfihar.android.apg.Id; -import org.thialfihar.android.apg.helper.PGPMain; import org.thialfihar.android.apg.ui.widget.SelectSecretKeyListAdapter; import com.actionbarsherlock.app.ActionBar; diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java b/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java index 6efe17c6d..87d715fd9 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java @@ -20,7 +20,6 @@ import org.spongycastle.openpgp.PGPPublicKey; import org.spongycastle.openpgp.PGPSecretKey; import org.thialfihar.android.apg.Id; import org.thialfihar.android.apg.helper.PGPHelper; -import org.thialfihar.android.apg.helper.PGPMain; import org.thialfihar.android.apg.util.Choice; import org.thialfihar.android.apg.R; |