Merge pull request #29 from virresh/video-chat

Video chat
virresh · Nov 2, 2019 · 01e6b56 · 01e6b56
2 parents 4b0acfa + 8ea370a
commit 01e6b56
Show file tree

Hide file tree

Showing 30 changed files with 2,285 additions and 120 deletions.
diff --git a/README b/README
@@ -5,3 +5,15 @@ Your learning partner
 Mobile Computing Monsoon 2019 Project
 
 Private Project Folder: https://drive.google.com/drive/folders/1mEZhpN2rTYC5lfGL4ILTdAv0MHTjCtTb?usp=sharing
+
+Set-up docker
+sudo apt-get install docker.io
+
+Navigate to the folder openvidu_extras
+Run script.sh with ./script.sh
+
+This will setup a server on your machine.
+In the strings.xml file, replace the IP Address with your machine's IP Address.
+For example,    <string name="default_openvidu_url">https://192.168.0.8:4443/</string> 192.168.0.8 is my system's IP Address.
+
+Build the app and run it.
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,6 +23,10 @@ android {
     }
 
     def isRunningOnTravis = System.getenv("CI") == "true"
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
 
     if (isRunningOnTravis) {
         // configure keystore
@@ -55,6 +59,10 @@ dependencies {
     implementation 'com.github.f0ris.sweetalert:library:1.5.6'
     implementation 'com.code-troopers.betterpickers:library:3.1.0'
     implementation 'com.firebaseui:firebase-ui-database:0.4.0'
-
+    implementation 'com.jakewharton:butterknife:10.2.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.2.0'
+    implementation 'com.neovisionaries:nv-websocket-client:2.9'
+    implementation 'org.webrtc:google-webrtc:1.0.28513'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
 
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
         <activity android:name=".Activities.MenteeMeetings"/>
         <activity android:name=".Activities.SignInActivity" />
         <activity android:name=".Activities.OnboardingActivity" />
+        <activity android:name=".Activities.SessionActivity"/>
         <activity android:name=".Activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -29,4 +30,9 @@
         </activity>
     </application>
 
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/app/src/main/java/com/mobilecomputing/sahayak/Activities/MentorOptionsActivity.java b/app/src/main/java/com/mobilecomputing/sahayak/Activities/MentorOptionsActivity.java
@@ -199,10 +199,10 @@ public void onClick(View view) {
                 {
                     Toast.makeText(getApplicationContext(), "Please fill all fields", Toast.LENGTH_LONG).show();
                 }
-                else if(startCalendar.compareTo(hourLaterCalendar) < 0)
-                {
-                    Toast.makeText(getApplicationContext(), "Start time must be at least one hour from now", Toast.LENGTH_LONG).show();
-                }
+//                else if(startCalendar.compareTo(hourLaterCalendar) < 0)
+//                {
+//                    Toast.makeText(getApplicationContext(), "Start time must be at least one hour from now", Toast.LENGTH_LONG).show();
+//                }
                 else
                 {
                     Proposal proposal = new Proposal(category, skill, startDate, duration, durationCap);