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

fixes, cleanup

Browse Source
This commit is contained in:
Dominik 2012-09-10 23:34:14 +02:00
parent 72fb3ef3cc
commit 534cbec7c5
9 changed files with 467 additions and 496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org_apg/src/org/thialfihar/android/apg/ApgApplication.java
View File

@ -16,6 +16,7 @@
package org.thialfihar.android.apg; package org.thialfihar.android.apg;
import java.io.File;
import java.security.Security; import java.security.Security;
import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.jce.provider.BouncyCastleProvider;
@ -23,6 +24,7 @@ import org.thialfihar.android.apg.helper.PGPMain;
import org.thialfihar.android.apg.service.PassphraseCacheService; import org.thialfihar.android.apg.service.PassphraseCacheService;
import android.app.Application; import android.app.Application;
import android.os.Environment;
public class ApgApplication extends Application { public class ApgApplication extends Application {
@ -40,6 +42,15 @@ public class ApgApplication extends Application {
// TODO: Do it better than this! // TODO: Do it better than this!
// this initializes the database to be used in PGPMain // this initializes the database to be used in PGPMain
PGPMain.initialize(this); PGPMain.initialize(this);
// Create APG directory on sdcard if not existing
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
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
}
}
} }
} }

422
org_apg/src/org/thialfihar/android/apg/deprecated/BaseActivity.java Normal file
View File

