Skip to content
This repository was archived by the owner on Jan 18, 2023. It is now read-only.

#112 Added check to ensure we don't unsubscribe when disconnected #114

Open
wolfenrain wants to merge 2 commits into
base: main
Choose a base branch
from
Open

#112 Added check to ensure we don't unsubscribe when disconnected #114

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf3b316
#112 Added isDisconnecting check
Jul 11, 2018
3713c12
#112 Added forgotten remove
Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/android/OpenTokAndroidPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public class OpenTokAndroidPlugin extends CordovaPlugin
public static final String TAG = "OTPlugin";
public boolean sessionConnected;
public boolean publishCalled; // we need this because creating publisher before sessionConnected = crash
public boolean isDisconnecting;
public RunnablePublisher myPublisher;
public HashMap<String, CallbackContext> myEventListeners;
public HashMap<String, Connection> connectionCollection;
Expand Down Expand Up @@ -366,7 +367,7 @@ public void setPropertyFromArray(JSONArray args) {
public void removeStreamView() {
ViewGroup parent = (ViewGroup) webView.getView().getParent();
parent.removeView(this.mView);
if(mSubscriber != null) {
if(mSubscriber != null && !isDisconnecting) {
try {
mSession.unsubscribe(mSubscriber);
mSubscriber.destroy();
Expand Down Expand Up @@ -578,9 +579,11 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
Log.i(TAG, "adding new event - " + args.getString(0));
myEventListeners.put(args.getString(0), callbackContext);
} else if (action.equals("connect")) {
isDisconnecting = false;
Log.i(TAG, "connect command called");
mSession.connect(args.getString(0));
} else if (action.equals("disconnect")) {
isDisconnecting = true;
mSession.disconnect();
} else if (action.equals("publish")) {
if (sessionConnected) {
Expand Down Expand Up @@ -612,6 +615,7 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
final RunnableSubscriber runsub = subscriberCollection.get( args.getString(0) );
if (runsub != null) {
runsub.removeStreamView();
subscriberCollection.remove(args.getString(0));
callbackContext.success();
return true;
}
Expand Down
⚡