cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix decrypt by searching for secret key based on keyId not masterKeyId, new ApgService for RPC

Browse Source
This commit is contained in:
Dominik
2012-11-14 16:02:11 +01:00
parent 8aac7ea7be
commit d61e00ae6c
40 changed files with 2201 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org_apg_integration_demo/AndroidManifest.xml
View File

@@ -27,6 +27,10 @@
android:name=".IntentDemoActivity"
android:label="Intent Demo 1"
android:windowSoftInputMode="stateHidden" />
<activity
android:name=".AidlDemoActivity"
android:label="Aidl Demo"
android:windowSoftInputMode="stateHidden" />
</application>
</manifest>

72
org_apg_integration_demo/res/layout/aidl_demo.xml Normal file
View File

@@ -0,0 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<Button
android:id="@+id/aidl_demo_create_new_key"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="createNewKeyOnClick"
android:text="Create new key" />
<Button
android:id="@+id/aidl_demo_select_secret_key"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="selectSecretKeyOnClick"
android:text="Select secret key" />
<Button
android:id="@+id/aidl_demo_select_encryption_key"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="selectEncryptionKeysOnClick"
android:text="Select encryption key(s)" />
<EditText
android:id="@+id/aidl_demo_message"
android:layout_width="match_parent"
android:layout_height="150dip"
android:text="message"
android:textAppearance="@android:style/TextAppearance.Small" />
<EditText
android:id="@+id/aidl_demo_ciphertext"
android:layout_width="match_parent"
android:layout_height="150dip"
android:text="ciphertext"
android:textAppearance="@android:style/TextAppearance.Small" />
<Button
android:id="@+id/aidl_demo_encrypt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="encryptOnClick"
android:text="Encrypt" />
<Button
android:id="@+id/aidl_demo_decrypt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="decryptOnClick"
android:text="Decrypt" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="APG Data:" />
<TextView
android:id="@+id/aidl_demo_data"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minLines="10" />
</LinearLayout>
</ScrollView>

10
org_apg_integration_demo/res/layout/intent_demo.xml
View File

@@ -12,21 +12,21 @@
android:id="@+id/intent_demo_create_new_key"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="intentDemoCreateNewKeyOnClick"
android:onClick="createNewKeyOnClick"
android:text="Create new key" />
<Button
android:id="@+id/intent_demo_select_secret_key"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="intentDemoSelectSecretKeyOnClick"
android:onClick="selectSecretKeyOnClick"
android:text="Select secret key" />
<Button
android:id="@+id/intent_demo_select_encryption_key"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="intentDemoSelectEncryptionKeysOnClick"
android:onClick="selectEncryptionKeysOnClick"
android:text="Select encryption key(s)" />
<EditText
@@ -47,14 +47,14 @@
android:id="@+id/intent_demo_encrypt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="intentDemoEncryptOnClick"
android:onClick="encryptOnClick"
android:text="Encrypt" />
<Button
android:id="@+id/intent_demo_decrypt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="intentDemoDecryptOnClick"
android:onClick="decryptOnClick"
android:text="Decrypt" />
<TextView

185
org_apg_integration_demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java Normal file
View File

