remove subscribe to self (opentok#165)

Author: Manik Sachdeva

Custom-Audio-Driver/app/src/main/java/com/tokbox/android/tutorials/custom_audio_driver/MainActivity.java

@@ -172,9 +172,6 @@ public void onError(Session session, OpentokError opentokError) {
     public void onStreamReceived(Session session, Stream stream) {
         Log.d(TAG, "onStreamReceived: New stream " + stream.getStreamId() + " in session " + session.getSessionId());
 
-        if (OpenTokConfig.SUBSCRIBE_TO_SELF) {
-            return;
-        }
         if (mSubscriber != null) {
             return;
         }
@@ -186,9 +183,6 @@ public void onStreamReceived(Session session, Stream stream) {
     public void onStreamDropped(Session session, Stream stream) {
         Log.d(TAG, "onStreamDropped: Stream " + stream.getStreamId() + " dropped from session " + session.getSessionId());
 
-        if (OpenTokConfig.SUBSCRIBE_TO_SELF) {
-            return;
-        }
         if (mSubscriber == null) {
             return;
         }
@@ -203,11 +197,6 @@ public void onStreamDropped(Session session, Stream stream) {
     @Override
     public void onStreamCreated(PublisherKit publisherKit, Stream stream) {
         Log.d(TAG, "onStreamCreated: Own stream " + stream.getStreamId() + " created");
-        if (!OpenTokConfig.SUBSCRIBE_TO_SELF) {
-            return;
-        }
-
-        subscribeToStream(stream);
     }
 
     @Override

Custom-Audio-Driver/app/src/main/java/com/tokbox/android/tutorials/custom_audio_driver/OpenTokConfig.java

@@ -10,8 +10,4 @@ public class OpenTokConfig {
     public static final String SESSION_ID = "";
     // Replace with a generated token (from the dashboard or using an OpenTok server SDK)
     public static final String TOKEN = "";
-
-    // Subscribe to a stream published by this client. Set to false to subscribe
-    // to other clients' streams only.
-    public static final boolean SUBSCRIBE_TO_SELF = true;
 }

Custom-Video-Driver/app/src/main/java/com/tokbox/android/tutorials/custom_video_driver/MainActivity.java

@@ -170,9 +170,6 @@ public void onError(Session session, OpentokError opentokError) {
     public void onStreamReceived(Session session, Stream stream) {
         Log.d(TAG, "onStreamReceived: New stream " + stream.getStreamId() + " in session " + session.getSessionId());
 
-        if (OpenTokConfig.SUBSCRIBE_TO_SELF) {
-            return;
-        }
         if (mSubscriber != null) {
             return;
         }
@@ -184,9 +181,6 @@ public void onStreamReceived(Session session, Stream stream) {
     public void onStreamDropped(Session session, Stream stream) {
         Log.d(TAG, "onStreamDropped: Stream " + stream.getStreamId() + " dropped from session " + session.getSessionId());
 
-        if (OpenTokConfig.SUBSCRIBE_TO_SELF) {
-            return;
-        }
         if (mSubscriber == null) {
             return;
         }
@@ -201,12 +195,6 @@ public void onStreamDropped(Session session, Stream stream) {
     @Override
     public void onStreamCreated(PublisherKit publisherKit, Stream stream) {
         Log.d(TAG, "onStreamCreated: Own stream " + stream.getStreamId() + " created");
-
-        if (!OpenTokConfig.SUBSCRIBE_TO_SELF) {
-            return;
-        }
-
-        subscribeToStream(stream);
     }
 
     @Override

Custom-Video-Driver/app/src/main/java/com/tokbox/android/tutorials/custom_video_driver/OpenTokConfig.java

@@ -10,8 +10,4 @@ public class OpenTokConfig {
     public static final String SESSION_ID = "";
     // Replace with a generated token (from the dashboard or using an OpenTok server SDK)
     public static final String TOKEN = "";
-
-    // Subscribe to a stream published by this client. Set to false to subscribe
-    // to other clients' streams only.
-    public static final boolean SUBSCRIBE_TO_SELF = false;
 }

Live-Photo-Capture/app/src/main/java/com/tokbox/android/tutorials/live_photo_capture/MainActivity.java

@@ -188,9 +188,6 @@ public void onError(Session session, OpentokError opentokError) {
     public void onStreamReceived(Session session, Stream stream) {
         Log.d(TAG, "onStreamReceived: New stream " + stream.getStreamId() + " in session " + session.getSessionId());
 
-        if (OpenTokConfig.SUBSCRIBE_TO_SELF) {
-            return;
-        }
         if (mSubscriber != null) {
             return;
         }
@@ -202,9 +199,6 @@ public void onStreamReceived(Session session, Stream stream) {
     public void onStreamDropped(Session session, Stream stream) {
         Log.d(TAG, "onStreamDropped: Stream " + stream.getStreamId() + " dropped from session " + session.getSessionId());
 
-        if (OpenTokConfig.SUBSCRIBE_TO_SELF) {
-            return;
-        }
         if (mSubscriber == null) {
             return;
         }
@@ -219,12 +213,6 @@ public void onStreamDropped(Session session, Stream stream) {
     @Override
     public void onStreamCreated(PublisherKit publisherKit, Stream stream) {
         Log.d(TAG, "onStreamCreated: Own stream " + stream.getStreamId() + " created");
-
-        if (!OpenTokConfig.SUBSCRIBE_TO_SELF) {
-            return;
-        }
-
-        subscribeToStream(stream);
     }
 
     @Override

Live-Photo-Capture/app/src/main/java/com/tokbox/android/tutorials/live_photo_capture/OpenTokConfig.java

@@ -10,8 +10,4 @@ public class OpenTokConfig {
     public static final String SESSION_ID = "";
     // Replace with a generated token (from the dashboard or using an OpenTok server SDK)
     public static final String TOKEN = "";
-
-    // Subscribe to a stream published by this client. Set to false to subscribe
-    // to other clients' streams only.
-    public static final boolean SUBSCRIBE_TO_SELF = true;
 }