mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-11 11:35:07 -05:00
much work on EncryptActivity
This commit is contained in:
Dominik
parent
5a51f79126
commit
404ba01424
@ -1,5 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
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.
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.thialfihar.android.apg"
|
||||
android:installLocation="auto"
|
||||
@ -28,10 +42,11 @@
|
||||
android:protectionLevel="dangerous" />
|
||||
|
||||
<application
|
||||
android:name="ApgApplication"
|
||||
android:hardwareAccelerated="true"
|
||||
android:icon="@drawable/icon"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/Theme.Sherlock.Light.ForceOverflow" android:name="ApgApplication">
|
||||
android:theme="@style/Theme.Sherlock.Light.ForceOverflow" >
|
||||
<activity
|
||||
android:name=".ui.MainActivity"
|
||||
android:configChanges="keyboardHidden|orientation|keyboard"
|
||||
|
||||
@ -206,18 +206,19 @@
|
||||
android:text="@string/label_sign" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:orientation="vertical"
|
||||
android:paddingRight="5dip" >
|
||||
android:paddingLeft="16dp" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/mainUserId"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:text="Main User Id"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:text="Sign User Id"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
||||
|
||||
<TextView
|
||||
@ -225,7 +226,9 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:text="Main User Id Rest"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:text="Sign email"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
package org.thialfihar.android.apg.service;
|
||||
|
||||
import org.thialfihar.android.apg.R;
|
||||
import org.thialfihar.android.apg.ui.ProgressDialogFragment;
|
||||
import org.thialfihar.android.apg.ui.dialog.ProgressDialogFragment;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.os.Bundle;
|
||||
|
||||
@ -274,8 +274,6 @@ public class ApgService extends IntentService implements ProgressDialogUpdater {
|
||||
// Output
|
||||
Bundle resultData = new Bundle();
|
||||
|
||||
// if (encryptionTarget != Id.target.file) {
|
||||
// if (out instanceof ByteArrayOutputStream) {
|
||||
if (useAsciiArmour) {
|
||||
String output = new String(outStream.toByteArray());
|
||||
if (generateSignature) {
|
||||
@ -291,14 +289,6 @@ public class ApgService extends IntentService implements ProgressDialogUpdater {
|
||||
resultData.putByteArray(RESULT_ENCRYPTED_DATA, output);
|
||||
}
|
||||
}
|
||||
// } else if (out instanceof FileOutputStream) {
|
||||
// String fileName = dataDestination.getStreamFilename();
|
||||
// String uri = "content://" + DataProvider.AUTHORITY + "/data/" + fileName;
|
||||
// resultData.putString(RESULT_URI, uri);
|
||||
// } else {
|
||||
// sendErrorToHandler(new Apg.GeneralException("No output-data found."));
|
||||
// }
|
||||
// }
|
||||
|
||||
sendMessageToHandler(ApgHandler.MESSAGE_OKAY, resultData);
|
||||
} catch (Exception e) {
|
||||
@ -445,31 +435,8 @@ public class ApgService extends IntentService implements ProgressDialogUpdater {
|
||||
// Output
|
||||
Bundle resultData = new Bundle();
|
||||
|
||||
// if (encryptionTarget != Id.target.file) {
|
||||
// if (out instanceof ByteArrayOutputStream) {
|
||||
// if (useAsciiArmour) {
|
||||
// String output = new String(outStream.toByteArray());
|
||||
// if (generateSignature) {
|
||||
// resultData.putString(RESULT_SIGNATURE_TEXT, output);
|
||||
// } else {
|
||||
// resultData.putString(RESULT_ENCRYPTED_MESSAGE, output);
|
||||
// }
|
||||
// } else {
|
||||
// byte output[] = outStream.toByteArray();
|
||||
// if (generateSignature) {
|
||||
// resultData.putByteArray(RESULT_SIGNATURE_DATA, output);
|
||||
// } else {
|
||||
// resultData.putByteArray(RESULT_ENCRYPTED_DATA, output);
|
||||
// }
|
||||
// }
|
||||
// } else if (out instanceof FileOutputStream) {
|
||||
// String fileName = dataDestination.getStreamFilename();
|
||||
String uri = "content://" + DataProvider.AUTHORITY + "/data/" + streamFilename;
|
||||
resultData.putString(RESULT_URI, uri);
|
||||
// } else {
|
||||
// sendErrorToHandler(new Apg.GeneralException("No output-data found."));
|
||||
// }
|
||||
// }
|
||||
|
||||
sendMessageToHandler(ApgHandler.MESSAGE_OKAY, resultData);
|
||||
} catch (Exception e) {
|
||||
|
||||
@ -24,6 +24,7 @@ import org.thialfihar.android.apg.Constants;
|
||||
import org.thialfihar.android.apg.Id;
|
||||
import org.thialfihar.android.apg.service.ApgHandler;
|
||||
import org.thialfihar.android.apg.service.ApgService;
|
||||
import org.thialfihar.android.apg.ui.dialog.ProgressDialogFragment;
|
||||
import org.thialfihar.android.apg.ui.widget.KeyEditor;
|
||||
import org.thialfihar.android.apg.ui.widget.SectionView;
|
||||
import org.thialfihar.android.apg.ui.widget.UserIdEditor;
|
||||
|
||||
@ -22,14 +22,14 @@ import org.spongycastle.openpgp.PGPSecretKey;
|
||||
import org.spongycastle.openpgp.PGPSecretKeyRing;
|
||||
import org.thialfihar.android.apg.Apg;
|
||||
import org.thialfihar.android.apg.Constants;
|
||||
import org.thialfihar.android.apg.DataDestination;
|
||||
import org.thialfihar.android.apg.DataSource;
|
||||
import org.thialfihar.android.apg.FileDialog;
|
||||
import org.thialfihar.android.apg.Id;
|
||||
import org.thialfihar.android.apg.Preferences;
|
||||
import org.thialfihar.android.apg.passphrase.AskForPassphrase;
|
||||
import org.thialfihar.android.apg.service.ApgHandler;
|
||||
import org.thialfihar.android.apg.service.ApgService;
|
||||
import org.thialfihar.android.apg.ui.dialog.PassphraseDialogFragment;
|
||||
import org.thialfihar.android.apg.ui.dialog.ProgressDialogFragment;
|
||||
import org.thialfihar.android.apg.util.Choice;
|
||||
import org.thialfihar.android.apg.util.Compatibility;
|
||||
import org.thialfihar.android.apg.R;
|
||||
@ -45,6 +45,7 @@ import android.content.ActivityNotFoundException;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.os.Messenger;
|
||||
import android.util.Log;
|
||||
@ -65,8 +66,7 @@ import android.widget.ViewFlipper;
|
||||
import java.io.File;
|
||||
import java.util.Vector;
|
||||
|
||||
public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
AskForPassphrase.PassPhraseCallbackInterface {
|
||||
public class EncryptActivity extends SherlockFragmentActivity {
|
||||
private Intent mIntent = null;
|
||||
private String mSubject = null;
|
||||
private String mSendTo = null;
|
||||
@ -115,18 +115,22 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
private Uri mContentUri = null;
|
||||
private byte[] mData = null;
|
||||
|
||||
private DataSource mDataSource = null;
|
||||
private DataDestination mDataDestination = null;
|
||||
|
||||
private boolean mGenerateSignature = false;
|
||||
|
||||
private long mSecretKeyId = 0;
|
||||
|
||||
private ProgressDialogFragment mEncryptingDialog;
|
||||
|
||||
public void setSecretKeyId(long id) {
|
||||
mSecretKeyId = id;
|
||||
}
|
||||
|
||||
public long getSecretKeyId() {
|
||||
return mSecretKeyId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
|
||||
if (mEncryptToClipboardEnabled) {
|
||||
menu.add(1, Id.menu.option.encrypt_to_clipboard, 0, mEncryptToClipboardString)
|
||||
.setShowAsAction(
|
||||
@ -144,6 +148,7 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case Id.menu.option.encrypt_to_clipboard: {
|
||||
Log.d(Constants.TAG, "encrypt_to_clipboard option item clicked!");
|
||||
encryptToClipboardClicked();
|
||||
|
||||
return true;
|
||||
@ -580,6 +585,8 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
}
|
||||
|
||||
private void encryptClicked() {
|
||||
Log.d(Constants.TAG, "encryptClicked invoked!");
|
||||
|
||||
if (mSource.getCurrentView().getId() == R.id.sourceFile) {
|
||||
mEncryptTarget = Id.target.file;
|
||||
} else {
|
||||
@ -642,7 +649,9 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
}
|
||||
|
||||
if (getSecretKeyId() != 0 && Apg.getCachedPassPhrase(getSecretKeyId()) == null) {
|
||||
showDialog(Id.dialog.pass_phrase);
|
||||
// showDialog(Id.dialog.pass_phrase);
|
||||
showPassphraseDialog();
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -654,22 +663,53 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows passphrase dialog to cache a new passphrase the user enters for using it later for
|
||||
* encryption
|
||||
*/
|
||||
private void showPassphraseDialog() {
|
||||
// Message is received after passphrase is cached
|
||||
Handler returnHandler = new Handler() {
|
||||
@Override
|
||||
public void handleMessage(Message message) {
|
||||
if (message.arg1 == PassphraseDialogFragment.MESSAGE_OKAY) {
|
||||
if (mEncryptTarget == Id.target.file) {
|
||||
askForOutputFilename();
|
||||
} else {
|
||||
encryptStart();
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Create a new Messenger for the communication back
|
||||
Messenger messenger = new Messenger(returnHandler);
|
||||
|
||||
PassphraseDialogFragment passphraseDialog = PassphraseDialogFragment.newInstance(
|
||||
mSecretKeyId, messenger);
|
||||
|
||||
// no passphrase for this secret key -> passphraseDialog is null
|
||||
if (passphraseDialog != null) {
|
||||
passphraseDialog.show(getSupportFragmentManager(), "passphraseDialog");
|
||||
}
|
||||
}
|
||||
|
||||
private void askForOutputFilename() {
|
||||
showDialog(Id.dialog.output_filename);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void passPhraseCallback(long keyId, String passPhrase) {
|
||||
// super.passPhraseCallback(keyId, passPhrase);
|
||||
if (mEncryptTarget == Id.target.file) {
|
||||
askForOutputFilename();
|
||||
} else {
|
||||
encryptStart();
|
||||
}
|
||||
}
|
||||
// @Override
|
||||
// public void passPhraseCallback(long keyId, String passPhrase) {
|
||||
// // super.passPhraseCallback(keyId, passPhrase);
|
||||
// if (mEncryptTarget == Id.target.file) {
|
||||
// askForOutputFilename();
|
||||
// } else {
|
||||
// encryptStart();
|
||||
// }
|
||||
// }
|
||||
|
||||
private void encryptStart() {
|
||||
showDialog(Id.dialog.encrypting);
|
||||
// showDialog(Id.dialog.encrypting);
|
||||
// startThread();
|
||||
|
||||
boolean useAsciiArmour = true;
|
||||
@ -690,23 +730,65 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
signOnly = (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0);
|
||||
}
|
||||
|
||||
fillDataSource(signOnly && !mReturnResult);
|
||||
fillDataDestination();
|
||||
|
||||
// Send all information needed to service to edit key in other thread
|
||||
Intent intent = new Intent(this, ApgService.class);
|
||||
|
||||
// fill values for this action
|
||||
Bundle data = new Bundle();
|
||||
|
||||
// fillDataSource(signOnly && !mReturnResult);
|
||||
// fillDataDestination();
|
||||
|
||||
// if (mContentUri != null) {
|
||||
// mDataSource.setUri(mContentUri);
|
||||
// } else if (mEncryptTarget == Id.target.file) {
|
||||
// mDataSource.setUri(mInputFilename);
|
||||
// } else {
|
||||
// if (mData != null) {
|
||||
// mDataSource.setData(mData);
|
||||
// } else {
|
||||
// String message = mMessage.getText().toString();
|
||||
// if (fixContent) {
|
||||
// // fix the message a bit, trailing spaces and newlines break stuff,
|
||||
// // because GMail sends as HTML and such things fuck up the
|
||||
// // signature,
|
||||
// // TODO: things like "<" and ">" also fuck up the signature
|
||||
// message = message.replaceAll(" +\n", "\n");
|
||||
// message = message.replaceAll("\n\n+", "\n\n");
|
||||
// message = message.replaceFirst("^\n+", "");
|
||||
// // make sure there'll be exactly one newline at the end
|
||||
// message = message.replaceFirst("\n*$", "\n");
|
||||
// }
|
||||
// mDataSource.setText(message);
|
||||
// }
|
||||
// }
|
||||
|
||||
// mDataDestination = new DataDestination();
|
||||
// if (mContentUri != null) {
|
||||
// mDataDestination.setMode(Id.mode.stream);
|
||||
// } else if (mEncryptTarget == Id.target.file) {
|
||||
// mDataDestination.setFilename(mOutputFilename);
|
||||
// mDataDestination.setMode(Id.mode.file);
|
||||
// } else {
|
||||
// mDataDestination.setMode(Id.mode.byte_array);
|
||||
// }
|
||||
|
||||
// choose default settings, action and data bundle by target
|
||||
if (mEncryptTarget == Id.target.file) {
|
||||
if (mContentUri != null) {
|
||||
// mDataSource.setUri(mContentUri);
|
||||
|
||||
intent.putExtra(ApgService.EXTRA_ACTION, ApgService.ACTION_ENCRYPT_SIGN_STREAM);
|
||||
|
||||
data.putString(ApgService.PROVIDER_URI, mContentUri.toString());
|
||||
|
||||
} else if (mEncryptTarget == Id.target.file) {
|
||||
useAsciiArmour = mAsciiArmour.isChecked();
|
||||
compressionId = ((Choice) mFileCompression.getSelectedItem()).getId();
|
||||
|
||||
intent.putExtra(ApgService.EXTRA_ACTION, ApgService.ACTION_ENCRYPT_SIGN_FILE);
|
||||
|
||||
data.putString(ApgService.FILE_URI, mDataSource.getUri().toString());
|
||||
data.putString(ApgService.FILE_URI, mInputFilename);
|
||||
data.putString(ApgService.OUTPUT_FILENAME, mOutputFilename);
|
||||
|
||||
} else {
|
||||
useAsciiArmour = true;
|
||||
@ -714,7 +796,18 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
|
||||
intent.putExtra(ApgService.EXTRA_ACTION, ApgService.ACTION_ENCRYPT_SIGN_BYTES);
|
||||
|
||||
data.putByteArray(ApgService.BYTES, mDataSource.getBytes());
|
||||
if (mData != null) {
|
||||
// mDataSource.setData(mData);
|
||||
data.putByteArray(ApgService.BYTES, mData);
|
||||
} else {
|
||||
String message = mMessage.getText().toString();
|
||||
if (signOnly && !mReturnResult) {
|
||||
fixContent(message);
|
||||
}
|
||||
// mDataSource.setText(message);
|
||||
data.putByteArray(ApgService.BYTES, message.getBytes());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (mOverrideAsciiArmour) {
|
||||
@ -735,7 +828,7 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
mEncryptingDialog = ProgressDialogFragment.newInstance(R.string.progress_encrypting,
|
||||
ProgressDialog.STYLE_HORIZONTAL);
|
||||
|
||||
// Message is received after saving is done in ApgService
|
||||
// Message is received after encrypting is done in ApgService
|
||||
ApgHandler saveHandler = new ApgHandler(this, mEncryptingDialog) {
|
||||
public void handleMessage(Message message) {
|
||||
// handle messages by standard ApgHandler first
|
||||
@ -766,17 +859,18 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
}
|
||||
|
||||
output = data.getString(ApgService.RESULT_ENCRYPTED_MESSAGE);
|
||||
Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND);
|
||||
Log.d(Constants.TAG, "output: " + output);
|
||||
|
||||
Intent emailIntent = new Intent(Intent.ACTION_SEND);
|
||||
emailIntent.setType("text/plain; charset=utf-8");
|
||||
emailIntent.putExtra(android.content.Intent.EXTRA_TEXT, message);
|
||||
emailIntent.putExtra(Intent.EXTRA_TEXT, output);
|
||||
if (mSubject != null) {
|
||||
emailIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, mSubject);
|
||||
emailIntent.putExtra(Intent.EXTRA_SUBJECT, mSubject);
|
||||
}
|
||||
if (mSendTo != null) {
|
||||
emailIntent.putExtra(android.content.Intent.EXTRA_EMAIL,
|
||||
new String[] { mSendTo });
|
||||
emailIntent.putExtra(Intent.EXTRA_EMAIL, new String[] { mSendTo });
|
||||
}
|
||||
EncryptActivity.this.startActivity(Intent.createChooser(emailIntent,
|
||||
startActivity(Intent.createChooser(emailIntent,
|
||||
getString(R.string.title_sendEmail)));
|
||||
break;
|
||||
|
||||
@ -809,12 +903,18 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
startService(intent);
|
||||
}
|
||||
|
||||
public void setSecretKeyId(long id) {
|
||||
mSecretKeyId = id;
|
||||
}
|
||||
private String fixContent(String message) {
|
||||
// fix the message a bit, trailing spaces and newlines break stuff,
|
||||
// because GMail sends as HTML and such things fuck up the
|
||||
// signature,
|
||||
// TODO: things like "<" and ">" also fuck up the signature
|
||||
message = message.replaceAll(" +\n", "\n");
|
||||
message = message.replaceAll("\n\n+", "\n\n");
|
||||
message = message.replaceFirst("^\n+", "");
|
||||
// make sure there'll be exactly one newline at the end
|
||||
message = message.replaceFirst("\n*$", "\n");
|
||||
|
||||
public long getSecretKeyId() {
|
||||
return mSecretKeyId;
|
||||
return message;
|
||||
}
|
||||
|
||||
private void updateView() {
|
||||
@ -918,18 +1018,21 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
return;
|
||||
}
|
||||
|
||||
case Id.request.secret_keys: {
|
||||
case Id.request.public_keys: {
|
||||
if (resultCode == RESULT_OK) {
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
Bundle bundle = data.getExtras();
|
||||
mEncryptionKeyIds = bundle.getLongArray(Apg.EXTRA_SELECTION);
|
||||
}
|
||||
updateView();
|
||||
break;
|
||||
}
|
||||
|
||||
case Id.request.public_keys: {
|
||||
case Id.request.secret_keys: {
|
||||
if (resultCode == RESULT_OK) {
|
||||
Bundle bundle = data.getExtras();
|
||||
mEncryptionKeyIds = bundle.getLongArray(Apg.EXTRA_SELECTION);
|
||||
setSecretKeyId(bundle.getLong(Apg.EXTRA_KEY_ID));
|
||||
} else {
|
||||
setSecretKeyId(Id.key.none);
|
||||
}
|
||||
updateView();
|
||||
break;
|
||||
@ -971,42 +1074,4 @@ public class EncryptActivity extends SherlockFragmentActivity implements
|
||||
return super.onCreateDialog(id);
|
||||
}
|
||||
|
||||
protected void fillDataSource(boolean fixContent) {
|
||||
mDataSource = new DataSource();
|
||||
if (mContentUri != null) {
|
||||
mDataSource.setUri(mContentUri);
|
||||
} else if (mEncryptTarget == Id.target.file) {
|
||||
mDataSource.setUri(mInputFilename);
|
||||
} else {
|
||||
if (mData != null) {
|
||||
mDataSource.setData(mData);
|
||||
} else {
|
||||
String message = mMessage.getText().toString();
|
||||
if (fixContent) {
|
||||
// fix the message a bit, trailing spaces and newlines break stuff,
|
||||
// because GMail sends as HTML and such things fuck up the
|
||||
// signature,
|
||||
// TODO: things like "<" and ">" also fuck up the signature
|
||||
message = message.replaceAll(" +\n", "\n");
|
||||
message = message.replaceAll("\n\n+", "\n\n");
|
||||
message = message.replaceFirst("^\n+", "");
|
||||
// make sure there'll be exactly one newline at the end
|
||||
message = message.replaceFirst("\n*$", "\n");
|
||||
}
|
||||
mDataSource.setText(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void fillDataDestination() {
|
||||
mDataDestination = new DataDestination();
|
||||
if (mContentUri != null) {
|
||||
mDataDestination.setMode(Id.mode.stream);
|
||||
} else if (mEncryptTarget == Id.target.file) {
|
||||
mDataDestination.setFilename(mOutputFilename);
|
||||
mDataDestination.setMode(Id.mode.file);
|
||||
} else {
|
||||
mDataDestination.setMode(Id.mode.byte_array);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,205 @@
|
||||
/*
|
||||
* Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
|
||||
*
|
||||
* 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.dialog;
|
||||
|
||||
import org.spongycastle.jce.provider.BouncyCastleProvider;
|
||||
import org.spongycastle.openpgp.PGPException;
|
||||
import org.spongycastle.openpgp.PGPPrivateKey;
|
||||
import org.spongycastle.openpgp.PGPSecretKey;
|
||||
import org.thialfihar.android.apg.Apg;
|
||||
import org.thialfihar.android.apg.Constants;
|
||||
import org.thialfihar.android.apg.Id;
|
||||
import org.thialfihar.android.apg.R;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.DialogInterface.OnClickListener;
|
||||
import android.os.Bundle;
|
||||
import android.os.Message;
|
||||
import android.os.Messenger;
|
||||
import android.os.RemoteException;
|
||||
import android.support.v4.app.DialogFragment;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.EditText;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
public class PassphraseDialogFragment extends DialogFragment {
|
||||
|
||||
private Messenger mMessenger;
|
||||
|
||||
private static final String ARG_MESSENGER = "messenger";
|
||||
private static final String ARG_SECRET_KEY_ID = "secret_key_id";
|
||||
|
||||
public static final int MESSAGE_OKAY = 1;
|
||||
|
||||
/**
|
||||
* Instantiates new instance of this dialog fragment
|
||||
*
|
||||
* @param secretKeyId
|
||||
* secret key id you want to use
|
||||
* @param messenger
|
||||
* to communicate back after caching the passphrase
|
||||
* @return
|
||||
*/
|
||||
public static PassphraseDialogFragment newInstance(long secretKeyId, Messenger messenger) {
|
||||
PassphraseDialogFragment frag = new PassphraseDialogFragment();
|
||||
Bundle args = new Bundle();
|
||||
args.putLong(ARG_SECRET_KEY_ID, secretKeyId);
|
||||
args.putParcelable(ARG_MESSENGER, messenger);
|
||||
|
||||
frag.setArguments(args);
|
||||
return frag;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates dialog
|
||||
*/
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
final Activity activity = getActivity();
|
||||
|
||||
long secretKeyId = getArguments().getLong(ARG_SECRET_KEY_ID);
|
||||
mMessenger = getArguments().getParcelable(ARG_MESSENGER);
|
||||
|
||||
AlertDialog.Builder alert = new AlertDialog.Builder(activity);
|
||||
|
||||
alert.setTitle(R.string.title_authentication);
|
||||
|
||||
final PGPSecretKey secretKey;
|
||||
|
||||
if (secretKeyId == Id.key.symmetric || secretKeyId == Id.key.none) {
|
||||
secretKey = null;
|
||||
alert.setMessage(getString(R.string.passPhraseForSymmetricEncryption));
|
||||
} else {
|
||||
secretKey = Apg.getMasterKey(Apg.getSecretKeyRing(secretKeyId));
|
||||
if (secretKey == null) {
|
||||
alert.setTitle(R.string.title_keyNotFound);
|
||||
alert.setMessage(getString(R.string.keyNotFound, secretKeyId));
|
||||
alert.setPositiveButton(android.R.string.ok, new OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
dismiss();
|
||||
}
|
||||
});
|
||||
alert.setCancelable(false);
|
||||
return alert.create();
|
||||
}
|
||||
String userId = Apg.getMainUserIdSafe(activity, secretKey);
|
||||
alert.setMessage(getString(R.string.passPhraseFor, userId));
|
||||
}
|
||||
|
||||
LayoutInflater inflater = activity.getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.passphrase, null);
|
||||
final EditText input = (EditText) view.findViewById(R.id.passphrase_passphrase);
|
||||
|
||||
final TextView labelNotUsed = (TextView) view
|
||||
.findViewById(R.id.passphrase_label_passphrase_again);
|
||||
labelNotUsed.setVisibility(View.GONE);
|
||||
final EditText inputNotUsed = (EditText) view
|
||||
.findViewById(R.id.passphrase_passphrase_again);
|
||||
inputNotUsed.setVisibility(View.GONE);
|
||||
|
||||
alert.setView(view);
|
||||
|
||||
// final PassPhraseCallbackInterface cb = callback;
|
||||
alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int id) {
|
||||
// activity.removeDialog(Id.dialog.pass_phrase);
|
||||
dismiss();
|
||||
String passPhrase = input.getText().toString();
|
||||
long keyId;
|
||||
if (secretKey != null) {
|
||||
try {
|
||||
PGPPrivateKey testKey = secretKey.extractPrivateKey(
|
||||
passPhrase.toCharArray(), new BouncyCastleProvider());
|
||||
if (testKey == null) {
|
||||
Toast.makeText(activity, R.string.error_couldNotExtractPrivateKey,
|
||||
Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
} catch (PGPException e) {
|
||||
Toast.makeText(activity, R.string.wrongPassPhrase, Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
return;
|
||||
}
|
||||
keyId = secretKey.getKeyID();
|
||||
} else {
|
||||
keyId = Id.key.symmetric;
|
||||
}
|
||||
|
||||
// cache again
|
||||
Apg.setCachedPassPhrase(keyId, passPhrase);
|
||||
// return by callback
|
||||
// cb.passPhraseCallback(keyId, passPhrase);
|
||||
sendMessageToHandler(MESSAGE_OKAY);
|
||||
}
|
||||
});
|
||||
|
||||
alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int id) {
|
||||
// activity.removeDialog(Id.dialog.pass_phrase);
|
||||
dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
// check if the key has no passphrase
|
||||
if (secretKey != null) {
|
||||
try {
|
||||
Log.d(Constants.TAG, "Check if key has no passphrase...");
|
||||
PGPPrivateKey testKey = secretKey.extractPrivateKey("".toCharArray(),
|
||||
new BouncyCastleProvider());
|
||||
if (testKey != null) {
|
||||
Log.d(Constants.TAG, "Key has no passphrase!");
|
||||
|
||||
// cache null
|
||||
Apg.setCachedPassPhrase(secretKey.getKeyID(), null);
|
||||
// return by callback
|
||||
// cb.passPhraseCallback(secretKey.getKeyID(), null);
|
||||
sendMessageToHandler(MESSAGE_OKAY);
|
||||
|
||||
return null;
|
||||
}
|
||||
} catch (PGPException e) {
|
||||
|
||||
}
|
||||
}
|
||||
return alert.create();
|
||||
}
|
||||
|
||||
/**
|
||||
* Send message back to handler which is initialized in a activity
|
||||
*
|
||||
* @param arg1
|
||||
* Message you want to send
|
||||
*/
|
||||
private void sendMessageToHandler(Integer arg1) {
|
||||
Message msg = Message.obtain();
|
||||
msg.arg1 = arg1;
|
||||
|
||||
try {
|
||||
mMessenger.send(msg);
|
||||
} catch (RemoteException e) {
|
||||
Log.w(Constants.TAG, "Exception sending message, Is handler present?", e);
|
||||
} catch (NullPointerException e) {
|
||||
Log.w(Constants.TAG, "Messenger is null!", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.thialfihar.android.apg.ui;
|
||||
package org.thialfihar.android.apg.ui.dialog;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Dialog;
|
||||
@ -87,7 +87,7 @@ public class ProgressDialogFragment extends DialogFragment {
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates dialog based on arguments (messageId, style)
|
||||
* Creates dialog
|
||||
*/
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
@ -22,7 +22,7 @@ import org.thialfihar.android.apg.Apg;
|
||||
import org.thialfihar.android.apg.Id;
|
||||
import org.thialfihar.android.apg.service.ApgHandler;
|
||||
import org.thialfihar.android.apg.service.ApgService;
|
||||
import org.thialfihar.android.apg.ui.ProgressDialogFragment;
|
||||
import org.thialfihar.android.apg.ui.dialog.ProgressDialogFragment;
|
||||
import org.thialfihar.android.apg.ui.widget.Editor.EditorListener;
|
||||
import org.thialfihar.android.apg.util.Choice;
|
||||
import org.thialfihar.android.apg.util.Utils;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user