From 41338e115cb015c492dc44f224bc4b4cffe15cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 17 Jun 2013 15:52:09 +0200 Subject: Better API demo, open activity from service, discover crypto provider with packagemanager instead of register intent --- .../keychain/demo/CryptoProviderDemoActivity.java | 259 ++++++++++----------- 1 file changed, 119 insertions(+), 140 deletions(-) (limited to 'OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java') diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java index b915e2a76..03668fcab 100644 --- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java +++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Dominik Schürmann + * Copyright (C) 2013 Dominik Schürmann * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,30 +16,30 @@ package org.sufficientlysecure.keychain.demo; +import java.util.ArrayList; +import java.util.List; + +import org.openintents.crypto.CryptoError; +import org.openintents.crypto.CryptoServiceConnection; +import org.openintents.crypto.CryptoSignatureResult; +import org.openintents.crypto.ICryptoCallback; import org.sufficientlysecure.keychain.demo.R; import org.sufficientlysecure.keychain.integration.Constants; -import org.sufficientlysecure.keychain.integration.KeychainData; -import org.sufficientlysecure.keychain.integration.KeychainIntentHelper; -import org.sufficientlysecure.keychain.service.IKeychainApiService; -import org.sufficientlysecure.keychain.service.IKeychainKeyService; -import org.sufficientlysecure.keychain.service.handler.IKeychainDecryptHandler; -import org.sufficientlysecure.keychain.service.handler.IKeychainEncryptHandler; -import org.sufficientlysecure.keychain.service.handler.IKeychainGetDecryptionKeyIdHandler; import android.app.Activity; import android.app.AlertDialog; -import android.content.ActivityNotFoundException; -import android.content.ComponentName; -import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; -import android.content.ServiceConnection; +import android.content.pm.ResolveInfo; +import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.os.IBinder; import android.os.RemoteException; import android.util.Log; import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.ListAdapter; import android.widget.TextView; -import android.widget.Toast; public class CryptoProviderDemoActivity extends Activity { Activity mActivity; @@ -48,19 +48,9 @@ public class CryptoProviderDemoActivity extends Activity { TextView mCiphertextTextView; TextView mDataTextView; - KeychainIntentHelper mKeychainIntentHelper; - KeychainData mKeychainData; - - private IKeychainApiService service = null; - private ServiceConnection svcConn = new ServiceConnection() { - public void onServiceConnected(ComponentName className, IBinder binder) { - service = IKeychainApiService.Stub.asInterface(binder); - } + private CryptoServiceConnection mCryptoServiceConnection; - public void onServiceDisconnected(ComponentName className) { - service = null; - } - }; + private static final String CRYPTO_SERVICE_INTENT = "org.openintents.crypto.ICryptoService"; @Override public void onCreate(Bundle icicle) { @@ -69,55 +59,49 @@ public class CryptoProviderDemoActivity extends Activity { mActivity = this; - mMessageTextView = (TextView) findViewById(R.id.aidl_demo_message); - mCiphertextTextView = (TextView) findViewById(R.id.aidl_demo_ciphertext); + mMessageTextView = (TextView) findViewById(R.id.crypto_provider_demo_message); + mCiphertextTextView = (TextView) findViewById(R.id.crypto_provider_demo_ciphertext); mDataTextView = (TextView) findViewById(R.id.aidl_demo_data); - mKeychainIntentHelper = new KeychainIntentHelper(mActivity); - mKeychainData = new KeychainData(); - - bindService(new Intent(IKeychainApiService.class.getName()), svcConn, - Context.BIND_AUTO_CREATE); + selectCryptoProvider(); } - public void registerCryptoProvider(View view) { - try { - startActivityForResult(Intent.createChooser(new Intent("com.android.crypto.REGISTER"), - "select crypto provider"), 123); - } catch (ActivityNotFoundException e) { - Toast.makeText(mActivity, "No app that handles com.android.crypto.REGISTER!", - Toast.LENGTH_LONG).show(); - Log.e(Constants.TAG, "No app that handles com.android.crypto.REGISTER!"); + /** + * Callback from remote crypto service + */ + final ICryptoCallback.Stub callback = new ICryptoCallback.Stub() { + + @Override + public void onEncryptSignSuccess(byte[] outputBytes) throws RemoteException { + // not needed here } - } - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == 123) { - if (resultCode == RESULT_OK) { - String packageName = data.getStringExtra("packageName"); - Log.d(Constants.TAG, "packageName: " + packageName); - } + @Override + public void onDecryptVerifySuccess(byte[] outputBytes, CryptoSignatureResult signatureResult) + throws RemoteException { + Log.d(Constants.TAG, "onDecryptVerifySuccess"); + + // PgpData data = new PgpData(); + // data.setDecryptedData(new String(outputBytes)); + // mFragment.setMessageWithPgpData(data); } - // boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data, - // mKeychainData); - // if (result) { - // updateView(); - // } + @Override + public void onError(CryptoError error) throws RemoteException { + Log.e(Constants.TAG, "onError getErrorId:" + error.getErrorId()); + Log.e(Constants.TAG, "onError getErrorId:" + error.getMessage()); + } - // continue with other activity results - super.onActivityResult(requestCode, resultCode, data); - } + }; public void encryptOnClick(View view) { byte[] inputBytes = mMessageTextView.getText().toString().getBytes(); try { - service.encryptAsymmetric(inputBytes, null, true, 0, mKeychainData.getPublicKeys(), 7, - encryptHandler); + mCryptoServiceConnection.getService().encrypt(inputBytes, + new String[] { "dominik@dominikschuermann.de" }, callback); } catch (RemoteException e) { - exceptionImplementation(-1, e.toString()); + Log.e(Constants.TAG, "CryptoProviderDemo", e); } } @@ -125,114 +109,109 @@ public class CryptoProviderDemoActivity extends Activity { byte[] inputBytes = mCiphertextTextView.getText().toString().getBytes(); try { - service.decryptAndVerifyAsymmetric(inputBytes, null, null, decryptHandler); + mCryptoServiceConnection.getService().decryptAndVerify(inputBytes, callback); } catch (RemoteException e) { - exceptionImplementation(-1, e.toString()); - } - } - - private void updateView() { - if (mKeychainData.getDecryptedData() != null) { - mMessageTextView.setText(mKeychainData.getDecryptedData()); - } - if (mKeychainData.getEncryptedData() != null) { - mCiphertextTextView.setText(mKeychainData.getEncryptedData()); + Log.e(Constants.TAG, "CryptoProviderDemo", e); } - mDataTextView.setText(mKeychainData.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(); + if (mCryptoServiceConnection != null) { + mCryptoServiceConnection.unbindFromService(); + } } - private final IKeychainEncryptHandler.Stub encryptHandler = new IKeychainEncryptHandler.Stub() { + private static class CryptoProviderElement { + private String packageName; + private String simpleName; + private Drawable icon; - @Override - public void onException(final int exceptionId, final String message) throws RemoteException { - runOnUiThread(new Runnable() { - public void run() { - exceptionImplementation(exceptionId, message); - } - }); + public CryptoProviderElement(String packageName, String simpleName, Drawable icon) { + this.packageName = packageName; + this.simpleName = simpleName; + this.icon = icon; } @Override - public void onSuccess(final byte[] outputBytes, String outputUri) throws RemoteException { - runOnUiThread(new Runnable() { - public void run() { - mKeychainData.setEncryptedData(new String(outputBytes)); - updateView(); - } - }); + public String toString() { + return simpleName; } + } - }; + private void selectCryptoProvider() { + Intent intent = new Intent(CRYPTO_SERVICE_INTENT); - private final IKeychainDecryptHandler.Stub decryptHandler = new IKeychainDecryptHandler.Stub() { + final ArrayList providerList = new ArrayList(); - @Override - public void onException(final int exceptionId, final String message) throws RemoteException { - runOnUiThread(new Runnable() { - public void run() { - exceptionImplementation(exceptionId, message); - } - }); - } + List resInfo = getPackageManager().queryIntentServices(intent, 0); + if (!resInfo.isEmpty()) { + for (ResolveInfo resolveInfo : resInfo) { + if (resolveInfo.serviceInfo == null) + continue; - @Override - public void onSuccess(final byte[] outputBytes, String outputUri, boolean signature, - long signatureKeyId, String signatureUserId, boolean signatureSuccess, - boolean signatureUnknown) throws RemoteException { - runOnUiThread(new Runnable() { - public void run() { - mKeychainData.setDecryptedData(new String(outputBytes)); - updateView(); - } - }); + String packageName = resolveInfo.serviceInfo.packageName; + String simpleName = String.valueOf(resolveInfo.serviceInfo + .loadLabel(getPackageManager())); + Drawable icon = resolveInfo.serviceInfo.loadIcon(getPackageManager()); + providerList.add(new CryptoProviderElement(packageName, simpleName, icon)); + } - } + AlertDialog.Builder alert = new AlertDialog.Builder(this); + alert.setTitle("Select Crypto Provider!"); + alert.setCancelable(false); - }; + if (!providerList.isEmpty()) { - private final IKeychainGetDecryptionKeyIdHandler.Stub helperHandler = new IKeychainGetDecryptionKeyIdHandler.Stub() { + // Init ArrayAdapter with Crypto Providers + ListAdapter adapter = new ArrayAdapter(this, + android.R.layout.select_dialog_item, android.R.id.text1, providerList) { + public View getView(int position, View convertView, ViewGroup parent) { + // User super class to create the View + View v = super.getView(position, convertView, parent); + TextView tv = (TextView) v.findViewById(android.R.id.text1); - @Override - public void onException(final int exceptionId, final String message) throws RemoteException { - runOnUiThread(new Runnable() { - public void run() { - exceptionImplementation(exceptionId, message); - } - }); - } + // Put the image on the TextView + tv.setCompoundDrawablesWithIntrinsicBounds(providerList.get(position).icon, + null, null, null); - @Override - public void onSuccess(long arg0, boolean arg1) throws RemoteException { - // TODO Auto-generated method stub + // Add margin between image and text (support various screen densities) + int dp5 = (int) (5 * getResources().getDisplayMetrics().density + 0.5f); + tv.setCompoundDrawablePadding(dp5); - } + return v; + } + }; - }; + alert.setSingleChoiceItems(adapter, -1, new DialogInterface.OnClickListener() { - /** - * Selection is done with Intents, not AIDL! - * - * @param view - */ - public void selectSecretKeyOnClick(View view) { - mKeychainIntentHelper.selectSecretKey(); - } + public void onClick(DialogInterface dialog, int position) { + String packageName = providerList.get(position).packageName; - public void selectEncryptionKeysOnClick(View view) { - mKeychainIntentHelper.selectPublicKeys("user@example.com"); + // bind to service + mCryptoServiceConnection = new CryptoServiceConnection( + CryptoProviderDemoActivity.this, packageName); + mCryptoServiceConnection.bindToService(); - } + dialog.dismiss(); + } + }); + } else { + alert.setMessage("No Crypto Provider installed!"); + } + + alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + finish(); + } + }); + + AlertDialog ad = alert.create(); + ad.show(); + } + } } -- cgit v1.2.3