android-api: multiple PartnerSession.join() calls not allowed.

sneerteam · Sep 25, 2015 · f9c9b64 · f9c9b64
1 parent 1bfe4a1
commit f9c9b64
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/android/android-api/src/main/java/sneer/android/PartnerSession.java b/android/android-api/src/main/java/sneer/android/PartnerSession.java
@@ -27,7 +27,7 @@
 
 public class PartnerSession implements Closeable {
 
-	private boolean isBound;
+	private static boolean wasBound;
 
 	public static PartnerSession join(Activity activity, Listener listener) {
 		return new PartnerSession(activity, listener);
@@ -52,7 +52,7 @@ public interface Listener {
 
 	@Override
 	public void close() {
-		if (isBound) activity.unbindService(connection);
+		if (wasBound) activity.unbindService(connection);
 	}
 
 
@@ -88,14 +88,16 @@ private PartnerSession(Activity activity, Listener listener) {
 		this.activity = activity;
         this.listener = listener;
 
+        if (wasBound) finish("PartnerSession has already been joined.");
+
 	    Intent sneer = activity.getIntent().getParcelableExtra(IPCProtocol.JOIN_SESSION);
 	    if (sneer == null) {
 		    if (SneerInstallation.checkConversationContext(activity))
 			    finish(activity.getLocalClassName() + ": Make sure Sneer session metadata is correctly set in your AndroidManifest.xml file");
 		    return;
 	    }
-		isBound = activity.bindService(sneer, connection, BIND_AUTO_CREATE | BIND_IMPORTANT);
-		if (!isBound) finish("Unable to connect to Sneer");
+		wasBound = activity.bindService(sneer, connection, BIND_AUTO_CREATE | BIND_IMPORTANT);
+		if (!wasBound) finish("Unable to connect to Sneer");
     }
 
 
@@ -105,7 +107,7 @@ private void finish(String endingToast) {
 	}
 
 
-	public void handleMessageFromSneer(android.os.Message msg) {
+	void handleMessageFromSneer(android.os.Message msg) {
 		Bundle data = msg.getData();
 		data.setClassLoader(getClass().getClassLoader());
 		Object content = ((Envelope)data.getParcelable(ENVELOPE)).content;