Merge pull request #1836 from nextcloud/feature/noid/ControllerToKotlin

Migrate EntryMenuController to Kotlin

app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java

@@ -1,349 +0,0 @@
-/*
- * Nextcloud Talk application
- *
- * @author Mario Danic
- * @author Marcel Hibbe
- * Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
- * Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.nextcloud.talk.controllers.bottomsheet;
-
-import static com.nextcloud.talk.controllers.bottomsheet.ConversationOperationEnum.OPS_CODE_JOIN_ROOM;
-import static com.nextcloud.talk.controllers.bottomsheet.ConversationOperationEnum.OPS_CODE_GET_AND_JOIN_ROOM;
-import static com.nextcloud.talk.controllers.bottomsheet.ConversationOperationEnum.OPS_CODE_INVITE_USERS;
-import static com.nextcloud.talk.controllers.bottomsheet.ConversationOperationEnum.OPS_CODE_CHANGE_PASSWORD;
-import static com.nextcloud.talk.controllers.bottomsheet.ConversationOperationEnum.OPS_CODE_SET_PASSWORD;
-import static com.nextcloud.talk.controllers.bottomsheet.ConversationOperationEnum.OPS_CODE_SHARE_LINK;
-import static com.nextcloud.talk.controllers.bottomsheet.ConversationOperationEnum.OPS_CODE_RENAME_ROOM;
-
-import android.content.ComponentName;
-import android.content.Intent;
-import android.graphics.PorterDuff;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.InputType;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.ImageView;
-
-import com.bluelinelabs.conductor.RouterTransaction;
-import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler;
-import com.google.android.material.textfield.TextInputLayout;
-import com.nextcloud.talk.R;
-import com.nextcloud.talk.application.NextcloudTalkApplication;
-import com.nextcloud.talk.controllers.base.BaseController;
-import com.nextcloud.talk.models.json.conversations.Conversation;
-import com.nextcloud.talk.utils.EmojiTextInputEditText;
-import com.nextcloud.talk.utils.ShareUtils;
-import com.nextcloud.talk.utils.bundle.BundleKeys;
-import com.nextcloud.talk.utils.database.user.UserUtils;
-import com.nextcloud.talk.utils.singletons.ApplicationWideMessageHolder;
-import com.vanniktech.emoji.EmojiImageView;
-import com.vanniktech.emoji.EmojiPopup;
-import com.vanniktech.emoji.emoji.Emoji;
-import com.vanniktech.emoji.listeners.OnEmojiClickListener;
-import com.vanniktech.emoji.listeners.OnEmojiPopupDismissListener;
-import com.vanniktech.emoji.listeners.OnEmojiPopupShownListener;
-
-import org.greenrobot.eventbus.EventBus;
-import org.parceler.Parcels;
-
-import javax.inject.Inject;
-
-import androidx.annotation.NonNull;
-import autodagger.AutoInjector;
-import butterknife.BindView;
-import butterknife.OnClick;
-
-@AutoInjector(NextcloudTalkApplication.class)
-public class EntryMenuController extends BaseController {
-
-    @BindView(R.id.ok_button)
-    Button proceedButton;
-
-    @BindView(R.id.text_edit)
-    EmojiTextInputEditText editText;
-
-    @BindView(R.id.text_input_layout)
-    TextInputLayout textInputLayout;
-
-    @BindView(R.id.smileyButton)
-    ImageView smileyButton;
-
-    @Inject
-    EventBus eventBus;
-
-    @Inject
-    UserUtils userUtils;
-
-    private ConversationOperationEnum operation;
-    private Conversation conversation;
-    private Intent shareIntent;
-    private String packageName;
-    private String name;
-    private String callUrl;
-
-    private EmojiPopup emojiPopup;
-
-    private Bundle originalBundle;
-
-    public EntryMenuController(Bundle args) {
-        super(args);
-        originalBundle = args;
-
-        this.operation = (ConversationOperationEnum) args.getSerializable(BundleKeys.INSTANCE.getKEY_OPERATION_CODE());
-        if (args.containsKey(BundleKeys.INSTANCE.getKEY_ROOM())) {
-            this.conversation = Parcels.unwrap(args.getParcelable(BundleKeys.INSTANCE.getKEY_ROOM()));
-        }
-
-        if (args.containsKey(BundleKeys.INSTANCE.getKEY_SHARE_INTENT())) {
-            this.shareIntent = Parcels.unwrap(args.getParcelable(BundleKeys.INSTANCE.getKEY_SHARE_INTENT()));
-        }
-
-        this.name = args.getString(BundleKeys.INSTANCE.getKEY_APP_ITEM_NAME(), "");
-        this.packageName = args.getString(BundleKeys.INSTANCE.getKEY_APP_ITEM_PACKAGE_NAME(), "");
-        this.callUrl = args.getString(BundleKeys.INSTANCE.getKEY_CALL_URL(), "");
-    }
-
-    @NonNull
-    @Override
-    protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
-        return inflater.inflate(R.layout.controller_entry_menu, container, false);
-    }
-
-    @OnClick(R.id.smileyButton)
-    void onSmileyClick() {
-        emojiPopup.toggle();
-    }
-
-    @Override
-    protected void onAttach(@NonNull View view) {
-        super.onAttach(view);
-        if (ApplicationWideMessageHolder.getInstance().getMessageType() != null &&
-                ApplicationWideMessageHolder.getInstance().getMessageType().equals(ApplicationWideMessageHolder.MessageType.CALL_PASSWORD_WRONG)) {
-            textInputLayout.setError(getResources().getString(R.string.nc_wrong_password));
-            ApplicationWideMessageHolder.getInstance().setMessageType(null);
-            if (proceedButton.isEnabled()) {
-                proceedButton.setEnabled(false);
-                proceedButton.setAlpha(0.7f);
-            }
-        }
-    }
-
-    @OnClick(R.id.ok_button)
-    public void onProceedButtonClick() {
-        Bundle bundle;
-        if (operation == OPS_CODE_JOIN_ROOM) {
-            bundle = new Bundle();
-            bundle.putParcelable(BundleKeys.INSTANCE.getKEY_ROOM(), Parcels.wrap(conversation));
-            bundle.putString(BundleKeys.INSTANCE.getKEY_CALL_URL(), callUrl);
-            bundle.putString(BundleKeys.INSTANCE.getKEY_CONVERSATION_PASSWORD(), editText.getText().toString());
-            bundle.putSerializable(BundleKeys.INSTANCE.getKEY_OPERATION_CODE(), operation);
-            if (originalBundle.containsKey(BundleKeys.INSTANCE.getKEY_SERVER_CAPABILITIES())) {
-                bundle.putParcelable(BundleKeys.INSTANCE.getKEY_SERVER_CAPABILITIES(), originalBundle.getParcelable(BundleKeys.INSTANCE.getKEY_SERVER_CAPABILITIES()));
-            }
-
-            getRouter().pushController(RouterTransaction.with(new OperationsMenuController(bundle))
-                    .pushChangeHandler(new HorizontalChangeHandler())
-                    .popChangeHandler(new HorizontalChangeHandler()));
-        } else if (operation != OPS_CODE_SHARE_LINK && operation != OPS_CODE_GET_AND_JOIN_ROOM && operation != OPS_CODE_INVITE_USERS) {
-            bundle = new Bundle();
-            if (operation == OPS_CODE_CHANGE_PASSWORD || operation == OPS_CODE_SET_PASSWORD) {
-                conversation.setPassword(editText.getText().toString());
-            } else {
-                conversation.setName(editText.getText().toString());
-            }
-            bundle.putParcelable(BundleKeys.INSTANCE.getKEY_ROOM(), Parcels.wrap(conversation));
-            bundle.putSerializable(BundleKeys.INSTANCE.getKEY_OPERATION_CODE(), operation);
-            getRouter().pushController(RouterTransaction.with(new OperationsMenuController(bundle))
-                    .pushChangeHandler(new HorizontalChangeHandler())
-                    .popChangeHandler(new HorizontalChangeHandler()));
-        } else if (operation == OPS_CODE_SHARE_LINK) {
-            if (getActivity() != null) {
-                shareIntent.putExtra(Intent.EXTRA_TEXT, ShareUtils.getStringForIntent(getActivity(),
-                        editText.getText().toString(), userUtils, conversation));
-                Intent intent = new Intent(shareIntent);
-                intent.setComponent(new ComponentName(packageName, name));
-                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                getActivity().startActivity(intent);
-            }
-        } else if (operation != OPS_CODE_INVITE_USERS) {
-            bundle = new Bundle();
-            bundle.putSerializable(BundleKeys.INSTANCE.getKEY_OPERATION_CODE(), operation);
-            bundle.putString(BundleKeys.INSTANCE.getKEY_CALL_URL(), editText.getText().toString());
-            getRouter().pushController(RouterTransaction.with(new OperationsMenuController(bundle))
-                    .pushChangeHandler(new HorizontalChangeHandler())
-                    .popChangeHandler(new HorizontalChangeHandler()));
-
-        } else if (operation == OPS_CODE_INVITE_USERS) {
-            originalBundle.putString(BundleKeys.INSTANCE.getKEY_CONVERSATION_NAME(), editText.getText().toString());
-            getRouter().pushController(RouterTransaction.with(new OperationsMenuController(originalBundle))
-                    .pushChangeHandler(new HorizontalChangeHandler())
-                    .popChangeHandler(new HorizontalChangeHandler()));
-
-        }
-    }
-
-    @Override
-    protected void onViewBound(@NonNull View view) {
-        super.onViewBound(view);
-        NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
-
-        if (conversation != null && operation == OPS_CODE_RENAME_ROOM) {
-            editText.setText(conversation.getName());
-        }
-
-        editText.setOnEditorActionListener((v, actionId, event) -> {
-            if (actionId == EditorInfo.IME_ACTION_DONE && proceedButton != null && proceedButton.isEnabled()) {
-                proceedButton.callOnClick();
-                return true;
-            }
-            return false;
-        });
-
-        editText.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                if (!TextUtils.isEmpty(s)) {
-                    if (operation == OPS_CODE_RENAME_ROOM) {
-                        if (conversation.getName() == null || !conversation.getName().equals(s.toString())) {
-                            if (!proceedButton.isEnabled()) {
-                                proceedButton.setEnabled(true);
-                                proceedButton.setAlpha(1.0f);
-                            }
-                            textInputLayout.setErrorEnabled(false);
-                        } else {
-                            if (proceedButton.isEnabled()) {
-                                proceedButton.setEnabled(false);
-                                proceedButton.setAlpha(0.38f);
-                            }
-                            textInputLayout.setError(getResources().getString(R.string.nc_call_name_is_same));
-                        }
-                    } else if (operation != OPS_CODE_GET_AND_JOIN_ROOM) {
-                        if (!proceedButton.isEnabled()) {
-                            proceedButton.setEnabled(true);
-                            proceedButton.setAlpha(1.0f);
-                        }
-                        textInputLayout.setErrorEnabled(false);
-                    } else if ((editText.getText().toString().startsWith("http://") ||
-                            editText.getText().toString().startsWith("https://")) &&
-                                    editText.getText().toString().contains("/call/")) {
-                        if (!proceedButton.isEnabled()) {
-                            proceedButton.setEnabled(true);
-                            proceedButton.setAlpha(1.0f);
-                        }
-                        textInputLayout.setErrorEnabled(false);
-                    } else {
-                        if (proceedButton.isEnabled()) {
-                            proceedButton.setEnabled(false);
-                            proceedButton.setAlpha(0.38f);
-                        }
-                        textInputLayout.setError(getResources().getString(R.string.nc_wrong_link));
-                    }
-                } else {
-                    if (proceedButton.isEnabled()) {
-                        proceedButton.setEnabled(false);
-                        proceedButton.setAlpha(0.38f);
-                    }
-                    textInputLayout.setErrorEnabled(false);
-                }
-            }
-        });
-
-        String labelText = "";
-        switch (operation) {
-            case OPS_CODE_INVITE_USERS:
-            case OPS_CODE_RENAME_ROOM:
-                labelText = getResources().getString(R.string.nc_call_name);
-                editText.setInputType(InputType.TYPE_CLASS_TEXT);
-                smileyButton.setVisibility(View.VISIBLE);
-                emojiPopup = EmojiPopup.Builder.fromRootView(view).setOnEmojiPopupShownListener(new OnEmojiPopupShownListener() {
-                    @Override
-                    public void onEmojiPopupShown() {
-                        if (getResources() != null) {
-                            smileyButton.setColorFilter(getResources().getColor(R.color.colorPrimary),
-                                    PorterDuff.Mode.SRC_IN);
-                        }
-                    }
-                }).setOnEmojiPopupDismissListener(new OnEmojiPopupDismissListener() {
-                    @Override
-                    public void onEmojiPopupDismiss() {
-                        if (smileyButton != null) {
-                            smileyButton.setColorFilter(getResources().getColor(R.color.emoji_icons),
-                                    PorterDuff.Mode.SRC_IN);
-                        }
-                    }
-                }).setOnEmojiClickListener(new OnEmojiClickListener() {
-                    @Override
-                    public void onEmojiClick(@NonNull EmojiImageView emoji, @NonNull Emoji imageView) {
-                        editText.getEditableText().append(" ");
-                    }
-                }).build(editText);
-
-                break;
-            case OPS_CODE_CHANGE_PASSWORD:
-                labelText = getResources().getString(R.string.nc_new_password);
-                editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-                break;
-            case OPS_CODE_SET_PASSWORD:
-            case OPS_CODE_SHARE_LINK:
-            case OPS_CODE_JOIN_ROOM:
-                // 99 is joining a conversation via password
-                labelText = getResources().getString(R.string.nc_password);
-                editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-                break;
-            case OPS_CODE_GET_AND_JOIN_ROOM:
-                labelText = getResources().getString(R.string.nc_conversation_link);
-                editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
-                break;
-            default:
-                break;
-        }
-
-        if (operation == OPS_CODE_JOIN_ROOM
-            || operation == OPS_CODE_CHANGE_PASSWORD
-            || operation == OPS_CODE_SET_PASSWORD
-            || operation == OPS_CODE_SHARE_LINK) {
-            textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
-        } else {
-            textInputLayout.setEndIconMode(TextInputLayout.END_ICON_NONE);
-        }
-
-        textInputLayout.setHint(labelText);
-        textInputLayout.requestFocus();
-    }
-
-    @Override
-    public AppBarLayoutType getAppBarLayoutType() {
-        return AppBarLayoutType.SEARCH_BAR;
-    }
-}

app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.kt

@@ -0,0 +1,325 @@
+/*
+ * Nextcloud Talk application
+ *
+ * @author Mario Danic
+ * @author Marcel Hibbe
+ * @author Andy Scherzinger
+ * Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
+ * Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.nextcloud.talk.controllers.bottomsheet
+
+import android.content.ComponentName
+import android.content.Intent
+import android.graphics.PorterDuff
+import android.os.Bundle
+import android.os.Parcelable
+import android.text.Editable
+import android.text.InputType
+import android.text.TextUtils
+import android.text.TextWatcher
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import autodagger.AutoInjector
+import com.bluelinelabs.conductor.RouterTransaction
+import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
+import com.google.android.material.textfield.TextInputLayout
+import com.nextcloud.talk.R
+import com.nextcloud.talk.application.NextcloudTalkApplication
+import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
+import com.nextcloud.talk.controllers.base.NewBaseController
+import com.nextcloud.talk.controllers.util.viewBinding
+import com.nextcloud.talk.databinding.ControllerEntryMenuBinding
+import com.nextcloud.talk.models.json.conversations.Conversation
+import com.nextcloud.talk.utils.ShareUtils
+import com.nextcloud.talk.utils.bundle.BundleKeys
+import com.nextcloud.talk.utils.database.user.UserUtils
+import com.nextcloud.talk.utils.singletons.ApplicationWideMessageHolder
+import com.vanniktech.emoji.EmojiImageView
+import com.vanniktech.emoji.EmojiPopup
+import com.vanniktech.emoji.emoji.Emoji
+import com.vanniktech.emoji.listeners.OnEmojiClickListener
+import com.vanniktech.emoji.listeners.OnEmojiPopupDismissListener
+import com.vanniktech.emoji.listeners.OnEmojiPopupShownListener
+import org.greenrobot.eventbus.EventBus
+import org.parceler.Parcels
+import org.parceler.Parcels.unwrap
+import javax.inject.Inject
+
+@AutoInjector(NextcloudTalkApplication::class)
+class EntryMenuController(args: Bundle) :
+    NewBaseController(
+        R.layout.controller_entry_menu,
+        args
+    ) {
+    private val binding: ControllerEntryMenuBinding by viewBinding(ControllerEntryMenuBinding::bind)
+
+    @JvmField
+    @Inject
+    var eventBus: EventBus? = null
+
+    @JvmField
+    @Inject
+    var userUtils: UserUtils? = null
+
+    private val operation: ConversationOperationEnum
+    private var conversation: Conversation? = null
+    private var shareIntent: Intent? = null
+    private val packageName: String
+    private val name: String
+    private val callUrl: String
+    private var emojiPopup: EmojiPopup? = null
+    private val originalBundle: Bundle
+
+    override val appBarLayoutType: AppBarLayoutType
+        get() = AppBarLayoutType.SEARCH_BAR
+
+    override fun onAttach(view: View) {
+        super.onAttach(view)
+        if (ApplicationWideMessageHolder.MessageType.CALL_PASSWORD_WRONG ==
+            ApplicationWideMessageHolder.getInstance().messageType
+        ) {
+            binding.textInputLayout.error = resources?.getString(R.string.nc_wrong_password)
+            ApplicationWideMessageHolder.getInstance().setMessageType(null)
+            if (binding.okButton.isEnabled) {
+                binding.okButton.isEnabled = false
+                binding.okButton.alpha = 0.7f
+            }
+        }
+    }
+
+    override fun onViewBound(view: View) {
+        super.onViewBound(view)
+
+        if (conversation != null && operation === ConversationOperationEnum.OPS_CODE_RENAME_ROOM) {
+            binding.textEdit.setText(conversation!!.getName())
+        }
+
+        binding.textEdit.setOnEditorActionListener { v, actionId, event ->
+            @Suppress("IMPLICIT_BOXING_IN_IDENTITY_EQUALS")
+            if (actionId === EditorInfo.IME_ACTION_DONE && binding.okButton.isEnabled) {
+                binding.okButton.callOnClick()
+                return@setOnEditorActionListener true
+            }
+            false
+        }
+
+        binding.textEdit.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
+            override fun afterTextChanged(s: Editable) {
+                if (!TextUtils.isEmpty(s)) {
+                    if (operation === ConversationOperationEnum.OPS_CODE_RENAME_ROOM) {
+                        if (conversation!!.getName() == null || !conversation!!.getName().equals(s.toString())) {
+                            if (!binding.okButton.isEnabled) {
+                                binding.okButton.isEnabled = true
+                                binding.okButton.alpha = 1.0f
+                            }
+                            binding.textInputLayout.isErrorEnabled = false
+                        } else {
+                            if (binding.okButton.isEnabled) {
+                                binding.okButton.isEnabled = false
+                                binding.okButton.alpha = 0.38f
+                            }
+                            binding.textInputLayout.error = resources?.getString(R.string.nc_call_name_is_same)
+                        }
+                    } else if (operation !== ConversationOperationEnum.OPS_CODE_GET_AND_JOIN_ROOM) {
+                        if (!binding.okButton.isEnabled) {
+                            binding.okButton.isEnabled = true
+                            binding.okButton.alpha = 1.0f
+                        }
+                        binding.textInputLayout.isErrorEnabled = false
+                    } else if ((binding.textEdit.text.toString().startsWith("http://") ||
+                            binding.textEdit.text.toString().startsWith("https://")) &&
+                        binding.textEdit.text.toString().contains("/call/")
+                    ) {
+                        if (!binding.okButton.isEnabled) {
+                            binding.okButton.isEnabled = true
+                            binding.okButton.alpha = 1.0f
+                        }
+                        binding.textInputLayout.isErrorEnabled = false
+                    } else {
+                        if (binding.okButton.isEnabled) {
+                            binding.okButton.isEnabled = false
+                            binding.okButton.alpha = 0.38f
+                        }
+                        binding.textInputLayout.error = resources?.getString(R.string.nc_wrong_link)
+                    }
+                } else {
+                    if (binding.okButton.isEnabled) {
+                        binding.okButton.isEnabled = false
+                        binding.okButton.alpha = 0.38f
+                    }
+                    binding.textInputLayout.isErrorEnabled = false
+                }
+            }
+        })
+
+        var labelText = ""
+        when (operation) {
+            ConversationOperationEnum.OPS_CODE_INVITE_USERS, ConversationOperationEnum.OPS_CODE_RENAME_ROOM -> {
+                labelText = resources!!.getString(R.string.nc_call_name)
+                binding.textEdit.inputType = InputType.TYPE_CLASS_TEXT
+                binding.smileyButton.visibility = View.VISIBLE
+                emojiPopup = EmojiPopup.Builder.fromRootView(view)
+                    .setOnEmojiPopupShownListener {
+                        if (resources != null) {
+                            binding.smileyButton.setColorFilter(
+                                resources!!.getColor(R.color.colorPrimary),
+                                PorterDuff.Mode.SRC_IN
+                            )
+                        }
+                    }.setOnEmojiPopupDismissListener {
+                        binding.smileyButton.setColorFilter(
+                            resources!!.getColor(R.color.emoji_icons),
+                            PorterDuff.Mode.SRC_IN
+                        )
+                    }.setOnEmojiClickListener { emoji, imageView -> binding.textEdit.editableText.append(" ") }
+                    .build(binding.textEdit)
+            }
+
+            ConversationOperationEnum.OPS_CODE_CHANGE_PASSWORD -> {
+                labelText = resources!!.getString(R.string.nc_new_password)
+                binding.textEdit.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+            }
+
+            ConversationOperationEnum.OPS_CODE_SET_PASSWORD,
+            ConversationOperationEnum.OPS_CODE_SHARE_LINK,
+            ConversationOperationEnum.OPS_CODE_JOIN_ROOM -> {
+                // 99 is joining a conversation via password
+                labelText = resources!!.getString(R.string.nc_password)
+                binding.textEdit.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+            }
+
+            ConversationOperationEnum.OPS_CODE_GET_AND_JOIN_ROOM -> {
+                labelText = resources!!.getString(R.string.nc_conversation_link)
+                binding.textEdit.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_URI
+            }
+
+            else -> {
+            }
+        }
+        if (operation === ConversationOperationEnum.OPS_CODE_JOIN_ROOM ||
+            operation === ConversationOperationEnum.OPS_CODE_CHANGE_PASSWORD ||
+            operation === ConversationOperationEnum.OPS_CODE_SET_PASSWORD ||
+            operation === ConversationOperationEnum.OPS_CODE_SHARE_LINK
+        ) {
+            binding.textInputLayout.endIconMode = TextInputLayout.END_ICON_PASSWORD_TOGGLE
+        } else {
+            binding.textInputLayout.endIconMode = TextInputLayout.END_ICON_NONE
+        }
+        binding.textInputLayout.hint = labelText
+        binding.textInputLayout.requestFocus()
+
+        binding.smileyButton.setOnClickListener { onSmileyClick() }
+        binding.okButton.setOnClickListener { onOkButtonClick() }
+    }
+
+    private fun onSmileyClick() {
+        emojiPopup?.toggle()
+    }
+
+    private fun onOkButtonClick() {
+        val bundle: Bundle
+        if (operation === ConversationOperationEnum.OPS_CODE_JOIN_ROOM) {
+            bundle = Bundle()
+            bundle.putParcelable(BundleKeys.KEY_ROOM, Parcels.wrap<Any>(conversation))
+            bundle.putString(BundleKeys.KEY_CALL_URL, callUrl)
+            bundle.putString(BundleKeys.KEY_CONVERSATION_PASSWORD, binding.textEdit.text.toString())
+            bundle.putSerializable(BundleKeys.KEY_OPERATION_CODE, operation)
+            if (originalBundle.containsKey(BundleKeys.KEY_SERVER_CAPABILITIES)) {
+                bundle.putParcelable(
+                    BundleKeys.KEY_SERVER_CAPABILITIES,
+                    originalBundle.getParcelable<Parcelable>(BundleKeys.KEY_SERVER_CAPABILITIES)
+                )
+            }
+            router.pushController(
+                RouterTransaction.with(OperationsMenuController(bundle))
+                    .pushChangeHandler(HorizontalChangeHandler())
+                    .popChangeHandler(HorizontalChangeHandler())
+            )
+        } else if (operation !== ConversationOperationEnum.OPS_CODE_SHARE_LINK &&
+            operation !== ConversationOperationEnum.OPS_CODE_GET_AND_JOIN_ROOM &&
+            operation !== ConversationOperationEnum.OPS_CODE_INVITE_USERS
+        ) {
+            bundle = Bundle()
+            if (operation === ConversationOperationEnum.OPS_CODE_CHANGE_PASSWORD ||
+                operation === ConversationOperationEnum.OPS_CODE_SET_PASSWORD
+            ) {
+                conversation!!.setPassword(binding.textEdit.text.toString())
+            } else {
+                conversation!!.setName(binding.textEdit.text.toString())
+            }
+            bundle.putParcelable(BundleKeys.KEY_ROOM, Parcels.wrap<Any>(conversation))
+            bundle.putSerializable(BundleKeys.KEY_OPERATION_CODE, operation)
+            router.pushController(
+                RouterTransaction.with(OperationsMenuController(bundle))
+                    .pushChangeHandler(HorizontalChangeHandler())
+                    .popChangeHandler(HorizontalChangeHandler())
+            )
+        } else if (operation === ConversationOperationEnum.OPS_CODE_SHARE_LINK) {
+            if (activity != null) {
+                shareIntent?.putExtra(
+                    Intent.EXTRA_TEXT, ShareUtils.getStringForIntent(
+                        activity,
+                        binding.textEdit.text.toString(), userUtils, conversation
+                    )
+                )
+                val intent = Intent(shareIntent)
+                intent.component = ComponentName(packageName, name)
+                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                activity?.startActivity(intent)
+            }
+        } else if (operation !== ConversationOperationEnum.OPS_CODE_INVITE_USERS) {
+            bundle = Bundle()
+            bundle.putSerializable(BundleKeys.KEY_OPERATION_CODE, operation)
+            bundle.putString(BundleKeys.KEY_CALL_URL, binding.textEdit.text.toString())
+            router.pushController(
+                RouterTransaction.with(OperationsMenuController(bundle))
+                    .pushChangeHandler(HorizontalChangeHandler())
+                    .popChangeHandler(HorizontalChangeHandler())
+            )
+        } else if (operation === ConversationOperationEnum.OPS_CODE_INVITE_USERS) {
+            originalBundle.putString(BundleKeys.KEY_CONVERSATION_NAME, binding.textEdit.text.toString())
+            router.pushController(
+                RouterTransaction.with(
+                    OperationsMenuController(
+                        originalBundle
+                    )
+                )
+                    .pushChangeHandler(HorizontalChangeHandler())
+                    .popChangeHandler(HorizontalChangeHandler())
+            )
+        }
+    }
+
+    init {
+        sharedApplication!!.componentApplication.inject(this)
+
+        originalBundle = args
+        operation = args.getSerializable(BundleKeys.KEY_OPERATION_CODE) as ConversationOperationEnum
+        if (args.containsKey(BundleKeys.KEY_ROOM)) {
+            conversation = unwrap<Conversation>(args.getParcelable<Parcelable>(BundleKeys.KEY_ROOM))
+        }
+        if (args.containsKey(BundleKeys.KEY_SHARE_INTENT)) {
+            shareIntent = unwrap<Intent>(args.getParcelable<Parcelable>(BundleKeys.KEY_SHARE_INTENT))
+        }
+        name = args.getString(BundleKeys.KEY_APP_ITEM_NAME, "")
+        packageName = args.getString(BundleKeys.KEY_APP_ITEM_PACKAGE_NAME, "")
+        callUrl = args.getString(BundleKeys.KEY_CALL_URL, "")
+    }
+}

scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-453
+452

scripts/analysis/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 178 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 172 warnings</span>