moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-17 07:30:14 -05:00
Code Issues Releases Wiki Activity

fixes to clipboard management

Browse Source
This commit is contained in:
Dominik 2012-03-09 15:41:31 +01:00
parent 7a2e1e42d9
commit df6933bfb8
5 changed files with 592 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/org/thialfihar/android/apg/DecryptActivity.java
View File

@ -20,6 +20,7 @@ import org.spongycastle.jce.provider.BouncyCastleProvider;
import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPException;
import org.spongycastle.openpgp.PGPPublicKeyRing; import org.spongycastle.openpgp.PGPPublicKeyRing;
import org.thialfihar.android.apg.provider.DataProvider; import org.thialfihar.android.apg.provider.DataProvider;
import org.thialfihar.android.apg.utils.Compatibility;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
@ -29,7 +30,6 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Message; import android.os.Message;
import android.text.ClipboardManager;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -275,13 +275,16 @@ public class DecryptActivity extends BaseActivity {
mReturnResult = true; mReturnResult = true;
} }
if (mSource.getCurrentView().getId() == R.id.sourceMessage && if (mSource.getCurrentView().getId() == R.id.sourceMessage
mMessage.getText().length() == 0) { && mMessage.getText().length() == 0) {
ClipboardManager clip = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
CharSequence clipboardText = Compatibility.getClipboardText(this);
String data = ""; String data = "";
Matcher matcher = Apg.PGP_MESSAGE.matcher(clip.getText()); if (clipboardText != null) {
Matcher matcher = Apg.PGP_MESSAGE.matcher(clipboardText);
if (!matcher.matches()) { if (!matcher.matches()) {
matcher = Apg.PGP_SIGNED_MESSAGE.matcher(clip.getText()); matcher = Apg.PGP_SIGNED_MESSAGE.matcher(clipboardText);
} }
if (matcher.matches()) { if (matcher.matches()) {
data = matcher.group(1); data = matcher.group(1);
@ -289,6 +292,7 @@ public class DecryptActivity extends BaseActivity {
Toast.makeText(this, R.string.usingClipboardContent, Toast.LENGTH_SHORT).show(); Toast.makeText(this, R.string.usingClipboardContent, Toast.LENGTH_SHORT).show();
} }
} }
}
mSignatureLayout.setVisibility(View.GONE); mSignatureLayout.setVisibility(View.GONE);
mSignatureLayout.setOnClickListener(new OnClickListener() { mSignatureLayout.setOnClickListener(new OnClickListener() {
@ -334,8 +338,8 @@ public class DecryptActivity extends BaseActivity {
updateSource(); updateSource();
if (mSource.getCurrentView().getId() == R.id.sourceMessage && if (mSource.getCurrentView().getId() == R.id.sourceMessage
(mMessage.getText().length() > 0 || mData != null || mContentUri != null)) { && (mMessage.getText().length() > 0 || mData != null || mContentUri != null)) {
mDecryptButton.performClick(); mDecryptButton.performClick();
} }
} }
@ -411,8 +415,9 @@ public class DecryptActivity extends BaseActivity {
if (mInputFilename.startsWith("file")) { if (mInputFilename.startsWith("file")) {
File file = new File(mInputFilename); File file = new File(mInputFilename);
if (!file.exists() || !file.isFile()) { if (!file.exists() || !file.isFile()) {
Toast.makeText(this, getString(R.string.errorMessage, Toast.makeText(
getString(R.string.error_fileNotFound)), this,
getString(R.string.errorMessage, getString(R.string.error_fileNotFound)),
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
return; return;
} }
@ -450,8 +455,8 @@ public class DecryptActivity extends BaseActivity {
mAssumeSymmetricEncryption = true; mAssumeSymmetricEncryption = true;
} }
if (getSecretKeyId() == Id.key.symmetric || if (getSecretKeyId() == Id.key.symmetric
Apg.getCachedPassPhrase(getSecretKeyId()) == null) { || Apg.getCachedPassPhrase(getSecretKeyId()) == null) {
showDialog(Id.dialog.pass_phrase); showDialog(Id.dialog.pass_phrase);
} else { } else {
if (mDecryptTarget == Id.target.file) { if (mDecryptTarget == Id.target.file) {
@ -468,8 +473,8 @@ public class DecryptActivity extends BaseActivity {
error = "" + e; error = "" + e;
} }
if (error != null) { if (error != null) {
Toast.makeText(this, getString(R.string.errorMessage, error), Toast.makeText(this, getString(R.string.errorMessage, error), Toast.LENGTH_SHORT)
Toast.LENGTH_SHORT).show(); .show();
} }
} }
@ -522,22 +527,22 @@ public class DecryptActivity extends BaseActivity {
if (mSignedOnly) { if (mSignedOnly) {
data = Apg.verifyText(this, in, out, this); data = Apg.verifyText(this, in, out, this);
} else { } else {
data = Apg.decrypt(this, in, out, Apg.getCachedPassPhrase(getSecretKeyId()), data = Apg.decrypt(this, in, out, Apg.getCachedPassPhrase(getSecretKeyId()), this,
this, mAssumeSymmetricEncryption); mAssumeSymmetricEncryption);
} }
out.close(); out.close();
if (mDataDestination.getStreamFilename() != null) { if (mDataDestination.getStreamFilename() != null) {
data.putString(Apg.EXTRA_RESULT_URI, "content://" + DataProvider.AUTHORITY + data.putString(Apg.EXTRA_RESULT_URI, "content://" + DataProvider.AUTHORITY
"/data/" + mDataDestination.getStreamFilename()); + "/data/" + mDataDestination.getStreamFilename());
} else if (mDecryptTarget == Id.target.message) { } else if (mDecryptTarget == Id.target.message) {
if (mReturnBinary) { if (mReturnBinary) {
data.putByteArray(Apg.EXTRA_DECRYPTED_DATA, data.putByteArray(Apg.EXTRA_DECRYPTED_DATA,
((ByteArrayOutputStream) out).toByteArray()); ((ByteArrayOutputStream) out).toByteArray());
} else { } else {
data.putString(Apg.EXTRA_DECRYPTED_MESSAGE, data.putString(Apg.EXTRA_DECRYPTED_MESSAGE, new String(
new String(((ByteArrayOutputStream) out).toByteArray())); ((ByteArrayOutputStream) out).toByteArray()));
} }
} }
} catch (PGPException e) { } catch (PGPException e) {
@ -588,7 +593,8 @@ public class DecryptActivity extends BaseActivity {
String error = data.getString(Apg.EXTRA_ERROR); String error = data.getString(Apg.EXTRA_ERROR);
if (error != null) { if (error != null) {
Toast.makeText(this, getString(R.string.errorMessage, error), Toast.LENGTH_SHORT).show(); Toast.makeText(this, getString(R.string.errorMessage, error), Toast.LENGTH_SHORT)
.show();
return; return;
} }
@ -642,7 +648,8 @@ public class DecryptActivity extends BaseActivity {
mSignatureStatusImage.setImageResource(R.drawable.overlay_ok); mSignatureStatusImage.setImageResource(R.drawable.overlay_ok);
} else if (data.getBoolean(Apg.EXTRA_SIGNATURE_UNKNOWN)) { } else if (data.getBoolean(Apg.EXTRA_SIGNATURE_UNKNOWN)) {
mSignatureStatusImage.setImageResource(R.drawable.overlay_error); mSignatureStatusImage.setImageResource(R.drawable.overlay_error);
Toast.makeText(this, R.string.unknownSignatureKeyTouchToLookUp, Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.unknownSignatureKeyTouchToLookUp, Toast.LENGTH_LONG)
.show();
} else { } else {
mSignatureStatusImage.setImageResource(R.drawable.overlay_error); mSignatureStatusImage.setImageResource(R.drawable.overlay_error);
} }
@ -708,8 +715,7 @@ public class DecryptActivity extends BaseActivity {
switch (id) { switch (id) {
case Id.dialog.output_filename: { case Id.dialog.output_filename: {
return FileDialog.build(this, getString(R.string.title_decryptToFile), return FileDialog.build(this, getString(R.string.title_decryptToFile),
getString(R.string.specifyFileToDecryptTo), getString(R.string.specifyFileToDecryptTo), mOutputFilename,
mOutputFilename,
new FileDialog.OnClickListener() { new FileDialog.OnClickListener() {
public void onOkClick(String filename, boolean checked) { public void onOkClick(String filename, boolean checked) {
removeDialog(Id.dialog.output_filename); removeDialog(Id.dialog.output_filename);
@ -720,11 +726,8 @@ public class DecryptActivity extends BaseActivity {
public void onCancelClick() { public void onCancelClick() {
removeDialog(Id.dialog.output_filename); removeDialog(Id.dialog.output_filename);
} }
}, }, getString(R.string.filemanager_titleSave),
getString(R.string.filemanager_titleSave), getString(R.string.filemanager_btnSave), null, Id.request.output_filename);
getString(R.string.filemanager_btnSave),
null,
Id.request.output_filename);
} }
case Id.dialog.lookup_unknown_key: { case Id.dialog.lookup_unknown_key: {
@ -732,21 +735,19 @@ public class DecryptActivity extends BaseActivity {
alert.setIcon(android.R.drawable.ic_dialog_alert); alert.setIcon(android.R.drawable.ic_dialog_alert);
alert.setTitle(R.string.title_unknownSignatureKey); alert.setTitle(R.string.title_unknownSignatureKey);
alert.setMessage(getString(R.string.lookupUnknownKey, Apg.getSmallFingerPrint(mUnknownSignatureKeyId))); alert.setMessage(getString(R.string.lookupUnknownKey,
Apg.getSmallFingerPrint(mUnknownSignatureKeyId)));
alert.setPositiveButton(android.R.string.ok, alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
removeDialog(Id.dialog.lookup_unknown_key); removeDialog(Id.dialog.lookup_unknown_key);
Intent intent = new Intent(DecryptActivity.this, Intent intent = new Intent(DecryptActivity.this, KeyServerQueryActivity.class);
KeyServerQueryActivity.class);
intent.setAction(Apg.Intent.LOOK_UP_KEY_ID); intent.setAction(Apg.Intent.LOOK_UP_KEY_ID);
intent.putExtra(Apg.EXTRA_KEY_ID, mUnknownSignatureKeyId); intent.putExtra(Apg.EXTRA_KEY_ID, mUnknownSignatureKeyId);
startActivityForResult(intent, Id.request.look_up_key_id); startActivityForResult(intent, Id.request.look_up_key_id);
} }
}); });
alert.setNegativeButton(android.R.string.cancel, alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
removeDialog(Id.dialog.lookup_unknown_key); removeDialog(Id.dialog.lookup_unknown_key);
PausableThread thread = getRunningThread(); PausableThread thread = getRunningThread();

5
src/org/thialfihar/android/apg/EncryptActivity.java
View File

@ -23,6 +23,7 @@ import org.spongycastle.openpgp.PGPSecretKey;
import org.spongycastle.openpgp.PGPSecretKeyRing; import org.spongycastle.openpgp.PGPSecretKeyRing;
import org.thialfihar.android.apg.provider.DataProvider; import org.thialfihar.android.apg.provider.DataProvider;
import org.thialfihar.android.apg.utils.Choice; import org.thialfihar.android.apg.utils.Choice;
import org.thialfihar.android.apg.utils.Compatibility;
import android.app.Dialog; import android.app.Dialog;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
@ -30,7 +31,6 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Message; import android.os.Message;
import android.text.ClipboardManager;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
@ -881,8 +881,7 @@ public class EncryptActivity extends BaseActivity {
switch (mEncryptTarget) { switch (mEncryptTarget) {
case Id.target.clipboard: { case Id.target.clipboard: {
String message = data.getString(Apg.EXTRA_ENCRYPTED_MESSAGE); String message = data.getString(Apg.EXTRA_ENCRYPTED_MESSAGE);
ClipboardManager clip = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); Compatibility.copyToClipboard(this, message);
clip.setText(message);
Toast.makeText(this, R.string.encryptionToClipboardSuccessful, Toast.makeText(this, R.string.encryptionToClipboardSuccessful,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
break; break;

157
src/org/thialfihar/android/apg/KeyListActivity.java
View File

@ -23,9 +23,6 @@ import org.thialfihar.android.apg.provider.KeyRings;
import org.thialfihar.android.apg.provider.Keys; import org.thialfihar.android.apg.provider.Keys;
import org.thialfihar.android.apg.provider.UserIds; import org.thialfihar.android.apg.provider.UserIds;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.SearchManager; import android.app.SearchManager;
@ -201,20 +198,21 @@ public class KeyListActivity extends BaseActivity {
Object keyRing = Apg.getKeyRing(keyRingId); Object keyRing = Apg.getKeyRing(keyRingId);
if (keyRing != null) { if (keyRing != null) {
if (keyRing instanceof PGPPublicKeyRing) { if (keyRing instanceof PGPPublicKeyRing) {
userId = Apg.getMainUserIdSafe(this, Apg.getMasterKey((PGPPublicKeyRing) keyRing)); userId = Apg.getMainUserIdSafe(this,
Apg.getMasterKey((PGPPublicKeyRing) keyRing));
} else { } else {
userId = Apg.getMainUserIdSafe(this, Apg.getMasterKey((PGPSecretKeyRing) keyRing)); userId = Apg.getMainUserIdSafe(this,
Apg.getMasterKey((PGPSecretKeyRing) keyRing));
} }
} }
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.warning); builder.setTitle(R.string.warning);
builder.setMessage(getString(mKeyType == Id.type.public_key ? builder.setMessage(getString(
R.string.keyDeletionConfirmation : mKeyType == Id.type.public_key ? R.string.keyDeletionConfirmation
R.string.secretKeyDeletionConfirmation, userId)); : R.string.secretKeyDeletionConfirmation, userId));
builder.setIcon(android.R.drawable.ic_dialog_alert); builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setPositiveButton(R.string.btn_delete, builder.setPositiveButton(R.string.btn_delete, new DialogInterface.OnClickListener() {
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
deleteKey(keyRingId); deleteKey(keyRingId);
removeDialog(Id.dialog.delete_key); removeDialog(Id.dialog.delete_key);
@ -231,8 +229,7 @@ public class KeyListActivity extends BaseActivity {
case Id.dialog.import_keys: { case Id.dialog.import_keys: {
return FileDialog.build(this, getString(R.string.title_importKeys), return FileDialog.build(this, getString(R.string.title_importKeys),
getString(R.string.specifyFileToImportFrom), getString(R.string.specifyFileToImportFrom), mImportFilename,
mImportFilename,
new FileDialog.OnClickListener() { new FileDialog.OnClickListener() {
public void onOkClick(String filename, boolean checked) { public void onOkClick(String filename, boolean checked) {
removeDialog(Id.dialog.import_keys); removeDialog(Id.dialog.import_keys);
@ -244,11 +241,9 @@ public class KeyListActivity extends BaseActivity {
public void onCancelClick() { public void onCancelClick() {
removeDialog(Id.dialog.import_keys); removeDialog(Id.dialog.import_keys);
} }
}, }, getString(R.string.filemanager_titleOpen),
getString(R.string.filemanager_titleOpen),
getString(R.string.filemanager_btnOpen), getString(R.string.filemanager_btnOpen),
getString(R.string.label_deleteAfterImport), getString(R.string.label_deleteAfterImport), Id.request.filename);
Id.request.filename);
} }
case Id.dialog.export_key: { case Id.dialog.export_key: {
@ -257,17 +252,15 @@ public class KeyListActivity extends BaseActivity {
} }
case Id.dialog.export_keys: { case Id.dialog.export_keys: {
String title = (singleKeyExport ? String title = (singleKeyExport ? getString(R.string.title_exportKey)
getString(R.string.title_exportKey) : : getString(R.string.title_exportKeys));
getString(R.string.title_exportKeys));
final int thisDialogId = (singleKeyExport ? Id.dialog.export_key : Id.dialog.export_keys); final int thisDialogId = (singleKeyExport ? Id.dialog.export_key
: Id.dialog.export_keys);
return FileDialog.build(this, title, return FileDialog.build(this, title,
getString(mKeyType == Id.type.public_key ? getString(mKeyType == Id.type.public_key ? R.string.specifyFileToExportTo
R.string.specifyFileToExportTo : : R.string.specifyFileToExportSecretKeysTo), mExportFilename,
R.string.specifyFileToExportSecretKeysTo),
mExportFilename,
new FileDialog.OnClickListener() { new FileDialog.OnClickListener() {
public void onOkClick(String filename, boolean checked) { public void onOkClick(String filename, boolean checked) {
removeDialog(thisDialogId); removeDialog(thisDialogId);
@ -278,11 +271,8 @@ public class KeyListActivity extends BaseActivity {
public void onCancelClick() { public void onCancelClick() {
removeDialog(thisDialogId); removeDialog(thisDialogId);
} }
}, }, getString(R.string.filemanager_titleSave),
getString(R.string.filemanager_titleSave), getString(R.string.filemanager_btnSave), null, Id.request.filename);
getString(R.string.filemanager_btnSave),
null,
Id.request.filename);
} }
default: { default: {
@ -328,13 +318,14 @@ public class KeyListActivity extends BaseActivity {
} }
if (mTask == Id.task.import_keys) { if (mTask == Id.task.import_keys) {
data = Apg.importKeyRings(this, mKeyType, new InputData(importInputStream, size), this); data = Apg.importKeyRings(this, mKeyType, new InputData(importInputStream, size),
this);
} else { } else {
Vector<Integer> keyRingIds = new Vector<Integer>(); Vector<Integer> keyRingIds = new Vector<Integer>();
if (mSelectedItem == -1) { if (mSelectedItem == -1) {
keyRingIds = Apg.getKeyRingIds(mKeyType == Id.type.public_key ? keyRingIds = Apg
Id.database.type_public : .getKeyRingIds(mKeyType == Id.type.public_key ? Id.database.type_public
Id.database.type_secret); : Id.database.type_secret);
} else { } else {
int keyRingId = mListAdapter.getKeyRingId(mSelectedItem); int keyRingId = mListAdapter.getKeyRingId(mSelectedItem);
keyRingIds.add(keyRingId); keyRingIds.add(keyRingId);
@ -391,8 +382,7 @@ public class KeyListActivity extends BaseActivity {
String error = data.getString(Apg.EXTRA_ERROR); String error = data.getString(Apg.EXTRA_ERROR);
if (error != null) { if (error != null) {
Toast.makeText(KeyListActivity.this, Toast.makeText(KeyListActivity.this, getString(R.string.errorMessage, error),
getString(R.string.errorMessage, error),
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} else { } else {
int added = data.getInt("added"); int added = data.getInt("added");
@ -408,8 +398,7 @@ public class KeyListActivity extends BaseActivity {
} else { } else {
message = getString(R.string.noKeysAddedOrUpdated); message = getString(R.string.noKeysAddedOrUpdated);
} }
Toast.makeText(KeyListActivity.this, message, Toast.makeText(KeyListActivity.this, message, Toast.LENGTH_SHORT).show();
Toast.LENGTH_SHORT).show();
if (bad > 0) { if (bad > 0) {
AlertDialog.Builder alert = new AlertDialog.Builder(this); AlertDialog.Builder alert = new AlertDialog.Builder(this);
@ -440,8 +429,7 @@ public class KeyListActivity extends BaseActivity {
String error = data.getString(Apg.EXTRA_ERROR); String error = data.getString(Apg.EXTRA_ERROR);
if (error != null) { if (error != null) {
Toast.makeText(KeyListActivity.this, Toast.makeText(KeyListActivity.this, getString(R.string.errorMessage, error),
getString(R.string.errorMessage, error),
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} else { } else {
int exported = data.getInt("exported"); int exported = data.getInt("exported");
@ -450,11 +438,10 @@ public class KeyListActivity extends BaseActivity {
message = getString(R.string.keyExported); message = getString(R.string.keyExported);
} else if (exported > 0) { } else if (exported > 0) {
message = getString(R.string.keysExported, exported); message = getString(R.string.keysExported, exported);
} else{ } else {
message = getString(R.string.noKeysExported); message = getString(R.string.noKeysExported);
} }
Toast.makeText(KeyListActivity.this, message, Toast.makeText(KeyListActivity.this, message, Toast.LENGTH_SHORT).show();
Toast.LENGTH_SHORT).show();
} }
break; break;
} }
@ -516,22 +503,19 @@ public class KeyListActivity extends BaseActivity {
mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mDatabase = Apg.getDatabase().db(); mDatabase = Apg.getDatabase().db();
SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
qb.setTables(KeyRings.TABLE_NAME + " INNER JOIN " + Keys.TABLE_NAME + " ON " + qb.setTables(KeyRings.TABLE_NAME + " INNER JOIN " + Keys.TABLE_NAME + " ON " + "("
"(" + KeyRings.TABLE_NAME + "." + KeyRings._ID + " = " + + KeyRings.TABLE_NAME + "." + KeyRings._ID + " = " + Keys.TABLE_NAME + "."
Keys.TABLE_NAME + "." + Keys.KEY_RING_ID + " AND " + + Keys.KEY_RING_ID + " AND " + Keys.TABLE_NAME + "." + Keys.IS_MASTER_KEY
Keys.TABLE_NAME + "." + Keys.IS_MASTER_KEY + " = '1'" + + " = '1'" + ") " + " INNER JOIN " + UserIds.TABLE_NAME + " ON " + "("
") " + + Keys.TABLE_NAME + "." + Keys._ID + " = " + UserIds.TABLE_NAME + "."
" INNER JOIN " + UserIds.TABLE_NAME + " ON " + + UserIds.KEY_ID + " AND " + UserIds.TABLE_NAME + "." + UserIds.RANK
"(" + Keys.TABLE_NAME + "." + Keys._ID + " = " + + " = '0')");
UserIds.TABLE_NAME + "." + UserIds.KEY_ID + " AND " +
UserIds.TABLE_NAME + "." + UserIds.RANK + " = '0')");
if (searchString != null && searchString.trim().length() > 0) { if (searchString != null && searchString.trim().length() > 0) {
String[] chunks = searchString.trim().split(" +"); String[] chunks = searchString.trim().split(" +");
qb.appendWhere("EXISTS (SELECT tmp." + UserIds._ID + " FROM " + qb.appendWhere("EXISTS (SELECT tmp." + UserIds._ID + " FROM " + UserIds.TABLE_NAME
UserIds.TABLE_NAME + " AS tmp WHERE " + + " AS tmp WHERE " + "tmp." + UserIds.KEY_ID + " = " + Keys.TABLE_NAME
"tmp." + UserIds.KEY_ID + " = " + + "." + Keys._ID);
Keys.TABLE_NAME + "." + Keys._ID);
for (int i = 0; i < chunks.length; ++i) { for (int i = 0; i < chunks.length; ++i) {
qb.appendWhere(" AND tmp." + UserIds.USER_ID + " LIKE "); qb.appendWhere(" AND tmp." + UserIds.USER_ID + " LIKE ");
qb.appendWhereEscapeString("%" + chunks[i] + "%"); qb.appendWhereEscapeString("%" + chunks[i] + "%");
@ -539,32 +523,22 @@ public class KeyListActivity extends BaseActivity {
qb.appendWhere(")"); qb.appendWhere(")");
} }
mCursor = qb.query(mDatabase, mCursor = qb.query(mDatabase, new String[] { KeyRings.TABLE_NAME + "." + KeyRings._ID, // 0
new String[] {
KeyRings.TABLE_NAME + "." + KeyRings._ID, // 0
KeyRings.TABLE_NAME + "." + KeyRings.MASTER_KEY_ID, // 1 KeyRings.TABLE_NAME + "." + KeyRings.MASTER_KEY_ID, // 1
UserIds.TABLE_NAME + "." + UserIds.USER_ID, // 2 UserIds.TABLE_NAME + "." + UserIds.USER_ID, // 2
}, }, KeyRings.TABLE_NAME + "." + KeyRings.TYPE + " = ?", new String[] { ""
KeyRings.TABLE_NAME + "." + KeyRings.TYPE + " = ?", + (mKeyType == Id.type.public_key ? Id.database.type_public
new String[] { "" + (mKeyType == Id.type.public_key ? : Id.database.type_secret) }, null, null, UserIds.TABLE_NAME + "."
Id.database.type_public : Id.database.type_secret) }, + UserIds.USER_ID + " ASC");
null, null, UserIds.TABLE_NAME + "." + UserIds.USER_ID + " ASC");
// content provider way for reference, might have to go back to it sometime: // content provider way for reference, might have to go back to it sometime:
/*Uri contentUri = null; /*
if (mKeyType == Id.type.secret_key) { * Uri contentUri = null; if (mKeyType == Id.type.secret_key) { contentUri =
contentUri = Apg.CONTENT_URI_SECRET_KEY_RINGS; * Apg.CONTENT_URI_SECRET_KEY_RINGS; } else { contentUri =
} else { * Apg.CONTENT_URI_PUBLIC_KEY_RINGS; } mCursor = getContentResolver().query( contentUri,
contentUri = Apg.CONTENT_URI_PUBLIC_KEY_RINGS; * new String[] { DataProvider._ID, // 0 DataProvider.MASTER_KEY_ID, // 1
} * DataProvider.USER_ID, // 2 }, null, null, null);
mCursor = getContentResolver().query( */
contentUri,
new String[] {
DataProvider._ID, // 0
DataProvider.MASTER_KEY_ID, // 1
DataProvider.USER_ID, // 2
},
null, null, null);*/
startManagingCursor(mCursor); startManagingCursor(mCursor);
rebuild(false); rebuild(false);
@ -595,19 +569,15 @@ public class KeyListActivity extends BaseActivity {
mCursor.moveToPosition(groupPosition); mCursor.moveToPosition(groupPosition);
children = new Vector<KeyChild>(); children = new Vector<KeyChild>();
Cursor c = mDatabase.query(Keys.TABLE_NAME, Cursor c = mDatabase.query(Keys.TABLE_NAME, new String[] { Keys._ID, // 0
new String[] {
Keys._ID, // 0
Keys.KEY_ID, // 1 Keys.KEY_ID, // 1
Keys.IS_MASTER_KEY, // 2 Keys.IS_MASTER_KEY, // 2
Keys.ALGORITHM, // 3 Keys.ALGORITHM, // 3
Keys.KEY_SIZE, // 4 Keys.KEY_SIZE, // 4
Keys.CAN_SIGN, // 5 Keys.CAN_SIGN, // 5
Keys.CAN_ENCRYPT, // 6 Keys.CAN_ENCRYPT, // 6
}, }, Keys.KEY_RING_ID + " = ?", new String[] { mCursor.getString(0) }, null, null,
Keys.KEY_RING_ID + " = ?", Keys.RANK + " ASC");
new String[] { mCursor.getString(0) },
null, null, Keys.RANK + " ASC");
int masterKeyId = -1; int masterKeyId = -1;
long fingerPrintId = -1; long fingerPrintId = -1;
@ -624,13 +594,9 @@ public class KeyListActivity extends BaseActivity {
if (masterKeyId != -1) { if (masterKeyId != -1) {
children.insertElementAt(new KeyChild(Apg.getFingerPrint(fingerPrintId), true), 0); children.insertElementAt(new KeyChild(Apg.getFingerPrint(fingerPrintId), true), 0);
c = mDatabase.query(UserIds.TABLE_NAME, c = mDatabase.query(UserIds.TABLE_NAME, new String[] { UserIds.USER_ID, // 0
new String[] { }, UserIds.KEY_ID + " = ? AND " + UserIds.RANK + " > 0", new String[] { ""
UserIds.USER_ID, // 0 + masterKeyId }, null, null, UserIds.RANK + " ASC");
},
UserIds.KEY_ID + " = ? AND " + UserIds.RANK + " > 0",
new String[] { "" + masterKeyId },
null, null, UserIds.RANK + " ASC");
for (int i = 0; i < c.getCount(); ++i) { for (int i = 0; i < c.getCount(); ++i) {
c.moveToPosition(i); c.moveToPosition(i);
@ -713,9 +679,8 @@ public class KeyListActivity extends BaseActivity {
return view; return view;
} }
public View getChildView(int groupPosition, int childPosition, public View getChildView(int groupPosition, int childPosition, boolean isLastChild,
boolean isLastChild, View convertView, View convertView, ViewGroup parent) {
ViewGroup parent) {
mCursor.moveToPosition(groupPosition); mCursor.moveToPosition(groupPosition);
Vector<KeyChild> children = getChildrenOfGroup(groupPosition); Vector<KeyChild> children = getChildrenOfGroup(groupPosition);
@ -759,8 +724,8 @@ public class KeyListActivity extends BaseActivity {
case KeyChild.FINGER_PRINT: { case KeyChild.FINGER_PRINT: {
view = mInflater.inflate(R.layout.key_list_child_item_user_id, null); view = mInflater.inflate(R.layout.key_list_child_item_user_id, null);
TextView userId = (TextView) view.findViewById(R.id.userId); TextView userId = (TextView) view.findViewById(R.id.userId);
userId.setText(getString(R.string.fingerprint) + ":\n" + userId.setText(getString(R.string.fingerprint) + ":\n"
child.fingerPrint.replace(" ", "\n")); + child.fingerPrint.replace(" ", "\n"));
break; break;
} }
} }

34
src/org/thialfihar/android/apg/PublicKeyListActivity.java
View File

@ -18,9 +18,6 @@ package org.thialfihar.android.apg;
import org.spongycastle.openpgp.PGPPublicKeyRing; import org.spongycastle.openpgp.PGPPublicKeyRing;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.ContextMenu; import android.view.ContextMenu;
@ -41,26 +38,25 @@ public class PublicKeyListActivity extends KeyListActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
menu.add(0, Id.menu.option.import_keys, 0, R.string.menu_importKeys) menu.add(0, Id.menu.option.import_keys, 0, R.string.menu_importKeys).setIcon(
.setIcon(android.R.drawable.ic_menu_add); android.R.drawable.ic_menu_add);
menu.add(0, Id.menu.option.export_keys, 1, R.string.menu_exportKeys) menu.add(0, Id.menu.option.export_keys, 1, R.string.menu_exportKeys).setIcon(
.setIcon(android.R.drawable.ic_menu_save); android.R.drawable.ic_menu_save);
menu.add(1, Id.menu.option.search, 2, R.string.menu_search) menu.add(1, Id.menu.option.search, 2, R.string.menu_search).setIcon(
.setIcon(android.R.drawable.ic_menu_search); android.R.drawable.ic_menu_search);
menu.add(1, Id.menu.option.preferences, 3, R.string.menu_preferences) menu.add(1, Id.menu.option.preferences, 3, R.string.menu_preferences).setIcon(
.setIcon(android.R.drawable.ic_menu_preferences); android.R.drawable.ic_menu_preferences);
menu.add(1, Id.menu.option.about, 4, R.string.menu_about) menu.add(1, Id.menu.option.about, 4, R.string.menu_about).setIcon(
.setIcon(android.R.drawable.ic_menu_info_details); android.R.drawable.ic_menu_info_details);
menu.add(1, Id.menu.option.scanQRCode, 5, R.string.menu_scanQRCode) menu.add(1, Id.menu.option.scanQRCode, 5, R.string.menu_scanQRCode).setIcon(
.setIcon(android.R.drawable.ic_menu_add); android.R.drawable.ic_menu_add);
return true; return true;
} }
@Override @Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
super.onCreateContextMenu(menu, v, menuInfo); super.onCreateContextMenu(menu, v, menuInfo);
ExpandableListView.ExpandableListContextMenuInfo info = ExpandableListView.ExpandableListContextMenuInfo info = (ExpandableListView.ExpandableListContextMenuInfo) menuInfo;
(ExpandableListView.ExpandableListContextMenuInfo) menuInfo;
int type = ExpandableListView.getPackedPositionType(info.packedPosition); int type = ExpandableListView.getPackedPositionType(info.packedPosition);
if (type == ExpandableListView.PACKED_POSITION_TYPE_GROUP) { if (type == ExpandableListView.PACKED_POSITION_TYPE_GROUP) {
@ -165,8 +161,8 @@ public class PublicKeyListActivity extends KeyListActivity {
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) { switch (requestCode) {
case Id.request.look_up_key_id: { case Id.request.look_up_key_id: {
if (resultCode == RESULT_CANCELED || data == null || if (resultCode == RESULT_CANCELED || data == null
data.getStringExtra(Apg.EXTRA_TEXT) == null) { || data.getStringExtra(Apg.EXTRA_TEXT) == null) {
return; return;
} }

79
src/org/thialfihar/android/apg/utils/Compatibility.java Normal file
View File

@ -0,0 +1,79 @@
package org.thialfihar.android.apg.utils;
import java.lang.reflect.Method;
import android.content.Context;
import android.util.Log;
public class Compatibility {
private static final String clipboardLabel = "APG";
/**
* Wrapper around ClipboardManager based on Android version using Reflection API, from
* http://www.projectsexception.com/blog/?p=87
*
* @param context
* @param text
*/
public static void copyToClipboard(Context context, String text) {
Object clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE);
try {
if ("android.text.ClipboardManager".equals(clipboard.getClass().getName())) {
Method method = clipboard.getClass().getMethod("setText", CharSequence.class);
method.invoke(clipboard, text);
} else if ("android.content.ClipboardManager".equals(clipboard.getClass().getName())) {
Class<?> clazz = Class.forName("android.content.ClipData");
Method method = clazz.getMethod("newPlainText", CharSequence.class,
CharSequence.class);
Object clip = method.invoke(null, clipboardLabel, text);
method = clipboard.getClass().getMethod("setPrimaryClip", clazz);
method.invoke(clipboard, clip);
}
} catch (Exception e) {
Log.e("ProjectsException", "There was and error copying the text to the clipboard: "
+ e.getMessage());
}
}
/**
* Wrapper around ClipboardManager based on Android version using Reflection API
*
* @param context
* @param text
*/
public static CharSequence getClipboardText(Context context) {
Object clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE);
try {
if ("android.text.ClipboardManager".equals(clipboard.getClass().getName())) {
// CharSequence text = clipboard.getText();
Method method = clipboard.getClass().getMethod("getText");
Object text = method.invoke(clipboard);
return (CharSequence) text;
} else if ("android.content.ClipboardManager".equals(clipboard.getClass().getName())) {
// ClipData clipData = clipboard.getPrimaryClip();
Method methodGetPrimaryClip = clipboard.getClass().getMethod("getPrimaryClip");
Object clipData = methodGetPrimaryClip.invoke(clipboard);
// ClipData.Item clipDataItem = clipData.getItemAt(0);
Method methodGetItemAt = clipData.getClass().getMethod("getItemAt", Integer.TYPE);
Object clipDataItem = methodGetItemAt.invoke(clipData, 0);
// CharSequence text = clipDataItem.coerceToText(context);
Method methodGetString = clipDataItem.getClass().getMethod("coerceToText",
Context.class);
Object text = methodGetString.invoke(clipDataItem, context);
return (CharSequence) text;
} else {
return null;
}
} catch (Exception e) {
Log.e("ProjectsException", "There was and error getting the text from the clipboard: "
+ e.getMessage());
return null;
}
}
}