@ -0,0 +1,422 @@
/*
* Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thialfihar.android.apg.deprecated;
import java.io.File;
import org.thialfihar.android.apg.R;
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.ui.MainActivity;
import org.thialfihar.android.apg.ui.SelectSecretKeyListActivity;
import org.thialfihar.android.apg.util.ProgressDialogUpdater;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.MenuItem;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
public class BaseActivity extends SherlockFragmentActivity implements Runnable,
ProgressDialogUpdater, AskForPassphrase.PassPhraseCallbackInterface {
private ProgressDialog mProgressDialog = null;
private PausableThread mRunningThread = null;
private Thread mDeletingThread = null;
private long mSecretKeyId = 0;
private String mDeleteFile = null;
protected Preferences mPreferences;
// private Handler mHandler = new Handler() {
// @Override
// public void handleMessage(Message msg) {
// handlerCallback(msg);
// }
// };
//
// @Override
// protected void onCreate(Bundle savedInstanceState) {
// super.onCreate(savedInstanceState);
//
// // not needed later:
// // mPreferences = Preferences.getPreferences(this);
//
// // PGPMain.initialize(this);
//
// // if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
// // 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
// // }
// // }
//
// // 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);
// // }
//
// @Override
// public boolean onOptionsItemSelected(MenuItem item) {
// switch (item.getItemId()) {
//
// case android.R.id.home:
// // app icon in Action Bar clicked; go home
// Intent intent = new Intent(this, MainActivity.class);
// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
// startActivity(intent);
// return true;
//
// // TODO: needed?:
// // case Id.menu.option.search:
// // startSearch("", false, null, false);
// // return true;
//
// default:
// break;
//
// }
// return false;
// }
//
// @Override
// protected Dialog onCreateDialog(int id) {
// // in case it is a progress dialog
// mProgressDialog = new ProgressDialog(this);
// mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
// mProgressDialog.setCancelable(false);
// switch (id) {
// case Id.dialog.encrypting: {
// mProgressDialog.setMessage(this.getString(R.string.progress_initializing));
// return mProgressDialog;
// }
//
// case Id.dialog.decrypting: {
// mProgressDialog.setMessage(this.getString(R.string.progress_initializing));
// return mProgressDialog;
// }
//
// case Id.dialog.saving: {
// mProgressDialog.setMessage(this.getString(R.string.progress_saving));
// return mProgressDialog;
// }
//
// case Id.dialog.importing: {
// mProgressDialog.setMessage(this.getString(R.string.progress_importing));
// return mProgressDialog;
// }
//
// case Id.dialog.exporting: {
// mProgressDialog.setMessage(this.getString(R.string.progress_exporting));
// return mProgressDialog;
// }
//
// case Id.dialog.deleting: {
// mProgressDialog.setMessage(this.getString(R.string.progress_initializing));
// return mProgressDialog;
// }
//
// case Id.dialog.querying: {
// mProgressDialog.setMessage(this.getString(R.string.progress_querying));
// mProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
// mProgressDialog.setCancelable(false);
// return mProgressDialog;
// }
//
// case Id.dialog.signing: {
// mProgressDialog.setMessage(this.getString(R.string.progress_signing));
// mProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
// mProgressDialog.setCancelable(false);
// return mProgressDialog;
// }
//
// default: {
// break;
// }
// }
// mProgressDialog = null;
//
// switch (id) {
//
// case Id.dialog.pass_phrase: {
// return AskForPassphrase.createDialog(this, getSecretKeyId(), this);
// }
//
// case Id.dialog.pass_phrases_do_not_match: {
// AlertDialog.Builder alert = new AlertDialog.Builder(this);
//
// alert.setIcon(android.R.drawable.ic_dialog_alert);
// alert.setTitle(R.string.error);
// alert.setMessage(R.string.passPhrasesDoNotMatch);
//
// alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
// public void onClick(DialogInterface dialog, int id) {
// removeDialog(Id.dialog.pass_phrases_do_not_match);
// }
// });
// alert.setCancelable(false);
//
// return alert.create();
// }
//
// case Id.dialog.no_pass_phrase: {
// AlertDialog.Builder alert = new AlertDialog.Builder(this);
//
// alert.setIcon(android.R.drawable.ic_dialog_alert);
// alert.setTitle(R.string.error);
// alert.setMessage(R.string.passPhraseMustNotBeEmpty);
//
// alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
// public void onClick(DialogInterface dialog, int id) {
// removeDialog(Id.dialog.no_pass_phrase);
// }
// });
// alert.setCancelable(false);
//
// 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;
// }
// }
//
// return super.onCreateDialog(id);
// }
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
case Id.request.secret_keys: {
if (resultCode == RESULT_OK) {
Bundle bundle = data.getExtras();
setSecretKeyId(bundle.getLong(SelectSecretKeyListActivity.EXTRA_KEY_ID));
} else {
setSecretKeyId(Id.key.none);
}
break;
}
default: {
break;
}
}
super.onActivityResult(requestCode, resultCode, data);
}
// public void setProgress(int resourceId, int progress, int max) {
// setProgress(getString(resourceId), progress, max);
// }
//
// 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);
// msg.setData(data);
// mHandler.sendMessage(msg);
// }
//
// 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);
// msg.setData(data);
// mHandler.sendMessage(msg);
// }
//
// public void handlerCallback(Message msg) {
// Bundle data = msg.getData();
// if (data == null) {
// return;
// }
//
// int type = data.getInt(Constants.extras.STATUS);
// switch (type) {
// case Id.message.progress_update: {
// 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));
// }
// 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
// case Id.message.query_done: // intentionally no break
// case Id.message.done: {
// mProgressDialog = null;
// doneCallback(msg);
// break;
// }
//
// default: {
// break;
// }
// }
// }
//
// public void doneCallback(Message msg) {
//
// }
// 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
PGPMain.setCachedPassPhrase(keyId, passPhrase);
}
// public void sendMessage(Message msg) {
// mHandler.sendMessage(msg);
// }
public PausableThread getRunningThread() {
return mRunningThread;
}
public void startThread() {
mRunningThread = new PausableThread(this);
mRunningThread.start();
}
public void run() {
}
public void setSecretKeyId(long id) {
mSecretKeyId = id;
}
public long getSecretKeyId() {
return mSecretKeyId;
}
protected void setDeleteFile(String deleteFile) {
mDeleteFile = deleteFile;
}
protected String getDeleteFile() {
return mDeleteFile;
}
@Override
public void setProgress(String message, int current, int total) {
// TODO Auto-generated method stub
}
@Override
public void setProgress(int resourceId, int current, int total) {
// TODO Auto-generated method stub
}
@Override
public void setProgress(int current, int total) {
// TODO Auto-generated method stub
}
}

23
org_apg/src/org/thialfihar/android/apg/service/ApgService.java
View File

@ -63,8 +63,6 @@ import android.os.Bundle;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
import android.os.RemoteException; import android.os.RemoteException;
import android.widget.CheckBox;
import android.widget.Spinner;
import org.thialfihar.android.apg.util.Log; import org.thialfihar.android.apg.util.Log;
@ -777,7 +775,7 @@ public class ApgService extends IntentService implements ProgressDialogUpdater {
String keyServer = data.getString(QUERY_KEY_SERVER); String keyServer = data.getString(QUERY_KEY_SERVER);
String queryString = data.getString(QUERY_KEY_STRING); String queryString = data.getString(QUERY_KEY_STRING);
long queryId = data.getLong(QUERY_KEY_ID); long keyId = data.getLong(QUERY_KEY_ID);
/* Operation */ /* Operation */
@ -789,7 +787,7 @@ public class ApgService extends IntentService implements ProgressDialogUpdater {
resultData.putParcelableArrayList(RESULT_QUERY_KEY_SEARCH_RESULT, searchResult); resultData.putParcelableArrayList(RESULT_QUERY_KEY_SEARCH_RESULT, searchResult);
} else if (queryType == Id.keyserver.get) { } else if (queryType == Id.keyserver.get) {
String keyData = server.get(queryId); String keyData = server.get(keyId);
resultData.putString(RESULT_QUERY_KEY_KEY_DATA, keyData); resultData.putString(RESULT_QUERY_KEY_KEY_DATA, keyData);
} }
@ -806,8 +804,8 @@ public class ApgService extends IntentService implements ProgressDialogUpdater {
/* Input */ /* Input */
long masterKeyId = data.getInt(SIGN_KEY_MASTER_KEY_ID); long masterKeyId = data.getLong(SIGN_KEY_MASTER_KEY_ID);
long pubKeyId = data.getInt(SIGN_KEY_PUB_KEY_ID); long pubKeyId = data.getLong(SIGN_KEY_PUB_KEY_ID);
/* Operation */ /* Operation */
@ -836,19 +834,6 @@ public class ApgService extends IntentService implements ProgressDialogUpdater {
pubring.getPublicKey(pubKeyId), sGen.generate()); pubring.getPublicKey(pubKeyId), sGen.generate());
pubring = PGPPublicKeyRing.insertPublicKey(pubring, signedKey); pubring = PGPPublicKeyRing.insertPublicKey(pubring, signedKey);
// check if we need to send the key to the server or not
// CheckBox sendKey = (CheckBox) findViewById(R.id.sendKey);
// if (sendKey.isChecked()) {
// Spinner keyServer = (Spinner) findViewById(R.id.keyServer);
// HkpKeyServer server = new HkpKeyServer((String) keyServer.getSelectedItem());
//
// /*
// * upload the newly signed key to the key server
// */
//
// PGPMain.uploadKeyRingToServer(server, pubring);
// }
// store the signed key in our local cache // store the signed key in our local cache
int retval = PGPMain.storeKeyRingInCache(pubring); int retval = PGPMain.storeKeyRingInCache(pubring);
if (retval != Id.return_value.ok && retval != Id.return_value.updated) { if (retval != Id.return_value.ok && retval != Id.return_value.updated) {

408
org_apg/src/org/thialfihar/android/apg/ui/BaseActivity.java
View File

@ -1,408 +0,0 @@
/*
* Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thialfihar.android.apg.ui;
import java.io.File;
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.deprecated.PausableThread;
import org.thialfihar.android.apg.helper.PGPMain;
import org.thialfihar.android.apg.helper.Preferences;
import org.thialfihar.android.apg.util.ProgressDialogUpdater;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.MenuItem;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
public class BaseActivity extends SherlockFragmentActivity implements Runnable,
ProgressDialogUpdater, AskForPassphrase.PassPhraseCallbackInterface {
private ProgressDialog mProgressDialog = null;
private PausableThread mRunningThread = null;
private Thread mDeletingThread = null;
private long mSecretKeyId = 0;
private String mDeleteFile = null;
protected Preferences mPreferences;
private Handler mHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
handlerCallback(msg);
}
};
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
final ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayShowTitleEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(true);
// not needed later:
mPreferences = Preferences.getPreferences(this);
// PGPMain.initialize(this);
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
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
}
}
// 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);
// }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
// app icon in Action Bar clicked; go home
Intent intent = new Intent(this, MainActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
return true;
// TODO: needed?:
case Id.menu.option.search:
startSearch("", false, null, false);
return true;
default:
break;
}
return false;
}
@Override
protected Dialog onCreateDialog(int id) {
// in case it is a progress dialog
mProgressDialog = new ProgressDialog(this);
mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
mProgressDialog.setCancelable(false);
switch (id) {
case Id.dialog.encrypting: {
mProgressDialog.setMessage(this.getString(R.string.progress_initializing));
return mProgressDialog;
}
case Id.dialog.decrypting: {
mProgressDialog.setMessage(this.getString(R.string.progress_initializing));
return mProgressDialog;
}
case Id.dialog.saving: {
mProgressDialog.setMessage(this.getString(R.string.progress_saving));
return mProgressDialog;
}
case Id.dialog.importing: {
mProgressDialog.setMessage(this.getString(R.string.progress_importing));
return mProgressDialog;
}
case Id.dialog.exporting: {
mProgressDialog.setMessage(this.getString(R.string.progress_exporting));
return mProgressDialog;
}
case Id.dialog.deleting: {
mProgressDialog.setMessage(this.getString(R.string.progress_initializing));
return mProgressDialog;
}
case Id.dialog.querying: {
mProgressDialog.setMessage(this.getString(R.string.progress_querying));
mProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
mProgressDialog.setCancelable(false);
return mProgressDialog;
}
case Id.dialog.signing: {
mProgressDialog.setMessage(this.getString(R.string.progress_signing));
mProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
mProgressDialog.setCancelable(false);
return mProgressDialog;
}
default: {
break;
}
}
mProgressDialog = null;
switch (id) {
case Id.dialog.pass_phrase: {
return AskForPassphrase.createDialog(this, getSecretKeyId(), this);
}
case Id.dialog.pass_phrases_do_not_match: {
AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setIcon(android.R.drawable.ic_dialog_alert);
alert.setTitle(R.string.error);
alert.setMessage(R.string.passPhrasesDoNotMatch);
alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
removeDialog(Id.dialog.pass_phrases_do_not_match);
}
});
alert.setCancelable(false);
return alert.create();
}
case Id.dialog.no_pass_phrase: {
AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setIcon(android.R.drawable.ic_dialog_alert);
alert.setTitle(R.string.error);
alert.setMessage(R.string.passPhraseMustNotBeEmpty);
alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
removeDialog(Id.dialog.no_pass_phrase);
}
});
alert.setCancelable(false);
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;
}
}
return super.onCreateDialog(id);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
case Id.request.secret_keys: {
if (resultCode == RESULT_OK) {
Bundle bundle = data.getExtras();
setSecretKeyId(bundle.getLong(SelectSecretKeyListActivity.EXTRA_KEY_ID));
} else {
setSecretKeyId(Id.key.none);
}
break;
}
default: {
break;
}
}
super.onActivityResult(requestCode, resultCode, data);
}
public void setProgress(int resourceId, int progress, int max) {
setProgress(getString(resourceId), progress, max);
}
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);
msg.setData(data);
mHandler.sendMessage(msg);
}
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);
msg.setData(data);
mHandler.sendMessage(msg);
}
public void handlerCallback(Message msg) {
Bundle data = msg.getData();
if (data == null) {
return;
}
int type = data.getInt(Constants.extras.STATUS);
switch (type) {
case Id.message.progress_update: {
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));
}
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
case Id.message.query_done: // intentionally no break
case Id.message.done: {
mProgressDialog = null;
doneCallback(msg);
break;
}
default: {
break;
}
}
}
public void doneCallback(Message msg) {
}
// 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
PGPMain.setCachedPassPhrase(keyId, passPhrase);
}
public void sendMessage(Message msg) {
mHandler.sendMessage(msg);
}
public PausableThread getRunningThread() {
return mRunningThread;
}
public void startThread() {
mRunningThread = new PausableThread(this);
mRunningThread.start();
}
public void run() {
}
public void setSecretKeyId(long id) {
mSecretKeyId = id;
}
public long getSecretKeyId() {
return mSecretKeyId;
}
protected void setDeleteFile(String deleteFile) {
mDeleteFile = deleteFile;
}
protected String getDeleteFile() {
return mDeleteFile;
}
}

2
org_apg/src/org/thialfihar/android/apg/ui/EncryptActivity.java
View File

@ -703,7 +703,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
// Create a new Messenger for the communication back // Create a new Messenger for the communication back
Messenger messenger = new Messenger(returnHandler); Messenger messenger = new Messenger(returnHandler);
try { try {
PassphraseDialogFragment passphraseDialog = PassphraseDialogFragment.newInstance( PassphraseDialogFragment passphraseDialog = PassphraseDialogFragment.newInstance(
messenger, mSecretKeyId); messenger, mSecretKeyId);

4
org_apg/src/org/thialfihar/android/apg/ui/KeyListActivity.java
View File

@ -163,6 +163,10 @@ public class KeyListActivity extends SherlockFragmentActivity {
showExportKeysDialog(false); showExportKeysDialog(false);
return true; return true;
} }
case Id.menu.option.search:
startSearch("", false, null, false);
return true;
default: { default: {
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);

3
org_apg/src/org/thialfihar/android/apg/ui/SelectPublicKeyListActivity.java
View File

@ -24,6 +24,7 @@ import org.thialfihar.android.apg.Id;
import org.thialfihar.android.apg.ui.widget.SelectPublicKeyListAdapter; import org.thialfihar.android.apg.ui.widget.SelectPublicKeyListAdapter;
import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
@ -36,7 +37,7 @@ import android.widget.Button;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
public class SelectPublicKeyListActivity extends BaseActivity { public class SelectPublicKeyListActivity extends SherlockFragmentActivity {
// Not used in sourcode, but listed in AndroidManifest! // Not used in sourcode, but listed in AndroidManifest!
public static final String ACTION_SELECT_PUBLIC_KEYS = Constants.INTENT_PREFIX public static final String ACTION_SELECT_PUBLIC_KEYS = Constants.INTENT_PREFIX

3
org_apg/src/org/thialfihar/android/apg/ui/SelectSecretKeyListActivity.java
View File

@ -22,6 +22,7 @@ import org.thialfihar.android.apg.Id;
import org.thialfihar.android.apg.ui.widget.SelectSecretKeyListAdapter; import org.thialfihar.android.apg.ui.widget.SelectSecretKeyListAdapter;
import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import android.app.SearchManager; import android.app.SearchManager;
@ -35,7 +36,7 @@ import android.widget.Button;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
public class SelectSecretKeyListActivity extends BaseActivity { public class SelectSecretKeyListActivity extends SherlockFragmentActivity {
// Not used in sourcode, but listed in AndroidManifest! // Not used in sourcode, but listed in AndroidManifest!
public static final String ACTION_SELECT_SECRET_KEY = Constants.INTENT_PREFIX public static final String ACTION_SELECT_SECRET_KEY = Constants.INTENT_PREFIX

87
org_apg/src/org/thialfihar/android/apg/ui/SignKeyActivity.java
View File

@ -16,22 +16,10 @@
package org.thialfihar.android.apg.ui; package org.thialfihar.android.apg.ui;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.SignatureException;
import java.util.Iterator; import java.util.Iterator;
import org.spongycastle.jce.provider.BouncyCastleProvider;
import org.spongycastle.openpgp.PGPException;
import org.spongycastle.openpgp.PGPPrivateKey;
import org.spongycastle.openpgp.PGPPublicKey;
import org.spongycastle.openpgp.PGPPublicKeyRing; import org.spongycastle.openpgp.PGPPublicKeyRing;
import org.spongycastle.openpgp.PGPSecretKey;
import org.spongycastle.openpgp.PGPSignature; import org.spongycastle.openpgp.PGPSignature;
import org.spongycastle.openpgp.PGPSignatureGenerator;
import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator;
import org.spongycastle.openpgp.PGPSignatureSubpacketVector;
import org.spongycastle.openpgp.PGPUtil;
import org.thialfihar.android.apg.Constants; import org.thialfihar.android.apg.Constants;
import org.thialfihar.android.apg.Id; import org.thialfihar.android.apg.Id;
import org.thialfihar.android.apg.R; import org.thialfihar.android.apg.R;
@ -40,10 +28,9 @@ import org.thialfihar.android.apg.helper.Preferences;
import org.thialfihar.android.apg.service.ApgService; import org.thialfihar.android.apg.service.ApgService;
import org.thialfihar.android.apg.service.ApgServiceHandler; import org.thialfihar.android.apg.service.ApgServiceHandler;
import org.thialfihar.android.apg.ui.dialog.PassphraseDialogFragment; import org.thialfihar.android.apg.ui.dialog.PassphraseDialogFragment;
import org.thialfihar.android.apg.util.HkpKeyServer;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.MenuItem;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Intent; import android.content.Intent;
@ -75,23 +62,8 @@ public class SignKeyActivity extends SherlockFragmentActivity {
// TODO: remove when using new intentservice: // TODO: remove when using new intentservice:
public static final String EXTRA_ERROR = "error"; public static final String EXTRA_ERROR = "error";
private long pubKeyId = 0; private long mPubKeyId = 0;
private long masterKeyId = 0; private long mMasterKeyId = 0;
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
startActivity(new Intent(this, PublicKeyListActivity.class));
return true;
default:
break;
}
return false;
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -100,6 +72,11 @@ public class SignKeyActivity extends SherlockFragmentActivity {
// check we havent already signed it // check we havent already signed it
setContentView(R.layout.sign_key_layout); setContentView(R.layout.sign_key_layout);
final ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayShowTitleEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(false);
actionBar.setHomeButtonEnabled(false);
final Spinner keyServer = (Spinner) findViewById(R.id.keyServer); final Spinner keyServer = (Spinner) findViewById(R.id.keyServer);
ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
android.R.layout.simple_spinner_item, Preferences.getPreferences(this) android.R.layout.simple_spinner_item, Preferences.getPreferences(this)
@ -132,14 +109,14 @@ public class SignKeyActivity extends SherlockFragmentActivity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (pubKeyId != 0) { if (mPubKeyId != 0) {
initiateSigning(); initiateSigning();
} }
} }
}); });
pubKeyId = getIntent().getLongExtra(EXTRA_KEY_ID, 0); mPubKeyId = getIntent().getLongExtra(EXTRA_KEY_ID, 0);
if (pubKeyId == 0) { if (mPubKeyId == 0) {
finish(); // nothing to do if we dont know what key to sign finish(); // nothing to do if we dont know what key to sign
} else { } else {
// kick off the SecretKey selection activity so the user chooses which key to sign with // kick off the SecretKey selection activity so the user chooses which key to sign with
@ -179,16 +156,16 @@ public class SignKeyActivity extends SherlockFragmentActivity {
* handles the UI bits of the signing process on the UI thread * handles the UI bits of the signing process on the UI thread
*/ */
private void initiateSigning() { private void initiateSigning() {
PGPPublicKeyRing pubring = PGPMain.getPublicKeyRing(pubKeyId); PGPPublicKeyRing pubring = PGPMain.getPublicKeyRing(mPubKeyId);
if (pubring != null) { if (pubring != null) {
// if we have already signed this key, dont bother doing it again // if we have already signed this key, dont bother doing it again
boolean alreadySigned = false; boolean alreadySigned = false;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Iterator<PGPSignature> itr = pubring.getPublicKey(pubKeyId).getSignatures(); Iterator<PGPSignature> itr = pubring.getPublicKey(mPubKeyId).getSignatures();
while (itr.hasNext()) { while (itr.hasNext()) {
PGPSignature sig = itr.next(); PGPSignature sig = itr.next();
if (sig.getKeyID() == masterKeyId) { if (sig.getKeyID() == mMasterKeyId) {
alreadySigned = true; alreadySigned = true;
break; break;
} }
@ -198,9 +175,9 @@ public class SignKeyActivity extends SherlockFragmentActivity {
/* /*
* get the user's passphrase for this key (if required) * get the user's passphrase for this key (if required)
*/ */
String passphrase = PGPMain.getCachedPassPhrase(masterKeyId); String passphrase = PGPMain.getCachedPassPhrase(mMasterKeyId);
if (passphrase == null) { if (passphrase == null) {
showPassphraseDialog(masterKeyId); showPassphraseDialog(mMasterKeyId);
return; // bail out; need to wait until the user has entered the passphrase return; // bail out; need to wait until the user has entered the passphrase
// before trying again // before trying again
} else { } else {
@ -246,18 +223,14 @@ public class SignKeyActivity extends SherlockFragmentActivity {
// fill values for this action // fill values for this action
Bundle data = new Bundle(); Bundle data = new Bundle();
int keyRingId = getIntent().getIntExtra(EXTRA_KEY_ID, -1); data.putLong(ApgService.SIGN_KEY_MASTER_KEY_ID, mMasterKeyId);
data.putInt(ApgService.UPLOAD_KEY_KEYRING_ID, keyRingId); data.putLong(ApgService.SIGN_KEY_PUB_KEY_ID, mPubKeyId);
Spinner keyServer = (Spinner) findViewById(R.id.keyServer);
String server = (String) keyServer.getSelectedItem();
data.putString(ApgService.UPLOAD_KEY_SERVER, server);
intent.putExtra(ApgService.EXTRA_DATA, data); intent.putExtra(ApgService.EXTRA_DATA, data);
// Message is received after signing is done in ApgService // Message is received after signing is done in ApgService
ApgServiceHandler saveHandler = new ApgServiceHandler(this, R.string.progress_signing, ApgServiceHandler saveHandler = new ApgServiceHandler(this, R.string.progress_signing,
ProgressDialog.STYLE_HORIZONTAL) { ProgressDialog.STYLE_SPINNER) {
public void handleMessage(Message message) { public void handleMessage(Message message) {
// handle messages by standard ApgHandler first // handle messages by standard ApgHandler first
super.handleMessage(message); super.handleMessage(message);
@ -301,7 +274,7 @@ public class SignKeyActivity extends SherlockFragmentActivity {
// fill values for this action // fill values for this action
Bundle data = new Bundle(); Bundle data = new Bundle();
data.putLong(ApgService.UPLOAD_KEY_KEYRING_ID, pubKeyId); data.putLong(ApgService.UPLOAD_KEY_KEYRING_ID, mPubKeyId);
Spinner keyServer = (Spinner) findViewById(R.id.keyServer); Spinner keyServer = (Spinner) findViewById(R.id.keyServer);
String server = (String) keyServer.getSelectedItem(); String server = (String) keyServer.getSelectedItem();
@ -433,7 +406,7 @@ public class SignKeyActivity extends SherlockFragmentActivity {
switch (requestCode) { switch (requestCode) {
case Id.request.secret_keys: { case Id.request.secret_keys: {
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
masterKeyId = data.getLongExtra(EXTRA_KEY_ID, 0); mMasterKeyId = data.getLongExtra(EXTRA_KEY_ID, 0);
// re-enable the sign button so the user can initiate the sign process // re-enable the sign button so the user can initiate the sign process
Button sign = (Button) findViewById(R.id.sign); Button sign = (Button) findViewById(R.id.sign);
@ -448,22 +421,4 @@ public class SignKeyActivity extends SherlockFragmentActivity {
} }
} }
} }
//
// @Override
// public void doneCallback(Message msg) {
// super.doneCallback(msg);
//
// removeDialog(Id.dialog.signing);
//
// Bundle data = msg.getData();
// String error = data.getString(EXTRA_ERROR);
// if (error != null) {
// Toast.makeText(this, getString(R.string.errorMessage, error), Toast.LENGTH_SHORT)
// .show();
// return;
// }
//
// Toast.makeText(this, R.string.keySignSuccess, Toast.LENGTH_SHORT).show();
// finish();
// }
} }