From 7982d8da58246836394fcd5278f68d4e198e170e Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Mon, 26 Feb 2018 13:06:22 -0300
Subject: [PATCH] Set bubble default state off for android.

---
 libraries/networking/src/NodeList.h  | 4 ++++
 scripts/system/+android/bottombar.js | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h
index 2dd9d3c869..b419deba2f 100644
--- a/libraries/networking/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@@ -172,7 +172,11 @@ private:
     tbb::concurrent_unordered_map<QUuid, float, UUIDHasher> _avatarGainMap;
 
     void sendIgnoreRadiusStateToNode(const SharedNodePointer& destinationNode);
+#if defined(Q_OS_ANDROID)
+    Setting::Handle<bool> _ignoreRadiusEnabled { "IgnoreRadiusEnabled", false };
+#else
     Setting::Handle<bool> _ignoreRadiusEnabled { "IgnoreRadiusEnabled", true };
+#endif
 
 #if (PR_BUILD || DEV_BUILD)
     bool _shouldSendNewerVersion { false };
diff --git a/scripts/system/+android/bottombar.js b/scripts/system/+android/bottombar.js
index 5f82886c8a..51453ce9dd 100644
--- a/scripts/system/+android/bottombar.js
+++ b/scripts/system/+android/bottombar.js
@@ -132,6 +132,8 @@ function setupBottomBar() {
         text: "BUBBLE"
     });
 
+    bubbleBtn.editProperties({isActive: Users.getIgnoreRadiusEnabled()});
+
     bubbleBtn.clicked.connect(function() {
         Users.toggleIgnoreRadius();
         bubbleBtn.editProperties({isActive: Users.getIgnoreRadiusEnabled()});