aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org
diff options
context:
space:
mode:
Diffstat (limited to 'OpenPGP-Keychain/src/org')
-rw-r--r--OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpCallback.aidl (renamed from OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl)12
-rw-r--r--OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpService.aidl (renamed from OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl)14
-rw-r--r--OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.aidl (renamed from OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.aidl)6
-rw-r--r--OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.java (renamed from OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java)20
-rw-r--r--OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpServiceConnection.java (renamed from OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java)18
-rw-r--r--OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.aidl (renamed from OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.aidl)6
-rw-r--r--OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java (renamed from OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.java)20
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpService.java (renamed from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java)68
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpServiceActivity.java (renamed from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java)24
9 files changed, 94 insertions, 94 deletions
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl b/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpCallback.aidl
index 31285671f..e0ac43d22 100644
--- a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpCallback.aidl
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package org.openintents.crypto;
+package org.openintents.openpgp;
-import org.openintents.crypto.CryptoSignatureResult;
-import org.openintents.crypto.CryptoError;
+import org.openintents.openpgp.OpenPgpSignatureResult;
+import org.openintents.openpgp.OpenPgpError;
-interface ICryptoCallback {
+interface IOpenPgpCallback {
/**
* CryptoSignatureResult is only returned if the Callback was used from decryptAndVerify
*
*/
- oneway void onSuccess(in byte[] outputBytes, in CryptoSignatureResult signatureResult);
+ oneway void onSuccess(in byte[] outputBytes, in OpenPgpSignatureResult signatureResult);
- oneway void onError(in CryptoError error);
+ oneway void onError(in OpenPgpError error);
} \ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl b/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpService.aidl
index 854ca0b05..1d54ac77f 100644
--- a/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/openpgp/IOpenPgpService.aidl
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.openintents.crypto;
+package org.openintents.openpgp;
-import org.openintents.crypto.ICryptoCallback;
+import org.openintents.openpgp.IOpenPgpCallback;
/**
* All methods are oneway, which means they are asynchronous and non-blocking.
* Results are returned to the callback, which has to be implemented on client side.
*/
-interface ICryptoService {
+interface IOpenPgpService {
/**
* Encrypt
@@ -36,7 +36,7 @@ interface ICryptoService {
* @param callback
* Callback where to return results
*/
- oneway void encrypt(in byte[] inputBytes, in String[] encryptionUserIds, in boolean asciiArmor, in ICryptoCallback callback);
+ oneway void encrypt(in byte[] inputBytes, in String[] encryptionUserIds, in boolean asciiArmor, in IOpenPgpCallback callback);
/**
* Sign
@@ -48,7 +48,7 @@ interface ICryptoService {
* @param callback
* Callback where to return results
*/
- oneway void sign(in byte[] inputBytes, in boolean asciiArmor, in ICryptoCallback callback);
+ oneway void sign(in byte[] inputBytes, in boolean asciiArmor, in IOpenPgpCallback callback);
/**
* Encrypt and sign
@@ -64,7 +64,7 @@ interface ICryptoService {
* @param callback
* Callback where to return results
*/
- oneway void encryptAndSign(in byte[] inputBytes, in String[] encryptionUserIds, in boolean asciiArmor, in ICryptoCallback callback);
+ oneway void encryptAndSign(in byte[] inputBytes, in String[] encryptionUserIds, in boolean asciiArmor, in IOpenPgpCallback callback);
/**
* Decrypts and verifies given input bytes. If no signature is present this method
@@ -75,6 +75,6 @@ interface ICryptoService {
* @param callback
* Callback where to return results
*/
- oneway void decryptAndVerify(in byte[] inputBytes, in ICryptoCallback callback);
+ oneway void decryptAndVerify(in byte[] inputBytes, in IOpenPgpCallback callback);
} \ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.aidl b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.aidl
index 7b67c8995..7a6bed1e6 100644
--- a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.aidl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openintents.crypto;
+package org.openintents.openpgp;
-// Declare CryptoError so AIDL can find it and knows that it implements the parcelable protocol.
-parcelable CryptoError; \ No newline at end of file
+// Declare OpenPgpError so AIDL can find it and knows that it implements the parcelable protocol.
+parcelable OpenPgpError; \ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.java
index 13233f70b..66f168d89 100644
--- a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java
+++ b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpError.java
@@ -14,27 +14,27 @@
* limitations under the License.
*/
-package org.openintents.crypto;
+package org.openintents.openpgp;
import android.os.Parcel;
import android.os.Parcelable;
-public class CryptoError implements Parcelable {
+public class OpenPgpError implements Parcelable {
public static final int ID_NO_OR_WRONG_PASSPHRASE = 1;
public static final int ID_NO_USER_IDS = 2;
int errorId;
String message;
- public CryptoError() {
+ public OpenPgpError() {
}
- public CryptoError(int errorId, String message) {
+ public OpenPgpError(int errorId, String message) {
this.errorId = errorId;
this.message = message;
}
- public CryptoError(CryptoError b) {
+ public OpenPgpError(OpenPgpError b) {
this.errorId = b.errorId;
this.message = b.message;
}
@@ -64,16 +64,16 @@ public class CryptoError implements Parcelable {
dest.writeString(message);
}
- public static final Creator<CryptoError> CREATOR = new Creator<CryptoError>() {
- public CryptoError createFromParcel(final Parcel source) {
- CryptoError error = new CryptoError();
+ public static final Creator<OpenPgpError> CREATOR = new Creator<OpenPgpError>() {
+ public OpenPgpError createFromParcel(final Parcel source) {
+ OpenPgpError error = new OpenPgpError();
error.errorId = source.readInt();
error.message = source.readString();
return error;
}
- public CryptoError[] newArray(final int size) {
- return new CryptoError[size];
+ public OpenPgpError[] newArray(final int size) {
+ return new OpenPgpError[size];
}
};
}
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpServiceConnection.java
index d9e91f772..9f4fec470 100644
--- a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java
+++ b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpServiceConnection.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.openintents.crypto;
+package org.openintents.openpgp;
-import org.openintents.crypto.ICryptoService;
+import org.openintents.openpgp.IOpenPgpService;
import android.content.ComponentName;
import android.content.Context;
@@ -25,27 +25,27 @@ import android.content.ServiceConnection;
import android.os.IBinder;
import android.util.Log;
-public class CryptoServiceConnection {
+public class OpenPgpServiceConnection {
private Context mApplicationContext;
- private ICryptoService mService;
+ private IOpenPgpService mService;
private boolean bound;
private String cryptoProviderPackageName;
- private static final String TAG = "CryptoConnection";
+ private static final String TAG = "OpenPgpServiceConnection";
- public CryptoServiceConnection(Context context, String cryptoProviderPackageName) {
+ public OpenPgpServiceConnection(Context context, String cryptoProviderPackageName) {
mApplicationContext = context.getApplicationContext();
this.cryptoProviderPackageName = cryptoProviderPackageName;
}
- public ICryptoService getService() {
+ public IOpenPgpService getService() {
return mService;
}
private ServiceConnection mCryptoServiceConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName name, IBinder service) {
- mService = ICryptoService.Stub.asInterface(service);
+ mService = IOpenPgpService.Stub.asInterface(service);
Log.d(TAG, "connected to service");
bound = true;
}
@@ -68,7 +68,7 @@ public class CryptoServiceConnection {
Log.d(TAG, "not bound yet");
Intent serviceIntent = new Intent();
- serviceIntent.setAction("org.openintents.crypto.ICryptoService");
+ serviceIntent.setAction(IOpenPgpService.class.getName());
serviceIntent.setPackage(cryptoProviderPackageName);
mApplicationContext.bindService(serviceIntent, mCryptoServiceConnection,
Context.BIND_AUTO_CREATE);
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.aidl b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.aidl
index 1d39bac70..e246792d0 100644
--- a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.aidl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openintents.crypto;
+package org.openintents.openpgp;
-// Declare CryptoSignatureResult so AIDL can find it and knows that it implements the parcelable protocol.
-parcelable CryptoSignatureResult; \ No newline at end of file
+// Declare OpenPgpSignatureResult so AIDL can find it and knows that it implements the parcelable protocol.
+parcelable OpenPgpSignatureResult; \ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.java b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
index d3aaa52d9..d8642664f 100644
--- a/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.java
+++ b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
@@ -14,23 +14,23 @@
* limitations under the License.
*/
-package org.openintents.crypto;
+package org.openintents.openpgp;
import android.os.Parcel;
import android.os.Parcelable;
-public class CryptoSignatureResult implements Parcelable {
+public class OpenPgpSignatureResult implements Parcelable {
String signatureUserId;
boolean signature;
boolean signatureSuccess;
boolean signatureUnknown;
- public CryptoSignatureResult() {
+ public OpenPgpSignatureResult() {
}
- public CryptoSignatureResult(String signatureUserId, boolean signature,
+ public OpenPgpSignatureResult(String signatureUserId, boolean signature,
boolean signatureSuccess, boolean signatureUnknown) {
this.signatureUserId = signatureUserId;
@@ -39,7 +39,7 @@ public class CryptoSignatureResult implements Parcelable {
this.signatureUnknown = signatureUnknown;
}
- public CryptoSignatureResult(CryptoSignatureResult b) {
+ public OpenPgpSignatureResult(OpenPgpSignatureResult b) {
this.signatureUserId = b.signatureUserId;
this.signature = b.signature;
@@ -59,9 +59,9 @@ public class CryptoSignatureResult implements Parcelable {
dest.writeByte((byte) (signatureUnknown ? 1 : 0));
}
- public static final Creator<CryptoSignatureResult> CREATOR = new Creator<CryptoSignatureResult>() {
- public CryptoSignatureResult createFromParcel(final Parcel source) {
- CryptoSignatureResult vr = new CryptoSignatureResult();
+ public static final Creator<OpenPgpSignatureResult> CREATOR = new Creator<OpenPgpSignatureResult>() {
+ public OpenPgpSignatureResult createFromParcel(final Parcel source) {
+ OpenPgpSignatureResult vr = new OpenPgpSignatureResult();
vr.signatureUserId = source.readString();
vr.signature = source.readByte() == 1;
vr.signatureSuccess = source.readByte() == 1;
@@ -69,8 +69,8 @@ public class CryptoSignatureResult implements Parcelable {
return vr;
}
- public CryptoSignatureResult[] newArray(final int size) {
- return new CryptoSignatureResult[size];
+ public OpenPgpSignatureResult[] newArray(final int size) {
+ return new OpenPgpSignatureResult[size];
}
};
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpService.java
index 7f36fc2de..0a640560a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpService.java
@@ -26,10 +26,10 @@ import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
-import org.openintents.crypto.CryptoError;
-import org.openintents.crypto.CryptoSignatureResult;
-import org.openintents.crypto.ICryptoCallback;
-import org.openintents.crypto.ICryptoService;
+import org.openintents.openpgp.IOpenPgpCallback;
+import org.openintents.openpgp.IOpenPgpService;
+import org.openintents.openpgp.OpenPgpError;
+import org.openintents.openpgp.OpenPgpSignatureResult;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.Id;
import org.sufficientlysecure.keychain.R;
@@ -56,7 +56,7 @@ import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
-public class CryptoService extends Service {
+public class OpenPgpService extends Service {
Context mContext;
final ArrayBlockingQueue<Runnable> mPoolQueue = new ArrayBlockingQueue<Runnable>(100);
@@ -103,12 +103,12 @@ public class CryptoService extends Service {
// start passphrase dialog
Bundle extras = new Bundle();
- extras.putLong(CryptoServiceActivity.EXTRA_SECRET_KEY_ID, keyId);
+ extras.putLong(OpenPgpServiceActivity.EXTRA_SECRET_KEY_ID, keyId);
PassphraseActivityCallback callback = new PassphraseActivityCallback();
Messenger messenger = new Messenger(new Handler(getMainLooper(), callback));
- pauseQueueAndStartServiceActivity(CryptoServiceActivity.ACTION_CACHE_PASSPHRASE,
+ pauseQueueAndStartServiceActivity(OpenPgpServiceActivity.ACTION_CACHE_PASSPHRASE,
messenger, extras);
if (callback.isSuccess()) {
@@ -199,12 +199,12 @@ public class CryptoService extends Service {
Messenger messenger = new Messenger(new Handler(getMainLooper(), callback));
Bundle extras = new Bundle();
- extras.putLongArray(CryptoServiceActivity.EXTRA_SELECTED_MASTER_KEY_IDS, keyIdsArray);
- extras.putStringArrayList(CryptoServiceActivity.EXTRA_MISSING_USER_IDS, missingUserIds);
- extras.putStringArrayList(CryptoServiceActivity.EXTRA_DUBLICATE_USER_IDS,
+ extras.putLongArray(OpenPgpServiceActivity.EXTRA_SELECTED_MASTER_KEY_IDS, keyIdsArray);
+ extras.putStringArrayList(OpenPgpServiceActivity.EXTRA_MISSING_USER_IDS, missingUserIds);
+ extras.putStringArrayList(OpenPgpServiceActivity.EXTRA_DUBLICATE_USER_IDS,
dublicateUserIds);
- pauseQueueAndStartServiceActivity(CryptoServiceActivity.ACTION_SELECT_PUB_KEYS,
+ pauseQueueAndStartServiceActivity(OpenPgpServiceActivity.ACTION_SELECT_PUB_KEYS,
messenger, extras);
if (callback.isSuccess()) {
@@ -255,7 +255,7 @@ public class CryptoService extends Service {
};
private synchronized void encryptAndSignSafe(byte[] inputBytes, String[] encryptionUserIds,
- boolean asciiArmor, ICryptoCallback callback, AppSettings appSettings, boolean sign)
+ boolean asciiArmor, IOpenPgpCallback callback, AppSettings appSettings, boolean sign)
throws RemoteException {
try {
// build InputData and write into OutputStream
@@ -267,14 +267,14 @@ public class CryptoService extends Service {
long[] keyIds = getKeyIdsFromEmails(encryptionUserIds, appSettings.getKeyId());
if (keyIds == null) {
- callback.onError(new CryptoError(CryptoError.ID_NO_USER_IDS, "No user ids!"));
+ callback.onError(new OpenPgpError(OpenPgpError.ID_NO_USER_IDS, "No user ids!"));
return;
}
if (sign) {
String passphrase = getCachedPassphrase(appSettings.getKeyId());
if (passphrase == null) {
- callback.onError(new CryptoError(CryptoError.ID_NO_OR_WRONG_PASSPHRASE,
+ callback.onError(new OpenPgpError(OpenPgpError.ID_NO_OR_WRONG_PASSPHRASE,
"No or wrong passphrase!"));
return;
}
@@ -300,7 +300,7 @@ public class CryptoService extends Service {
Log.e(Constants.TAG, "KeychainService, Exception!", e);
try {
- callback.onError(new CryptoError(0, e.getMessage()));
+ callback.onError(new OpenPgpError(0, e.getMessage()));
} catch (Exception t) {
Log.e(Constants.TAG, "Error returning exception to client", t);
}
@@ -308,7 +308,7 @@ public class CryptoService extends Service {
}
// TODO: asciiArmor?!
- private void signSafe(byte[] inputBytes, ICryptoCallback callback, AppSettings appSettings)
+ private void signSafe(byte[] inputBytes, IOpenPgpCallback callback, AppSettings appSettings)
throws RemoteException {
try {
Log.d(Constants.TAG, "current therad id: " + Thread.currentThread().getId());
@@ -322,7 +322,7 @@ public class CryptoService extends Service {
String passphrase = getCachedPassphrase(appSettings.getKeyId());
if (passphrase == null) {
- callback.onError(new CryptoError(CryptoError.ID_NO_OR_WRONG_PASSPHRASE,
+ callback.onError(new OpenPgpError(OpenPgpError.ID_NO_OR_WRONG_PASSPHRASE,
"No or wrong passphrase!"));
return;
}
@@ -341,14 +341,14 @@ public class CryptoService extends Service {
Log.e(Constants.TAG, "KeychainService, Exception!", e);
try {
- callback.onError(new CryptoError(0, e.getMessage()));
+ callback.onError(new OpenPgpError(0, e.getMessage()));
} catch (Exception t) {
Log.e(Constants.TAG, "Error returning exception to client", t);
}
}
}
- private synchronized void decryptAndVerifySafe(byte[] inputBytes, ICryptoCallback callback,
+ private synchronized void decryptAndVerifySafe(byte[] inputBytes, IOpenPgpCallback callback,
AppSettings appSettings) throws RemoteException {
try {
// TODO: this is not really needed
@@ -432,7 +432,7 @@ public class CryptoService extends Service {
passphrase = getCachedPassphrase(secretKeyId);
if (passphrase == null) {
- callback.onError(new CryptoError(CryptoError.ID_NO_OR_WRONG_PASSPHRASE,
+ callback.onError(new OpenPgpError(OpenPgpError.ID_NO_OR_WRONG_PASSPHRASE,
"No or wrong passphrase!"));
return;
}
@@ -470,10 +470,10 @@ public class CryptoService extends Service {
boolean signatureUnknown = outputBundle
.getBoolean(KeychainIntentService.RESULT_SIGNATURE_UNKNOWN);
- CryptoSignatureResult sigResult = null;
+ OpenPgpSignatureResult sigResult = null;
if (signature) {
- sigResult = new CryptoSignatureResult(signatureUserId, signature, signatureSuccess,
- signatureUnknown);
+ sigResult = new OpenPgpSignatureResult(signatureUserId, signature,
+ signatureSuccess, signatureUnknown);
}
// return over handler on client side
@@ -482,18 +482,18 @@ public class CryptoService extends Service {
Log.e(Constants.TAG, "KeychainService, Exception!", e);
try {
- callback.onError(new CryptoError(0, e.getMessage()));
+ callback.onError(new OpenPgpError(0, e.getMessage()));
} catch (Exception t) {
Log.e(Constants.TAG, "Error returning exception to client", t);
}
}
}
- private final ICryptoService.Stub mBinder = new ICryptoService.Stub() {
+ private final IOpenPgpService.Stub mBinder = new IOpenPgpService.Stub() {
@Override
public void encrypt(final byte[] inputBytes, final String[] encryptionUserIds,
- final boolean asciiArmor, final ICryptoCallback callback) throws RemoteException {
+ final boolean asciiArmor, final IOpenPgpCallback callback) throws RemoteException {
final AppSettings settings = getAppSettings();
@@ -515,7 +515,7 @@ public class CryptoService extends Service {
@Override
public void encryptAndSign(final byte[] inputBytes, final String[] encryptionUserIds,
- final boolean asciiArmor, final ICryptoCallback callback) throws RemoteException {
+ final boolean asciiArmor, final IOpenPgpCallback callback) throws RemoteException {
final AppSettings settings = getAppSettings();
@@ -536,8 +536,8 @@ public class CryptoService extends Service {
}
@Override
- public void sign(final byte[] inputBytes, boolean asciiArmor, final ICryptoCallback callback)
- throws RemoteException {
+ public void sign(final byte[] inputBytes, boolean asciiArmor,
+ final IOpenPgpCallback callback) throws RemoteException {
final AppSettings settings = getAppSettings();
Runnable r = new Runnable() {
@@ -557,7 +557,7 @@ public class CryptoService extends Service {
}
@Override
- public void decryptAndVerify(final byte[] inputBytes, final ICryptoCallback callback)
+ public void decryptAndVerify(final byte[] inputBytes, final IOpenPgpCallback callback)
throws RemoteException {
final AppSettings settings = getAppSettings();
@@ -591,12 +591,12 @@ public class CryptoService extends Service {
Log.e(Constants.TAG, "Not allowed to use service! Starting activity for registration!");
Bundle extras = new Bundle();
// TODO: currently simply uses first entry
- extras.putString(CryptoServiceActivity.EXTRA_PACKAGE_NAME, callingPackages[0]);
+ extras.putString(OpenPgpServiceActivity.EXTRA_PACKAGE_NAME, callingPackages[0]);
RegisterActivityCallback callback = new RegisterActivityCallback();
Messenger messenger = new Messenger(new Handler(getMainLooper(), callback));
- pauseQueueAndStartServiceActivity(CryptoServiceActivity.ACTION_REGISTER, messenger,
+ pauseQueueAndStartServiceActivity(OpenPgpServiceActivity.ACTION_REGISTER, messenger,
extras);
if (callback.isAllowed()) {
@@ -726,11 +726,11 @@ public class CryptoService extends Service {
mThreadPool.pause();
Log.d(Constants.TAG, "starting activity...");
- Intent intent = new Intent(getBaseContext(), CryptoServiceActivity.class);
+ Intent intent = new Intent(getBaseContext(), OpenPgpServiceActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setAction(action);
- extras.putParcelable(CryptoServiceActivity.EXTRA_MESSENGER, messenger);
+ extras.putParcelable(OpenPgpServiceActivity.EXTRA_MESSENGER, messenger);
intent.putExtras(extras);
startActivity(intent);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpServiceActivity.java
index a8e101dae..3d3d046e1 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpServiceActivity.java
@@ -41,7 +41,7 @@ import android.widget.Toast;
import com.actionbarsherlock.app.SherlockFragmentActivity;
-public class CryptoServiceActivity extends SherlockFragmentActivity {
+public class OpenPgpServiceActivity extends SherlockFragmentActivity {
public static final String ACTION_REGISTER = Constants.INTENT_PREFIX + "API_ACTIVITY_REGISTER";
public static final String ACTION_CACHE_PASSPHRASE = Constants.INTENT_PREFIX
@@ -84,7 +84,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
if (!finishHandled) {
Message msg = Message.obtain();
- msg.arg1 = CryptoService.RegisterActivityCallback.CANCEL;
+ msg.arg1 = OpenPgpService.RegisterActivityCallback.CANCEL;
try {
mMessenger.send(msg);
} catch (RemoteException e) {
@@ -120,17 +120,17 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
// user needs to select a key!
if (mSettingsFragment.getAppSettings().getKeyId() == Id.key.none) {
- Toast.makeText(CryptoServiceActivity.this,
+ Toast.makeText(OpenPgpServiceActivity.this,
R.string.api_register_error_select_key, Toast.LENGTH_LONG)
.show();
} else {
- ProviderHelper.insertApiApp(CryptoServiceActivity.this,
+ ProviderHelper.insertApiApp(OpenPgpServiceActivity.this,
mSettingsFragment.getAppSettings());
Message msg = Message.obtain();
- msg.arg1 = CryptoService.RegisterActivityCallback.OKAY;
+ msg.arg1 = OpenPgpService.RegisterActivityCallback.OKAY;
Bundle data = new Bundle();
- data.putString(CryptoService.RegisterActivityCallback.PACKAGE_NAME,
+ data.putString(OpenPgpService.RegisterActivityCallback.PACKAGE_NAME,
packageName);
msg.setData(data);
try {
@@ -149,7 +149,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
// Disallow
Message msg = Message.obtain();
- msg.arg1 = CryptoService.RegisterActivityCallback.CANCEL;
+ msg.arg1 = OpenPgpService.RegisterActivityCallback.CANCEL;
try {
mMessenger.send(msg);
} catch (RemoteException e) {
@@ -210,10 +210,10 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
// ok
Message msg = Message.obtain();
- msg.arg1 = CryptoService.SelectPubKeysActivityCallback.OKAY;
+ msg.arg1 = OpenPgpService.SelectPubKeysActivityCallback.OKAY;
Bundle data = new Bundle();
data.putLongArray(
- CryptoService.SelectPubKeysActivityCallback.PUB_KEY_IDS,
+ OpenPgpService.SelectPubKeysActivityCallback.PUB_KEY_IDS,
mSelectFragment.getSelectedMasterKeyIds());
msg.setData(data);
try {
@@ -231,7 +231,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
// cancel
Message msg = Message.obtain();
- msg.arg1 = CryptoService.SelectPubKeysActivityCallback.CANCEL;
+ msg.arg1 = OpenPgpService.SelectPubKeysActivityCallback.CANCEL;
;
try {
mMessenger.send(msg);
@@ -287,7 +287,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
public void handleMessage(Message message) {
if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
Message msg = Message.obtain();
- msg.arg1 = CryptoService.PassphraseActivityCallback.OKAY;
+ msg.arg1 = OpenPgpService.PassphraseActivityCallback.OKAY;
try {
mMessenger.send(msg);
} catch (RemoteException e) {
@@ -295,7 +295,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
}
} else {
Message msg = Message.obtain();
- msg.arg1 = CryptoService.PassphraseActivityCallback.CANCEL;
+ msg.arg1 = OpenPgpService.PassphraseActivityCallback.CANCEL;
try {
mMessenger.send(msg);
} catch (RemoteException e) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 19:04:31 +0000