@@ -0,0 +1,185 @@
package org.thialfihar.android.apg.demo;
import org.thialfihar.android.apg.integration.ApgData;
import org.thialfihar.android.apg.integration.ApgIntentHelper;
import org.thialfihar.android.apg.service.IApgEncryptDecryptHandler;
import org.thialfihar.android.apg.service.IApgHelperHandler;
import org.thialfihar.android.apg.service.IApgService;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
import android.os.RemoteException;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
public class AidlDemoActivity extends Activity {
Activity mActivity;
TextView mMessageTextView;
TextView mCiphertextTextView;
TextView mDataTextView;
ApgIntentHelper mApgIntentHelper;
ApgData mApgData;
private IApgService service = null;
private ServiceConnection svcConn = new ServiceConnection() {
public void onServiceConnected(ComponentName className, IBinder binder) {
service = IApgService.Stub.asInterface(binder);
}
public void onServiceDisconnected(ComponentName className) {
service = null;
}
};
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
setContentView(R.layout.aidl_demo);
mActivity = this;
mMessageTextView = (TextView) findViewById(R.id.aidl_demo_message);
mCiphertextTextView = (TextView) findViewById(R.id.aidl_demo_ciphertext);
mDataTextView = (TextView) findViewById(R.id.aidl_demo_data);
mApgIntentHelper = new ApgIntentHelper(mActivity);
mApgData = new ApgData();
bindService(new Intent("org.thialfihar.android.apg.service.IApgService"), svcConn,
Context.BIND_AUTO_CREATE);
}
public void encryptOnClick(View view) {
byte[] inputBytes = mMessageTextView.getText().toString().getBytes();
try {
service.encryptAsymmetric(inputBytes, null, true, 0, mApgData.getEncryptionKeys(), 7,
encryptDecryptHandler);
} catch (RemoteException e) {
exceptionImplementation(-1, e.toString());
}
}
public void decryptOnClick(View view) {
byte[] inputBytes = mCiphertextTextView.getText().toString().getBytes();
try {
service.decryptAndVerifyAsymmetric(inputBytes, null, null, encryptDecryptHandler);
} catch (RemoteException e) {
exceptionImplementation(-1, e.toString());
}
}
private void updateView() {
if (mApgData.getDecryptedData() != null) {
mMessageTextView.setText(mApgData.getDecryptedData());
}
if (mApgData.getEncryptedData() != null) {
mCiphertextTextView.setText(mApgData.getEncryptedData());
}
mDataTextView.setText(mApgData.toString());
}
@Override
public void onDestroy() {
super.onDestroy();
unbindService(svcConn);
}
private void exceptionImplementation(int exceptionId, String error) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Exception!").setMessage(error).setPositiveButton("OK", null).show();
}
private final IApgEncryptDecryptHandler.Stub encryptDecryptHandler = new IApgEncryptDecryptHandler.Stub() {
@Override
public void onException(final int exceptionId, final String message) throws RemoteException {
runOnUiThread(new Runnable() {
public void run() {
exceptionImplementation(exceptionId, message);
}
});
}
@Override
public void onSuccessEncrypt(final byte[] outputBytes, String outputUri)
throws RemoteException {
runOnUiThread(new Runnable() {
public void run() {
mApgData.setEncryptedData(new String(outputBytes));
updateView();
}
});
}
@Override
public void onSuccessDecrypt(final byte[] outputBytes, String outputUri, boolean signature,
long signatureKeyId, String signatureUserId, boolean signatureSuccess,
boolean signatureUnknown) throws RemoteException {
runOnUiThread(new Runnable() {
public void run() {
mApgData.setDecryptedData(new String(outputBytes));
updateView();
}
});
}
};
private final IApgHelperHandler.Stub helperHandler = new IApgHelperHandler.Stub() {
@Override
public void onException(final int exceptionId, final String message) throws RemoteException {
runOnUiThread(new Runnable() {
public void run() {
exceptionImplementation(exceptionId, message);
}
});
}
@Override
public void onSuccessGetDecryptionKey(long arg0, boolean arg1) throws RemoteException {
// TODO Auto-generated method stub
}
};
/**
* Selection is done with Intents, not AIDL!
*
* @param view
*/
public void selectSecretKeyOnClick(View view) {
mApgIntentHelper.selectSecretKey();
}
public void selectEncryptionKeysOnClick(View view) {
mApgIntentHelper.selectEncryptionKeys("user@example.com");
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
// this updates the mApgData object to the result of the methods
boolean result = mApgIntentHelper.onActivityResult(requestCode, resultCode, data, mApgData);
if (result) {
updateView();
}
// continue with other activity results
super.onActivityResult(requestCode, resultCode, data);
}
}

3
org_apg_integration_demo/src/org/thialfihar/android/apg/demo/BaseActivity.java
View File

@@ -24,7 +24,6 @@ import android.os.Bundle;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceActivity;
import android.widget.Toast;
public class BaseActivity extends PreferenceActivity {
private Activity mActivity;
@@ -60,7 +59,7 @@ public class BaseActivity extends PreferenceActivity {
mAidlDemo.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
Toast.makeText(mActivity, "Currently not implemented!", Toast.LENGTH_LONG).show();
startActivity(new Intent(mActivity, AidlDemoActivity.class));
return false;
}

21
org_apg_integration_demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java
View File

@@ -28,11 +28,12 @@ import android.widget.TextView;
public class IntentDemoActivity extends Activity {
Activity mActivity;
ApgIntentHelper mApgIntentHelper;
TextView mMessageTextView;
TextView mCiphertextTextView;
TextView mDataTextView;
ApgIntentHelper mApgIntentHelper;
ApgData mApgData;
/**
@@ -45,34 +46,34 @@ public class IntentDemoActivity extends Activity {
setContentView(R.layout.intent_demo);
mActivity = this;
mApgIntentHelper = new ApgIntentHelper(mActivity);
mMessageTextView = (TextView) findViewById(R.id.intent_demo_message);
mCiphertextTextView = (TextView) findViewById(R.id.intent_demo_ciphertext);
mDataTextView = (TextView) findViewById(R.id.intent_demo_data);
mApgIntentHelper = new ApgIntentHelper(mActivity);
mApgData = new ApgData();
}
public void intentDemoCreateNewKeyOnClick(View view) {
public void createNewKeyOnClick(View view) {
// mApgIntentHelper.createNewKey();
mApgIntentHelper.createNewKey("test <+491711111111@cryptocall.org>", true, true);
mApgIntentHelper.createNewKey("test <user@example.com>", true, true);
}
public void intentDemoSelectSecretKeyOnClick(View view) {
public void selectSecretKeyOnClick(View view) {
mApgIntentHelper.selectSecretKey();
}
public void intentDemoSelectEncryptionKeysOnClick(View view) {
mApgIntentHelper.selectEncryptionKeys("usera@example.com");
public void selectEncryptionKeysOnClick(View view) {
mApgIntentHelper.selectEncryptionKeys("user@example.com");
}
public void intentDemoEncryptOnClick(View view) {
public void encryptOnClick(View view) {
mApgIntentHelper.encrypt(mMessageTextView.getText().toString(),
mApgData.getEncryptionKeys(), mApgData.getSignatureKeyId());
}
public void intentDemoDecryptOnClick(View view) {
public void decryptOnClick(View view) {
mApgIntentHelper.decrypt(mCiphertextTextView.getText().toString());
}