From 50373ebe534bc70d4162a8c9f5f81e5c7eaca784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Turnel?=
 <mickael.turnel@belledonne-communications.com>
Date: Fri, 28 Sep 2018 14:33:19 +0200
Subject: [PATCH] Add custom options for rebranding

These are: use create account view at first start, hide assistant from side menu and hide options from side menu.

(cherry picked from commit a9eafaa9f34e82151531cf0fd5d37ed88f52b8dc)
---
 res/values/non_localizable_custom.xml                     | 7 +++++++
 src/android/org/linphone/activities/LinphoneActivity.java | 8 ++++++--
 src/android/org/linphone/assistant/AssistantActivity.java | 7 +++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index dd0645646..c7c1cb9cb 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -27,7 +27,10 @@
 
 	<!-- Assistant -->
 	<bool name="assistant_allow_username">true</bool> <!-- Allow to use an username instead of the phone number for account creation -->
+
+	<!-- Only on should be set to true at a time! If not the first one will be used -->
 	<bool name="assistant_use_linphone_login_as_first_fragment">false</bool><!-- Start assistant in loginFragment view instead of menu -->
+	<bool name="assistant_use_create_linphone_account_as_first_fragment">false</bool><!-- Start Linphone creation account in loginFragment view instead of menu -->
 
 	<bool name="replace_assistant_with_old_interface">false</bool>
 	<bool name="hide_assistant">false</bool>
@@ -91,6 +94,10 @@
 	<bool name="allow_only_one_sip_address">false</bool>
 	<bool name="display_contact_organization">true</bool>
 
+	<!-- Side Menu -->
+	<bool name="hide_assistant_from_side_menu">false</bool>
+	<bool name="hide_settings_from_side_menu">false</bool>
+
 	<!-- Others Parameters-->
 	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
 	<bool name="enable_call_notification">true</bool>
diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java
index d6c8eafab..9c5e375e4 100644
--- a/src/android/org/linphone/activities/LinphoneActivity.java
+++ b/src/android/org/linphone/activities/LinphoneActivity.java
@@ -1564,8 +1564,12 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
     public void initSideMenu() {
         sideMenu = findViewById(R.id.side_menu);
         sideMenuItems = new ArrayList<>();
-        sideMenuItems.add(getResources().getString(R.string.menu_assistant));
-        sideMenuItems.add(getResources().getString(R.string.menu_settings));
+        if (!getResources().getBoolean(R.bool.hide_assistant_from_side_menu)) {
+            sideMenuItems.add(getResources().getString(R.string.menu_assistant));
+        }
+        if (!getResources().getBoolean(R.bool.hide_settings_from_side_menu)) {
+            sideMenuItems.add(getResources().getString(R.string.menu_settings));
+        }
         if (getResources().getBoolean(R.bool.enable_in_app_purchase)) {
             sideMenuItems.add(getResources().getString(R.string.inapp));
         }
diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java
index 8355a9105..825bfc239 100644
--- a/src/android/org/linphone/assistant/AssistantActivity.java
+++ b/src/android/org/linphone/assistant/AssistantActivity.java
@@ -124,6 +124,10 @@ public class AssistantActivity extends Activity implements OnClickListener, Acti
             displayCreateAccount();
         } else {
             firstFragment = getResources().getBoolean(R.bool.assistant_use_linphone_login_as_first_fragment) ? AssistantFragmentsEnum.LINPHONE_LOGIN : AssistantFragmentsEnum.WELCOME;
+            if (firstFragment == AssistantFragmentsEnum.WELCOME) {
+                firstFragment = getResources().getBoolean(R.bool.assistant_use_create_linphone_account_as_first_fragment) ? AssistantFragmentsEnum.CREATE_ACCOUNT : AssistantFragmentsEnum.WELCOME;
+            }
+
             if (findViewById(R.id.fragment_container) != null) {
                 if (savedInstanceState == null) {
                     display(firstFragment);
@@ -439,6 +443,9 @@ public class AssistantActivity extends Activity implements OnClickListener, Acti
             case LINPHONE_LOGIN:
                 displayLoginLinphone(null, null);
                 break;
+            case CREATE_ACCOUNT:
+                displayCreateAccount();
+                break;
             default:
                 throw new IllegalStateException("Can't handle " + fragment);
         }