From 1ae076f81bcfb350bda0e35d91378e5f9b018f74 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Mon, 21 Nov 2016 10:29:29 +0000
Subject: [PATCH] Handle mobile onion address

---
 src/freedombone-controlpanel |  2 +-
 src/freedombone-utils-onion  | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 4f5f207b..533656f3 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -372,7 +372,7 @@ function show_domains {
             echo "${onion_address}"
 
             if grep -q "${app_name}_mobile onion domain" $COMPLETION_FILE; then
-                onion_address=$(get_app_onion_address "${app_name}")
+                onion_address=$(get_app_onion_address "${app_name}" "mobile")
                 echo -n -e "$(pad_string "${app_name} (mobile)")"
                 echo -n -e "$(pad_string "${icann_address}")"
                 echo "${onion_address}"
diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion
index 009c89cd..ebec438a 100755
--- a/src/freedombone-utils-onion
+++ b/src/freedombone-utils-onion
@@ -382,9 +382,14 @@ function route_outgoing_traffic_through_tor {
 
 function get_app_onion_address {
     app_name="$1"
-    if grep -q "${app_name}_mobile onion domain" $COMPLETION_FILE; then
-        if grep -q "${app_name}_mobile onion domain" $COMPLETION_FILE; then
-            echo $(cat ${COMPLETION_FILE} | grep "${app_name}_mobile onion domain" | head -n 1 | awk -F ':' '{print $2}')
+    mobilestr="$2"
+
+    if [ ${#mobilestr} -gt 0 ]; then
+        mobilestr="_${mobilestr}"
+    fi
+    if grep -q "${app_name}${mobilestr} onion domain" $COMPLETION_FILE; then
+        if grep -q "${app_name}${mobilestr} onion domain" $COMPLETION_FILE; then
+            echo $(cat ${COMPLETION_FILE} | grep "${app_name}${mobilestr} onion domain" | head -n 1 | awk -F ':' '{print $2}')
             return
         fi
     fi