build gradle

Signed-off-by: ale <ale@manalejandro.com>

SETUP.md

@@ -155,6 +155,9 @@ npm start
 # Build debug APK
 ./gradlew assembleDebug
 
+# Build using Docker (recommended for consistent environment)
+docker run -ti --rm --name gradle -v $PWD:/android-app --workdir /android-app androidsdk/android-31 ./gradlew build
+
 # Install on connected device
 adb install app/build/outputs/apk/debug/app-debug.apk
 

android-app/.gitignore

@@ -0,0 +1,2 @@
+.gradle
+app/build

android-app/app/build.gradle

@@ -4,12 +4,12 @@ plugins {
 
 android {
     namespace 'com.chatrtc.app'
-    compileSdk 34
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.chatrtc.app"
         minSdk 24
-        targetSdk 34
+        targetSdk 33
         versionCode 1
         versionName "1.0"
 
@@ -30,16 +30,30 @@ android {
     buildFeatures {
         viewBinding true
     }
+    
+    lintOptions {
+        abortOnError false
+        checkReleaseBuilds false
+        disable 'MissingClass'
+    }
+}
+
+configurations.all {
+    resolutionStrategy {
+        force 'org.jetbrains.kotlin:kotlin-stdlib:1.8.20'
+        force 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20'
+        force 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20'
+    }
 }
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.recyclerview:recyclerview:1.3.1'
     
-    // WebRTC
+    // WebRTC - Using JitPack hosted Google WebRTC
-    implementation 'org.webrtc:google-webrtc:1.0.32006'
+    implementation 'com.github.webrtc-sdk:android:104.5112.01'
     
     // Socket.IO for signaling
     implementation 'io.socket:socket.io-client:2.0.1'
@@ -47,13 +61,14 @@ dependencies {
     // JSON parsing
     implementation 'com.google.code.gson:gson:2.10.1'
     
-    // Permissions
+    // Permissions - using older versions compatible with Java 11
-    implementation 'androidx.activity:activity:1.7.2'
+    implementation 'androidx.activity:activity:1.6.1'
-    implementation 'androidx.fragment:fragment:1.6.1'
+    implementation 'androidx.fragment:fragment:1.5.5'
     
-    // Emoji support
+    // Basic emoji support
-    implementation 'com.vanniktech:emoji-java:0.16.0'
+    implementation 'androidx.emoji2:emoji2:1.3.0'
-    implementation 'com.vanniktech:emoji-google:0.16.0'
+    implementation 'androidx.emoji2:emoji2-views-helper:1.3.0'
+    implementation 'androidx.emoji2:emoji2-bundled:1.3.0'
     
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

android-app/app/src/main/java/com/chatrtc/app/ChatActivity.java

@@ -3,7 +3,6 @@ package com.chatrtc.app;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
@@ -16,9 +15,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.chatrtc.app.adapter.ChatAdapter;
 import com.chatrtc.app.model.ChatMessage;
 import com.chatrtc.app.webrtc.WebRTCManager;
-import com.vanniktech.emoji.EmojiManager;
+
-import com.vanniktech.emoji.EmojiPopup;
+import androidx.emoji2.text.EmojiCompat;
-import com.vanniktech.emoji.google.GoogleEmojiProvider;
+import androidx.emoji2.bundled.BundledEmojiCompatConfig;
 
 import org.webrtc.SurfaceViewRenderer;
 
@@ -44,17 +43,18 @@ public class ChatActivity extends AppCompatActivity implements WebRTCManager.Web
     private List<ChatMessage> chatMessages;
     private String nickname;
     private WebRTCManager webRTCManager;
-    private EmojiPopup emojiPopup;
     
     private boolean isVideoEnabled = true;
     private boolean isAudioEnabled = true;
+    private boolean isConnected = false;
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
-        // Initialize emoji support
+        // Initialize emoji support using androidx
-        EmojiManager.install(new GoogleEmojiProvider());
+        EmojiCompat.Config config = new BundledEmojiCompatConfig(this);
+        EmojiCompat.init(config);
         
         setContentView(R.layout.activity_chat);
         
@@ -68,14 +68,11 @@ public class ChatActivity extends AppCompatActivity implements WebRTCManager.Web
         initViews();
         setupRecyclerView();
         setupClickListeners();
-        setupEmojiPopup();
         
-        // Initialize WebRTC
+        // Initialize WebRTC for both messaging and video calling
         webRTCManager = new WebRTCManager(this, this);
         webRTCManager.initializeWebRTC(localVideoView, remoteVideoView);
         webRTCManager.connectToSignalingServer();
-        
-        // Join chat room
         webRTCManager.joinRoom(nickname);
         
         // Add welcome message
@@ -106,25 +103,16 @@ public class ChatActivity extends AppCompatActivity implements WebRTCManager.Web
     private void setupClickListeners() {
         btnSend.setOnClickListener(v -> sendMessage());
         
-        btnToggleVideo.setOnClickListener(v -> toggleVideo());
+        // Simple emoji button - adds a smiley face
-        
+        btnEmoji.setOnClickListener(v -> {
-        btnToggleAudio.setOnClickListener(v -> toggleAudio());
+            String currentText = etMessage.getText().toString();
-        
+            etMessage.setText(currentText + "😊");
-        btnSwitchCamera.setOnClickListener(v -> webRTCManager.switchCamera());
+            etMessage.setSelection(etMessage.getText().length());
-        
-        etMessage.setOnEditorActionListener((v, actionId, event) -> {
-            sendMessage();
-            return true;
         });
-    }
         
-    private void setupEmojiPopup() {
+        btnToggleVideo.setOnClickListener(v -> toggleVideo());
-        emojiPopup = EmojiPopup.Builder.fromRootView(findViewById(android.R.id.content))
+        btnToggleAudio.setOnClickListener(v -> toggleAudio());
-                .setOnEmojiPopupShownListener(() -> btnEmoji.setImageResource(R.drawable.ic_keyboard))
+        btnSwitchCamera.setOnClickListener(v -> switchCamera());
-                .setOnEmojiPopupDismissListener(() -> btnEmoji.setImageResource(R.drawable.ic_emoji))
-                .build(etMessage);
-        
-        btnEmoji.setOnClickListener(v -> emojiPopup.toggle());
     }
     
     private void sendMessage() {
@@ -133,11 +121,23 @@ public class ChatActivity extends AppCompatActivity implements WebRTCManager.Web
             return;
         }
         
+        if (!isConnected) {
+            Toast.makeText(this, "Not connected to chat server", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        
         ChatMessage chatMessage = new ChatMessage(nickname, message, new Date(), true);
         addMessage(chatMessage);
         
-        // Send message through WebRTC data channel
+        // Send message through WebRTC DataChannel
+        try {
+            if (webRTCManager != null) {
                 webRTCManager.sendMessage(message);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Error sending message", e);
+            Toast.makeText(this, "Failed to send message", Toast.LENGTH_SHORT).show();
+        }
         
         etMessage.setText("");
     }
@@ -156,7 +156,9 @@ public class ChatActivity extends AppCompatActivity implements WebRTCManager.Web
     
     private void toggleVideo() {
         isVideoEnabled = !isVideoEnabled;
+        if (webRTCManager != null) {
             webRTCManager.toggleVideo(isVideoEnabled);
+        }
         btnToggleVideo.setText(isVideoEnabled ? "Video Off" : "Video On");
         btnToggleVideo.setBackgroundColor(getResources().getColor(
                 isVideoEnabled ? R.color.button_enabled : R.color.button_disabled));
@@ -164,13 +166,31 @@ public class ChatActivity extends AppCompatActivity implements WebRTCManager.Web
     
     private void toggleAudio() {
         isAudioEnabled = !isAudioEnabled;
+        if (webRTCManager != null) {
             webRTCManager.toggleAudio(isAudioEnabled);
+        }
         btnToggleAudio.setText(isAudioEnabled ? "Mute" : "Unmute");
         btnToggleAudio.setBackgroundColor(getResources().getColor(
                 isAudioEnabled ? R.color.button_enabled : R.color.button_disabled));
     }
     
-    // WebRTCListener implementation
+    private void switchCamera() {
+        if (webRTCManager != null) {
+            webRTCManager.switchCamera();
+        }
+    }
+    
+    private void updateConnectionStatus() {
+        // Update UI to show connection status
+        String title = "Chat - " + nickname + (isConnected ? " (Connected)" : " (Disconnected)");
+        setTitle(title);
+        
+        // Enable/disable send button based on connection
+        btnSend.setEnabled(isConnected);
+        etMessage.setEnabled(isConnected);
+    }
+    
+    // WebRTCManager.WebRTCListener implementation
     @Override
     public void onMessageReceived(String senderNickname, String message) {
         runOnUiThread(() -> {
@@ -191,18 +211,26 @@ public class ChatActivity extends AppCompatActivity implements WebRTCManager.Web
     
     @Override
     public void onConnected() {
-        runOnUiThread(() -> addSystemMessage("Connected to chat"));
+        runOnUiThread(() -> {
+            isConnected = true;
+            addSystemMessage("Connected to chat");
+            updateConnectionStatus();
+        });
     }
     
     @Override
     public void onDisconnected() {
-        runOnUiThread(() -> addSystemMessage("Disconnected from chat"));
+        runOnUiThread(() -> {
+            isConnected = false;
+            addSystemMessage("Disconnected from chat");
+            updateConnectionStatus();
+        });
     }
     
     @Override
     public void onError(String error) {
         runOnUiThread(() -> {
-            Log.e(TAG, "WebRTC Error: " + error);
+            Log.e(TAG, "Network Error: " + error);
             Toast.makeText(this, "Error: " + error, Toast.LENGTH_LONG).show();
         });
     }
@@ -213,17 +241,10 @@ public class ChatActivity extends AppCompatActivity implements WebRTCManager.Web
         if (webRTCManager != null) {
             webRTCManager.cleanup();
         }
-        if (emojiPopup != null && emojiPopup.isShowing()) {
-            emojiPopup.dismiss();
-        }
     }
     
     @Override
     public void onBackPressed() {
-        if (emojiPopup != null && emojiPopup.isShowing()) {
-            emojiPopup.dismiss();
-        } else {
         super.onBackPressed();
     }
 }
-}

android-app/app/src/main/java/com/chatrtc/app/adapter/ChatAdapter.java

@@ -10,7 +10,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.chatrtc.app.R;
 import com.chatrtc.app.model.ChatMessage;
-import com.vanniktech.emoji.EmojiTextView;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
@@ -78,7 +77,7 @@ public class ChatAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     }
     
     class OwnMessageViewHolder extends RecyclerView.ViewHolder {
-        private EmojiTextView tvMessage;
+        private TextView tvMessage;
         private TextView tvTime;
         
         public OwnMessageViewHolder(@NonNull View itemView) {
@@ -95,7 +94,7 @@ public class ChatAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     
     class OtherMessageViewHolder extends RecyclerView.ViewHolder {
         private TextView tvNickname;
-        private EmojiTextView tvMessage;
+        private TextView tvMessage;
         private TextView tvTime;
         
         public OtherMessageViewHolder(@NonNull View itemView) {

android-app/app/src/main/java/com/chatrtc/app/webrtc/WebRTCManager.java

@@ -25,7 +25,6 @@ import org.webrtc.SessionDescription;
 import org.webrtc.SurfaceTextureHelper;
 import org.webrtc.SurfaceViewRenderer;
 import org.webrtc.VideoCapturer;
-import org.webrtc.VideoRenderer;
 import org.webrtc.VideoSource;
 import org.webrtc.VideoTrack;
 

android-app/app/src/main/res/layout/item_other_message.xml

@@ -23,7 +23,7 @@
             android:textStyle="bold"
             android:layout_marginBottom="2dp" />
 
-        <com.vanniktech.emoji.EmojiTextView
+        <TextView
             android:id="@+id/tv_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

android-app/app/src/main/res/layout/item_own_message.xml

@@ -14,7 +14,7 @@
         android:background="@drawable/own_message_background"
         android:padding="12dp">
 
-        <com.vanniktech.emoji.EmojiTextView
+        <TextView
             android:id="@+id/tv_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

android-app/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.0.2"
+        classpath "com.android.tools.build:gradle:7.0.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -16,6 +16,8 @@ allprojects {
         google()
         mavenCentral()
         maven { url 'https://jitpack.io' }
+        maven { url 'https://repo1.maven.org/maven2/' }
+        maven { url 'https://maven.google.com' }
     }
 }
 

android-app/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android-app/gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"