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

rename to openintents namespace

Browse Source
This commit is contained in:
Dominik Schürmann 2013-05-29 15:58:50 +02:00
parent 438ccd480e
commit f6fc6caa1c
9 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenPGP-Keychain/AndroidManifest.xml
View File

@ -474,7 +474,7 @@
android:label="TODO reg"
android:process=":crypto" >
<intent-filter>
<action android:name="com.android.crypto.REGISTER" />
<action android:name="org.openintents.crypto.REGISTER" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@ -486,7 +486,7 @@
android:exported="true"
android:process=":crypto" >
<intent-filter>
<action android:name="com.android.crypto.ICryptoService" />
<action android:name="org.openintents.crypto.ICryptoService" />
</intent-filter>
<meta-data

2
OpenPGP-Keychain/src/com/android/crypto/CryptoError.aidl → OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.aidl
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.crypto;
package org.openintents.crypto;
// Declare CryptoError so AIDL can find it and knows that it implements the parcelable protocol.
parcelable CryptoError;

2
OpenPGP-Keychain/src/com/android/crypto/CryptoError.java → OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.crypto;
package org.openintents.crypto;
import android.os.Parcel;
import android.os.Parcelable;

6
OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java → OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java
View File

@ -14,7 +14,9 @@
* limitations under the License.
*/
package com.android.crypto;
package org.openintents.crypto;
import org.openintents.crypto.ICryptoService;
import android.content.ComponentName;
import android.content.Context;
@ -66,7 +68,7 @@ public class CryptoServiceConnection {
Log.d(TAG, "not bound yet");
Intent serviceIntent = new Intent();
serviceIntent.setAction("com.android.crypto.ICryptoService");
serviceIntent.setAction("org.openintents.crypto.ICryptoService");
serviceIntent.setPackage(cryptoProviderPackageName); // TODO: test
mApplicationContext.bindService(serviceIntent, mCryptoServiceConnection,
Context.BIND_AUTO_CREATE);

2
OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.aidl → OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.aidl
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.crypto;
package org.openintents.crypto;
// Declare CryptoSignatureResult so AIDL can find it and knows that it implements the parcelable protocol.
parcelable CryptoSignatureResult;

2
OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.java → OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.crypto;
package org.openintents.crypto;
import android.os.Parcel;
import android.os.Parcelable;

8
OpenPGP-Keychain/src/com/android/crypto/ICryptoCallback.aidl → OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl
View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
package com.android.crypto;
package org.openintents.crypto;
import com.android.crypto.CryptoSignatureResult;
import com.android.crypto.CryptoError;
import org.openintents.crypto.CryptoSignatureResult;
import org.openintents.crypto.CryptoError;
interface ICryptoCallback {
@ -27,6 +27,4 @@ interface ICryptoCallback {
oneway void onError(in CryptoError error);
oneway void onActivityRequired(in Intent intent);
}

4
OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl → OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.android.crypto;
package org.openintents.crypto;
import com.android.crypto.ICryptoCallback;
import org.openintents.crypto.ICryptoCallback;
/**
* All methods are oneway, which means they are asynchronous and non-blocking.

12
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
View File

@ -20,6 +20,9 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import org.openintents.crypto.CryptoError;
import org.openintents.crypto.CryptoSignatureResult;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.Id;
import org.sufficientlysecure.keychain.helper.PgpMain;
@ -29,10 +32,8 @@ import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
import com.android.crypto.CryptoError;
import com.android.crypto.ICryptoCallback;
import com.android.crypto.ICryptoService;
import com.android.crypto.CryptoSignatureResult;
import org.openintents.crypto.ICryptoCallback;
import org.openintents.crypto.ICryptoService;
import android.app.Service;
import android.content.Context;
@ -89,7 +90,8 @@ public class CryptoService extends Service {
// passphrase!
Intent intent = new Intent(CryptoActivity.ACTION_CACHE_PASSPHRASE);
intent.putExtra(CryptoActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
callback.onActivityRequired(intent);
// TODO: start activity bind to service from activity send back intent on success
// callback.onActivityRequired(intent);
return;
}