commit e9da5128ce3aac92d430a58c76bd823cfe216973 (HEAD -> features/MSG-8183_MoveSupportChatToSettings)
Author: Nicolás Patarino <npatarino@gmail.com>
Date:   Mon May 13 18:30:05 2019 +0200

    Copy the settingsConfig.yaml into movistar-es/user_settings for dev. Add support chat to support section

diff --git a/app/src/main/java/com/tuenti/messenger/notifications/fcm/domain/PushBL.kt b/app/src/main/java/com/tuenti/messenger/notifications/fcm/domain/PushBL.kt
index c1ec080d528..7b43a3db4f1 100644
--- a/app/src/main/java/com/tuenti/messenger/notifications/fcm/domain/PushBL.kt
+++ b/app/src/main/java/com/tuenti/messenger/notifications/fcm/domain/PushBL.kt
@@ -138,7 +138,7 @@ open class PushBL(
     }

     open fun activateNonAuthenticatedPush(): Promise<PushActivatedSuccessfully, PushNotActivated, Unit> {
-        if (!isPushAvailable) {
+        if (true) {
             return deferredFactory.reject(PushNotActivated)
         }

diff --git a/app/src/main/java/com/tuenti/messenger/settings/SettingsNavigator.java b/app/src/main/java/com/tuenti/messenger/settings/SettingsNavigator.java
index c0391e52550..3dd714d322f 100644
--- a/app/src/main/java/com/tuenti/messenger/settings/SettingsNavigator.java
+++ b/app/src/main/java/com/tuenti/messenger/settings/SettingsNavigator.java
@@ -10,9 +10,12 @@ import androidx.appcompat.app.AlertDialog;

 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
+import com.tuenti.chat.conversation.ConversationId;
+import com.tuenti.core.adapter.web.HandleConversationsProtocolAdapter;
 import com.tuenti.deferred.Done.UIContextual;
 import com.tuenti.ioc.ForActivity;
 import com.tuenti.messenger.R;
+import com.tuenti.messenger.conversations.conversationscreen.ui.view.ChatActivity;
 import com.tuenti.messenger.multiaccount.domain.model.UserAccount;
 import com.tuenti.messenger.multiaccount.usecase.GetUserAccounts;
 import com.tuenti.messenger.settings.actions.LogoutActionProvider;
@@ -22,6 +25,8 @@ import com.tuenti.messenger.settingsdetail.ui.view.DeveloperSettingsActivity;
 import com.tuenti.statistics.analytics.OwnProfileAnalyticsTracker;
 import com.tuenti.statistics.analytics.LogoutReason;
 import com.tuenti.statistics.analytics.OwnProfileAnalyticsTracker.Label;
+import com.tuenti.support.chat.config.domain.GetSupportChatSessionConfig;
+import com.tuenti.web.adapter.HandleConversationProtocol;

 public class SettingsNavigator {

@@ -30,18 +35,24 @@ public class SettingsNavigator {
        private final GetUserAccounts getUserAccounts;
        private final LogoutActionProvider logoutActionProvider;
        private final OwnProfileAnalyticsTracker ownProfileAnalyticsTracker;
+       private HandleConversationsProtocolAdapter handleConversationsProtocolAdapter;
+       private final GetSupportChatSessionConfig getSupportChatSessionConfig;

        @Inject
        public SettingsNavigator(@ForActivity Context activityContext,
                        OpenSettingSectionActionProvider openSettingSectionActionProvider,
                        GetUserAccounts getUserAccounts,
                        LogoutActionProvider logoutActionProvider,
-                       OwnProfileAnalyticsTracker ownProfileAnalyticsTracker) {
+                       OwnProfileAnalyticsTracker ownProfileAnalyticsTracker,
+                       HandleConversationsProtocolAdapter handleConversationsProtocolAdapter,
+                       GetSupportChatSessionConfig getSupportChatSessionConfig) {
                this.activityContext = (Activity) activityContext;
                this.openSettingSectionActionProvider = openSettingSectionActionProvider;
                this.getUserAccounts = getUserAccounts;
                this.logoutActionProvider = logoutActionProvider;
                this.ownProfileAnalyticsTracker = ownProfileAnalyticsTracker;
+               this.handleConversationsProtocolAdapter = handleConversationsProtocolAdapter;
+               this.getSupportChatSessionConfig = getSupportChatSessionConfig;
        }

        public void toLogout() {
@@ -88,4 +99,9 @@ public class SettingsNavigator {
        public void navigateToDeveloperSettings() {
                activityContext.startActivity(new Intent(activityContext, DeveloperSettingsActivity.class));
        }
+
+       public void navigateToSupportChatActivity() {
+               String conversationId = getSupportChatSessionConfig.invoke().getSupportChatConversationConfig().getConversationId();
+               handleConversationsProtocolAdapter.handleConversation(conversationId);
+       }
 }
diff --git a/app/src/main/java/com/tuenti/messenger/settings/domain/SettingType.java b/app/src/main/java/com/tuenti/messenger/settings/domain/SettingType.java
index da772d1cd2e..659922f2536 100644
--- a/app/src/main/java/com/tuenti/messenger/settings/domain/SettingType.java
+++ b/app/src/main/java/com/tuenti/messenger/settings/domain/SettingType.java
@@ -20,7 +20,8 @@ public enum SettingType {
        SECURITY("security"),
        SUPPORT_AREA("supportArea"),
        SUPPORT_TICKET_LIST("supportTicketList"),
-       DEV_SETTINGS("developer_settings");
+       DEV_SETTINGS("developer_settings"),
+       SUPPORT_CHAT("support_chat");

        private final String key;

diff --git a/app/src/main/java/com/tuenti/messenger/settings/ui/viewmodel/NativeSettingViewModelFactory.java b/app/src/main/java/com/tuenti/messenger/settings/ui/viewmodel/NativeSettingViewModelFactory.java
index 16ceb674abc..814deeffa2e 100644
--- a/app/src/main/java/com/tuenti/messenger/settings/ui/viewmodel/NativeSettingViewModelFactory.java
+++ b/app/src/main/java/com/tuenti/messenger/settings/ui/viewmodel/NativeSettingViewModelFactory.java
@@ -6,9 +6,9 @@ import javax.inject.Inject;
 import com.annimon.stream.Optional;
 import com.tuenti.commons.log.Logger;
 import com.tuenti.messenger.BuildConfig;
-import com.tuenti.messenger.settings.domain.SettingType;
 import com.tuenti.messenger.settings.SettingsNavigator;
 import com.tuenti.messenger.settings.domain.SettingSection;
+import com.tuenti.messenger.settings.domain.SettingType;
 import com.tuenti.messenger.settings.usecase.HideHighlightedSetting;
 import com.tuenti.messenger.support.area.domain.usecase.IsSupportAreaEnabled;
 import com.tuenti.messenger.support.area.domain.usecase.IsTicketingEnabled;
@@ -111,6 +111,9 @@ public class NativeSettingViewModelFactory {
                                                items.add(getViewModel(settingId, title, iconOptional, settingsNavigator::navigateToDeveloperSettings, isHighlighted));
                                        }
                                        break;
+                               case SUPPORT_CHAT:
+                                       items.add(getViewModel(settingId, title, iconOptional, settingsNavigator::navigateToSupportChatActivity, isHighlighted));
+                                       break;
                        }
                });

(END)