From 611881e0024a10638aadd8c78555f4ba2800a697 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Mon, 5 Nov 2018 18:35:57 -0300
Subject: [PATCH] Mute when entering a domain

---
 android/app/CMakeLists.txt          | 2 +-
 android/app/src/main/cpp/native.cpp | 7 ++-----
 interface/src/AndroidHelper.cpp     | 8 ++++++++
 interface/src/AndroidHelper.h       | 1 +
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
index 0138b45146..9930a9e152 100644
--- a/android/app/CMakeLists.txt
+++ b/android/app/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME native-lib)
 setup_hifi_library()
-link_hifi_libraries(shared task networking gl gpu qml image fbx render-utils physics entities octree audio-client ${PLATFORM_GL_BACKEND})
+link_hifi_libraries(shared task networking gl gpu qml image fbx render-utils physics entities octree ${PLATFORM_GL_BACKEND})
 target_opengl()
 target_bullet()
 
diff --git a/android/app/src/main/cpp/native.cpp b/android/app/src/main/cpp/native.cpp
index 2f05a54fd5..760fdcb0b5 100644
--- a/android/app/src/main/cpp/native.cpp
+++ b/android/app/src/main/cpp/native.cpp
@@ -21,7 +21,6 @@
 
 #include <AddressManager.h>
 #include "AndroidHelper.h"
-#include "../../../../../libraries/audio-client/src/AudioClient.h"
 #include <udt/PacketHeaders.h>
 #include <SettingHandle.h>
 
@@ -211,15 +210,13 @@ JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnDest
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeGotoUrl(JNIEnv* env, jobject obj, jstring url) {
     QAndroidJniObject jniUrl("java/lang/String", "(Ljava/lang/String;)V", url);
     DependencyManager::get<AddressManager>()->loadSettings(jniUrl.toString());
-    auto audioClient = DependencyManager::get<AudioClient>();
-    audioClient->setMuted(true, true);
+    AndroidHelper::instance().muteMic();
 }
 
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeGoToUser(JNIEnv* env, jobject obj, jstring username) {
     QAndroidJniObject jniUsername("java/lang/String", "(Ljava/lang/String;)V", username);
     DependencyManager::get<AddressManager>()->goToUser(jniUsername.toString(), false);
-    auto audioClient = DependencyManager::get<AudioClient>();
-    audioClient->setMuted(true, true);
+    AndroidHelper::instance().muteMic();
 }
 
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnPause(JNIEnv* env, jobject obj) {
diff --git a/interface/src/AndroidHelper.cpp b/interface/src/AndroidHelper.cpp
index ae6aa34cc9..708859c00a 100644
--- a/interface/src/AndroidHelper.cpp
+++ b/interface/src/AndroidHelper.cpp
@@ -73,6 +73,14 @@ void AndroidHelper::notifyHeadsetOn(bool pluggedIn) {
 #endif
 }
 
+void AndroidHelper::muteMic() {
+    auto audioClient = DependencyManager::get<AudioClient>();
+    if (audioClient) {
+        QMetaObject::invokeMethod(audioClient.data(), "setMuted", Q_ARG(bool, true), Q_ARG(bool, true));
+    }
+}
+
+
 void AndroidHelper::signup(QString email, QString username, QString password) {
     JSONCallbackParameters callbackParams;
     callbackParams.callbackReceiver = this;
diff --git a/interface/src/AndroidHelper.h b/interface/src/AndroidHelper.h
index f1917deca0..f0aaa84214 100644
--- a/interface/src/AndroidHelper.h
+++ b/interface/src/AndroidHelper.h
@@ -35,6 +35,7 @@ public:
     void performHapticFeedback(int duration);
     void processURL(const QString &url);
     void notifyHeadsetOn(bool pluggedIn);
+    void muteMic();
 
     AndroidHelper(AndroidHelper const&)  = delete;
     void operator=(AndroidHelper const&) = delete;