Merge pull request #7 from hapi-robo/devel

Adds Media Functions to Android app

.gitignore

@@ -1,5 +1,6 @@
-*.cert
+*.env
 *.key
+*.cert
 *.apk
 webapp/node_modules/
 *venv/
@@ -12,3 +13,4 @@ android/build
 android/captures
 android/.externalNativeBuild
 android/.cxx
+webapp/ssl/

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "mosquitto"]
 	path = mosquitto
 	url = https://github.com/eclipse/mosquitto.git
+[submodule "connect_webapp"]
+	path = connect_webapp
+	url = https://github.com/ray-hrst/connect_webapp.git

README.md

@@ -1,4 +1,4 @@
-# jitsi-temi
+# Connect
 A free and open-source alternative to [temi](https://www.robotemi.com/)'s default video-conferencing application.
 
 This is still a prototype. This project uses MQTT for message transport between the client's web-brower user-interface and robot. It uses [Jitsi-Meet](https://jitsi.org/), a free open-source WebRTC framework, for video conferencing.
@@ -11,7 +11,7 @@ The project consists of 3 components:
 
 ## Folder Structure
 ```
-jitsi-temi              Root directory
+connect                 Root directory
 ├─ android              Android application to be installed on temi
 ├─ config               MQTT broker configuration files
 ├─ mosquitto            MQTT broker

android/.gitignore

@@ -12,3 +12,4 @@
 /captures
 .externalNativeBuild
 .cxx
+secrets.properties

android/app/build.gradle

@@ -1,5 +1,9 @@
 apply plugin: 'com.android.application'
 
+def secretsPropertiesFile = rootProject.file("secrets.properties")
+def secretsProperties = new Properties()
+secretsProperties.load(new FileInputStream(secretsPropertiesFile))
+
 android {
     compileSdkVersion 29
     defaultConfig {
@@ -9,6 +13,13 @@ android {
         versionCode 1
         versionName "0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        // secrets
+        // @TODO: Doing this because it's easier for developer. Consider using Android Keystore API
+        // Ref: https://github.com/codepath/android_guides/wiki/Storing-Secret-Keys-in-Android
+        buildConfigField("String", "MQTT_HOSTNAME", secretsProperties['MQTT_HOSTNAME'])
+        buildConfigField("String", "MQTT_USERNAME", secretsProperties['MQTT_USERNAME'])
+        buildConfigField("String", "MQTT_PASSWORD", secretsProperties['MQTT_PASSWORD'])
     }
     signingConfigs {
         debug {
@@ -46,9 +57,8 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     // Jitsi Meet
-    // https://github.com/jitsi/jitsi-meet
     // https://github.com/jitsi/jitsi-maven-repository/tree/master/releases/org/jitsi/react/jitsi-meet-sdk
-    implementation ('org.jitsi.react:jitsi-meet-sdk:2.7.0') { transitive = true }
+    implementation('org.jitsi.react:jitsi-meet-sdk:2.+') { transitive = true }
 
     // paho-mqtt
     // https://github.com/eclipse/paho.mqtt.java
@@ -58,5 +68,5 @@ dependencies {
 
     // temi
     // https://github.com/robotemi/sdk
-    implementation 'com.robotemi:sdk:0.10.55'
+    implementation 'com.robotemi:sdk:0.10.+'
 }

android/app/src/main/AndroidManifest.xml

@@ -9,26 +9,22 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/SkillTheme">
+        <activity android:name=".WebviewActivity"></activity>
+        <activity android:name=".VideoActivity" />
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
-
-        <!-- MQTT service -->
-        <service
-            android:name="org.eclipse.paho.android.service.MqttService" />
-
-        <!-- temi Meta Data -->
+        </activity> <!-- MQTT service -->
+        <service android:name="org.eclipse.paho.android.service.MqttService" /> <!-- temi Meta Data -->
         <meta-data
             android:name="com.robotemi.sdk.metadata.SKILL"
-            android:value="@string/app_name"/>
-
+            android:value="@string/app_name" />
         <meta-data
             android:name="com.robotemi.sdk.metadata.KIOSK"
-            android:value="TRUE"/>
+            android:value="TRUE" />
     </application>
 
 </manifest>