Merge branch 'master' of github.com:novoda/simplechromecustomtabs

README.md

@@ -41,14 +41,14 @@ dependencies {
 1) Initialize `SimpleChromeCustomTabs`, you only have to this once.
 
 ```java
-SimpleChromeCustomTabs.initialize(context)
+SimpleChromeCustomTabs.initialize(context);
 ```
 
 2) Connect `SimpleChromeCustomTabs` to your `Activity` as soon as it is resumed.
 
 ```java
 public void onResume() {
-    super.onResume()
+    super.onResume();
     SimpleChromeCustomTabs.getInstance().connectTo(this);
 }
 ```

library/src/main/java/com/novoda/simplechromecustomtabs/SimpleChromeCustomTabs.java

@@ -98,7 +98,9 @@ public void navigateTo(Uri url, Activity activityContext) {
      */
     @Override
     public void connectTo(@NonNull Activity activity) {
-        connection.connectTo(activity);
+        if (isDisconnected()) {
+            connection.connectTo(activity);
+        }
     }
 
     @Override
@@ -120,7 +122,14 @@ public CustomTabsSession newSession() {
 
     @Override
     public void disconnectFrom(@NonNull Activity activity) {
-        connection.disconnectFrom(activity);
+        if (isConnected()) {
+            connection.disconnectFrom(activity);
+        }
+    }
+
+    @Override
+    public boolean isDisconnected() {
+        return !isConnected();
     }
 
     /**

library/src/main/java/com/novoda/simplechromecustomtabs/connection/Binder.java

@@ -1,10 +1,11 @@
 package com.novoda.simplechromecustomtabs.connection;
 
-import android.app.Activity;
 import android.content.ComponentName;
+import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.customtabs.CustomTabsClient;
 import android.support.customtabs.CustomTabsServiceConnection;
+import android.util.Log;
 
 import com.novoda.simplechromecustomtabs.SimpleChromeCustomTabs;
 import com.novoda.simplechromecustomtabs.provider.AvailableAppProvider;
@@ -24,7 +25,7 @@ public static Binder newInstance() {
         return new Binder(availableAppProvider);
     }
 
-    public void bindCustomTabsServiceTo(@NonNull final Activity activity, ServiceConnectionCallback callback) {
+    public void bindCustomTabsServiceTo(@NonNull final Context context, ServiceConnectionCallback callback) {
         if (isConnected()) {
             return;
         }
@@ -34,7 +35,7 @@ public void bindCustomTabsServiceTo(@NonNull final Activity activity, ServiceCon
                 new SimpleChromeCustomTabsAvailableAppProvider.PackageFoundCallback() {
                     @Override
                     public void onPackageFound(String packageName) {
-                        CustomTabsClient.bindCustomTabsService(activity, packageName, serviceConnection);
+                        CustomTabsClient.bindCustomTabsService(context, packageName, serviceConnection);
                     }
 
                     @Override
@@ -49,14 +50,19 @@ private boolean isConnected() {
         return serviceConnection != null;
     }
 
-    public void unbindCustomTabsService(@NonNull Activity activity) {
+    public void unbindCustomTabsService(@NonNull Context context) {
         if (isDisconnected()) {
             return;
         }
 
-        activity.unbindService(serviceConnection);
-        serviceConnection.onServiceDisconnected(null);
-        serviceConnection = null;
+        try {
+            context.unbindService(serviceConnection);
+        } catch (IllegalArgumentException iae) {
+            Log.e("SimpleChromeCustomTabs", "There was a problem unbinding from a CustomTabs service. :/", iae);
+        } finally {
+            serviceConnection.onServiceDisconnected(null);
+            serviceConnection = null;
+        }
     }
 
     private boolean isDisconnected() {

library/src/main/java/com/novoda/simplechromecustomtabs/connection/Connection.java

@@ -14,4 +14,6 @@ public interface Connection {
 
     void disconnectFrom(@NonNull Activity activity);
 
+    boolean isDisconnected();
+
 }

library/src/main/java/com/novoda/simplechromecustomtabs/connection/SimpleChromeCustomTabsConnection.java

@@ -31,7 +31,7 @@ public static SimpleChromeCustomTabsConnection newInstance() {
 
     @Override
     public void connectTo(@NonNull Activity activity) {
-        binder.bindCustomTabsServiceTo(activity, this);
+        binder.bindCustomTabsServiceTo(activity.getApplicationContext(), this);
     }
 
     @Override
@@ -64,7 +64,12 @@ private boolean hasConnectedClient() {
 
     @Override
     public void disconnectFrom(@NonNull Activity activity) {
-        binder.unbindCustomTabsService(activity);
+        binder.unbindCustomTabsService(activity.getApplicationContext());
+    }
+
+    @Override
+    public boolean isDisconnected() {
+        return !isConnected();
     }
 
     @Override

library/src/main/java/com/novoda/simplechromecustomtabs/navigation/SimpleChromeCustomTabsIntentBuilder.java

@@ -74,7 +74,7 @@ public SimpleChromeCustomTabsIntentBuilder showingTitle() {
      * TODO Allow intent creation without connection. Might be useful to re-customise a current session.
      */
     public CustomTabsIntent createIntent() {
-        if (!connection.isConnected()) {
+        if (connection.isDisconnected()) {
             throw new DeveloperError("An active connection to custom tabs service is required for intent creation");
         }
 

library/src/test/java/com/novoda/simplechromecustomtabs/connection/SimpleChromeCustomTabsConnectionTest.java

@@ -5,6 +5,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.robolectric.Robolectric;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
@@ -25,21 +26,23 @@ public class SimpleChromeCustomTabsConnectionTest {
     public void setUp() {
         initMocks(this);
 
+        when(mockActivity.getApplicationContext()).thenReturn(Robolectric.application);
+
         simpleChromeCustomTabsConnection = new SimpleChromeCustomTabsConnection(mockBinder);
     }
 
     @Test
-    public void connectToBindsActivityToService() {
+    public void connectToBindsApplicationContextToService() {
         simpleChromeCustomTabsConnection.connectTo(mockActivity);
 
-        verify(mockBinder).bindCustomTabsServiceTo(mockActivity, simpleChromeCustomTabsConnection);
+        verify(mockBinder).bindCustomTabsServiceTo(mockActivity.getApplicationContext(), simpleChromeCustomTabsConnection);
     }
 
     @Test
-    public void disconnectFromUnbindsActivityFromService() {
+    public void disconnectFromUnbindsApplicationContextFromService() {
         simpleChromeCustomTabsConnection.disconnectFrom(mockActivity);
 
-        verify(mockBinder).unbindCustomTabsService(mockActivity);
+        verify(mockBinder).unbindCustomTabsService(mockActivity.getApplicationContext());
     }
 
     @Test

library/src/test/java/com/novoda/simplechromecustomtabs/navigation/SimpleChromeCustomTabsIntentBuilderTest.java

@@ -126,7 +126,7 @@ public void showingTitleAddsShowingTitleComposer() {
     }
 
     private void givenIsDisconnected() {
-        when(mockSimpleChromeCustomTabsConnection.isConnected()).thenReturn(false);
+        when(mockSimpleChromeCustomTabsConnection.isDisconnected()).thenReturn(true);
     }
 
     private void givenIsConnected() {