diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-28 17:03:39 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-28 17:03:39 +0200 |
commit | 5b4c737cf5480c889643ef33ad8f8cf24da7b6ee (patch) | |
tree | 3b86322e52d2f6589a3cb0e33559f2b862ac79f9 /openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java | |
parent | a5240bebf4ca0bab13af25ccd8ae30ae413953c0 (diff) | |
parent | 820e183ca76d0f7feb5d7584d5eddcd49a4e7d57 (diff) | |
download | openpgp-api-5b4c737cf5480c889643ef33ad8f8cf24da7b6ee.tar.gz openpgp-api-5b4c737cf5480c889643ef33ad8f8cf24da7b6ee.tar.bz2 openpgp-api-5b4c737cf5480c889643ef33ad8f8cf24da7b6ee.zip |
Merge branch 'mgeier63-master'
Diffstat (limited to 'openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java')
-rw-r--r-- | openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java b/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java index bbc8645..3fee60d 100644 --- a/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java +++ b/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java @@ -22,20 +22,20 @@ import android.content.Intent; import android.content.ServiceConnection; import android.os.IBinder; -import org.openintents.openpgp.IOpenPgpService; +import org.openintents.openpgp.IOpenPgpService2; public class OpenPgpServiceConnection { // callback interface public interface OnBound { - public void onBound(IOpenPgpService service); + public void onBound(IOpenPgpService2 service); public void onError(Exception e); } private Context mApplicationContext; - private IOpenPgpService mService; + private IOpenPgpService2 mService; private String mProviderPackageName; private OnBound mOnBoundListener; @@ -66,7 +66,7 @@ public class OpenPgpServiceConnection { this.mOnBoundListener = onBoundListener; } - public IOpenPgpService getService() { + public IOpenPgpService2 getService() { return mService; } @@ -76,7 +76,7 @@ public class OpenPgpServiceConnection { private ServiceConnection mServiceConnection = new ServiceConnection() { public void onServiceConnected(ComponentName name, IBinder service) { - mService = IOpenPgpService.Stub.asInterface(service); + mService = IOpenPgpService2.Stub.asInterface(service); if (mOnBoundListener != null) { mOnBoundListener.onBound(mService); } @@ -96,7 +96,7 @@ public class OpenPgpServiceConnection { // if not already bound... if (mService == null) { try { - Intent serviceIntent = new Intent(OpenPgpApi.SERVICE_INTENT); + Intent serviceIntent = new Intent(OpenPgpApi.SERVICE_INTENT_2); // NOTE: setPackage is very important to restrict the intent to this provider only! serviceIntent.setPackage(mProviderPackageName); boolean connect = mApplicationContext.bindService(serviceIntent, mServiceConnection, |