Some codes for hello WebRTC tutorial.

Author: XDongger

client/android-webcam/sand-client-android-webcam/src/main/java/com/thefirstlineofcode/sand/client/android/webcam/WebcamWatcher.java

@@ -84,21 +84,20 @@ public WebcamWatcher(IChatServices chatServices, Context appContext,
 
 	@Override
 	public void watch() {
-		super.watch();
+		if (status == Status.WATCHING)
+			return;
 
-		if (eglBase == null)
+		if (eglBase == null) {
 			eglBase = EglBase.create();
-		
-		videoRenderer.init(eglBase.getEglBaseContext(), null);
+			videoRenderer.init(eglBase.getEglBaseContext(), null);
+		}
 
 		if (peerConnection == null)
 			createPeerConnection();
 
 		addListener(this);
 
-		if (!isOpened()) {
-			processSignal(Signal.ID.OPEN);
-		}
+		super.watch();
 	}
 
 	@Override

client/webcam/src/main/java/com/thefirstlineofcode/sand/client/webcam/Webcam.java

@@ -64,9 +64,10 @@ public void start() {
 
 		logger.info("Try to connect to WebRTC native service.");
 		nativeClient.connect();
-		
-		started = true;
 		logger.info("Webcam has connected to WebRTC native service.");
+		
+		started = true;		
+		logger.info("Webcam has started.");
 	}
 
 	@Override
@@ -86,6 +87,8 @@ public void stop() {
 
 		opened = false;
 		started = false;
+		
+		logger.info("Webcam has stopped.");
 	}
 
 	@Override
@@ -179,8 +182,12 @@ public void iceCandidateFound(String jsonCandidate) {
 	}
 
 	protected void askToOpen(JabberId asker) {
-		if (requestedCapability == null)
+		if (requestedCapability == null) {
+			if (logger.isErrorEnabled())
+				logger.error("Null requested capability.");
+			
 			throw new IllegalArgumentException("Null requested capability.");
+		}
 
 		if (peer != null && !peer.equals(asker)) {
 			Iq closed = new Iq(Iq.Type.SET);

demo/app-android/app/src/main/java/com/thefirstlineofcode/sand/demo/app/android/LiveStreamingActivity.java

@@ -1,7 +1,6 @@
 package com.thefirstlineofcode.sand.demo.app.android;
 
 import android.Manifest;
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -16,8 +15,11 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.webrtc.PeerConnection;
 import org.webrtc.SurfaceViewRenderer;
 
+import java.util.List;
+
 public class LiveStreamingActivity extends AppCompatActivity {
 	private static final Logger logger = LoggerFactory.getLogger(LiveStreamingActivity.class);
 
@@ -51,8 +53,8 @@ private void onCreate() {
 
 		SurfaceViewRenderer videoRenderer = findViewById(R.id.video_renderer);
 		watcher = ChatClientSingleton.get(this).createApiImpl(WebcamWatcher.class,
-				new Class<?>[] {Context.class, JabberId.class, SurfaceViewRenderer.class},
-				new Object[] {this.getApplicationContext(), cameraJid, videoRenderer});
+				new Class<?>[] {Context.class, JabberId.class, List.class, SurfaceViewRenderer.class},
+				new Object[] {this.getApplicationContext(), cameraJid, MainApplication.ICE_SERVERS, videoRenderer});
 		watcher.watch();
 	}
 

demo/app-android/app/src/main/java/com/thefirstlineofcode/sand/demo/app/android/ThingsAdapter.java

@@ -158,6 +158,10 @@ private String[] getAuthorizedThingActions(String model) {
 			return new String[] {"Flash", "Turn On", "Turn Off", "Stop", "Shutdown System"};
 		} else if ("HAT".equals(model)) {
 			return new String[] {"Flash", "Turn On", "Turn Off"};
+		} else if ("HWT".equals(model)) {
+			return new String[] {
+					"Open Live Streaming"
+			};
 		} else {
 			throw new RuntimeException(String.format("Unknown thing model: %s.", model));
 		}

demo/server/src/main/java/com/thefirstlineofcode/sand/demo/server/AclPipelinePreprocessor.java

@@ -124,11 +124,11 @@ private Object afterParsingSignal(JabberId from, Iq iq) {
 	}
 
 	private boolean isUser(JabberId to) {
-		return accountManager.exists(to.getBareIdString());
+		return accountManager.exists(to.getNode());
 	}
 
 	private boolean isThing(JabberId from) {
-		return thingManager.thingIdExists(from.getBareIdString());
+		return thingManager.thingNameExists(from.getNode());
 	}
 
 	private Object afterParsingExecution(JabberId from, Iq iq) {
@@ -139,9 +139,9 @@ private Object afterParsingExecution(JabberId from, Iq iq) {
 		String thingId = getThingId(iq.getTo());
 
 		Execution execution = iq.getObject();
-		if (isTacpAction(execution.getAction())) {
+		if (isTuxpAction(execution.getAction())) {
 			if (!isOwner(sender, thingId))
-				throw new ProtocolException(new NotAuthorized("TACP actions can be sent by owner only."));
+				throw new ProtocolException(new NotAuthorized("TUXP actions can be sent by owner only."));
 
 			return iq;
 		}
@@ -152,7 +152,7 @@ private Object afterParsingExecution(JabberId from, Iq iq) {
 		return iq;
 	}
 
-	private boolean isTacpAction(Object action) {
+	private boolean isTuxpAction(Object action) {
 		ProtocolObject pObject = action.getClass().getAnnotation(ProtocolObject.class);
 		if (pObject == null)
 			throw new ProtocolException(new InternalServerError("The action isn't a project object."));

demo/server/src/main/resources/plugin.properties

@@ -1,5 +1,5 @@
 plugin.id=sand-demo-server
 plugin.provider=TheFirstLineOfCode
 plugin.version=1.0.0-BETA3
-plugin.dependencies=sand-server-ibtr,sand-server-notification,sand-server-concentrator,sand-server-location,sand-server-sensor
-non-plugin.dependencies=sand-protocols-actuator,basalt-xeps-ping,sand-demo-protocol,sand-emulators-models,sand-protocols-edge,sand-protocols-lora-dac,sand-protocols-lora-gateway,sand-protocols-things-simple-light,sand-protocols-things-simple-camera,sand-protocols-things-simple-temperature-reporter,sand-protocols-webrtc-signaling,sand-protocols-operator
+plugin.dependencies=sand-server-ibtr,sand-server-notification,sand-server-concentrator,sand-server-location,sand-server-sensor,sand-server-p2p-webcam
+non-plugin.dependencies=sand-protocols-actuator,basalt-xeps-ping,sand-demo-protocol,sand-emulators-models,sand-protocols-edge,sand-protocols-lora-dac,sand-protocols-lora-gateway,sand-protocols-things-simple-light,sand-protocols-things-simple-camera,sand-protocols-things-simple-temperature-reporter,sand-protocols-operator