Better server entry view

Signed-off-by: Mario Danic <mario@lovelyhq.com>

app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt

@@ -43,6 +43,7 @@ import com.nextcloud.talk.controllers.LockedController
 import com.nextcloud.talk.controllers.ServerSelectionController
 import com.nextcloud.talk.controllers.base.providers.ActionBarProvider
 import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository
+import com.nextcloud.talk.newarch.features.account.ServerEntryView
 import com.nextcloud.talk.newarch.features.conversationsList.ConversationsListView
 import com.nextcloud.talk.newarch.local.models.UserNgEntity
 import com.nextcloud.talk.utils.ConductorRemapping
@@ -90,7 +91,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
                 } else {
                     runOnUiThread {
                         router!!.setRoot(
-                                RouterTransaction.with(ServerSelectionController())
+                                RouterTransaction.with(ServerEntryView())
                                         .pushChangeHandler(HorizontalChangeHandler())
                                         .popChangeHandler(HorizontalChangeHandler())
                         )

app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt

@@ -47,6 +47,7 @@ import com.nextcloud.talk.models.database.UserEntity
 import com.nextcloud.talk.models.json.capabilities.Capabilities
 import com.nextcloud.talk.models.json.push.PushConfigurationState
 import com.nextcloud.talk.newarch.di.module.*
+import com.nextcloud.talk.newarch.features.account.di.module.AccountModule
 import com.nextcloud.talk.newarch.features.conversationsList.di.module.ConversationsListModule
 import com.nextcloud.talk.newarch.local.dao.UsersDao
 import com.nextcloud.talk.newarch.local.models.UserNgEntity
@@ -180,7 +181,7 @@ class NextcloudTalkApplication : Application(), LifecycleObserver {
         startKoin {
             androidContext(this@NextcloudTalkApplication)
             androidLogger()
-            modules(listOf(CommunicationModule, StorageModule, NetworkModule, ConversationsModule, ConversationsListModule, ServiceModule))
+            modules(listOf(CommunicationModule, StorageModule, NetworkModule, ConversationsModule, ConversationsListModule, ServiceModule, AccountModule, ServerModule))
         }
     }
 

app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt

@@ -640,12 +640,12 @@ class SettingsController : BaseController() {
                             messageText!!.text = resources!!.getString(R.string.nc_settings_wrong_account)
                             messageView!!.visibility = View.VISIBLE
                             messageText!!.setTextColor(resources!!.getColor(R.color.colorPrimary))
-                            messageText!!.text = resources!!.getString(R.string.nc_Server_account_imported)
+                            messageText!!.text = resources!!.getString(R.string.nc_server_account_imported)
                             messageView!!.visibility = View.VISIBLE
                         }
                         ApplicationWideMessageHolder.MessageType.ACCOUNT_WAS_IMPORTED -> {
                             messageText!!.setTextColor(resources!!.getColor(R.color.colorPrimary))
-                            messageText!!.text = resources!!.getString(R.string.nc_Server_account_imported)
+                            messageText!!.text = resources!!.getString(R.string.nc_server_account_imported)
                             messageView!!.visibility = View.VISIBLE
                         }
                         ApplicationWideMessageHolder.MessageType.FAILED_TO_IMPORT_ACCOUNT -> {

app/src/main/java/com/nextcloud/talk/newarch/di/module/ConversationsModule.kt

@@ -18,7 +18,6 @@ val ConversationsModule = module {
     single { createDeleteConversationUseCase(get(), get()) }
     single { createJoinConversationUseCase(get(), get()) }
     single { createExitConversationUseCase(get(), get()) }
-
     factory { createChatViewModelFactory(get(), get(), get(), get(), get(), get()) }
 }
 

app/src/main/java/com/nextcloud/talk/newarch/di/module/ServerModule.kt

@@ -0,0 +1,16 @@
+package com.nextcloud.talk.newarch.di.module
+
+import com.nextcloud.talk.newarch.data.source.remote.ApiErrorHandler
+import com.nextcloud.talk.newarch.domain.repository.online.NextcloudTalkRepository
+import com.nextcloud.talk.newarch.domain.usecases.GetCapabilitiesUseCase
+import org.koin.dsl.module
+
+val ServerModule = module {
+    single { createGetCapabilitiesUseCase(get(), get()) }
+}
+
+fun createGetCapabilitiesUseCase(nextcloudTalkRepository: NextcloudTalkRepository,
+                                 apiErrorHandler: ApiErrorHandler
+): GetCapabilitiesUseCase {
+    return GetCapabilitiesUseCase(nextcloudTalkRepository, apiErrorHandler)
+}

app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryCapabilitiesCheckState.kt

@@ -22,9 +22,14 @@
 
 package com.nextcloud.talk.newarch.features.account
 
+import kotlinx.serialization.Serializable
+
 enum class ServerEntryCapabilitiesCheckState {
     WAITING_FOR_INPUT,
     CHECKING,
     SERVER_UNSUPPORTED,
     SERVER_SUPPORTED
-}
+}
+
+@Serializable
+data class ServerEntryCapabilitiesCheckStateWrapper(val checkState: ServerEntryCapabilitiesCheckState, val url: String?)

app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryView.kt

@@ -22,19 +22,27 @@
 
 package com.nextcloud.talk.newarch.features.account
 
+import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
+import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.Observer
+import com.bluelinelabs.conductor.RouterTransaction
+import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
 import com.nextcloud.talk.R
 import com.nextcloud.talk.newarch.conversationsList.mvp.BaseView
+import com.nextcloud.talk.utils.bundle.BundleKeys
 import kotlinx.android.synthetic.main.server_entry_view.view.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
 
 class ServerEntryView : BaseView() {
     private lateinit var viewModel: ServerEntryViewModel
-    val factory: ServerEntryVideModelFactory by inject()
+    val factory: ServerEntryViewModelFactory by inject()
 
     override fun getLayoutId(): Int {
         return R.layout.server_entry_view
@@ -46,32 +54,71 @@ class ServerEntryView : BaseView() {
         viewModel = viewModelProvider(factory).get(ServerEntryViewModel::class.java)
         val view = super.onCreateView(inflater, container)
 
+        view.serverEntryTextInputEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, resources?.getDrawable(R.drawable.ic_arrow_forward_white_24px), null)
+        view.serverEntryTextInputEditText.compoundDrawables[2].alpha = 99
+
         viewModel.apply {
             checkState.observe(this@ServerEntryView, Observer {
-                when(it) {
+                when(it.checkState) {
                     ServerEntryCapabilitiesCheckState.WAITING_FOR_INPUT -> {
                         view.serverEntryTextInputLayout.isEnabled = true
                         view.serverEntryProgressBar.isVisible = false
-                        view.serverEntryTextInputEditText.setCompoundDrawablesRelative(null, null, resources?.getDrawable(R.drawable.ic_arrow_forward_white_24px), null)
                     }
                     ServerEntryCapabilitiesCheckState.CHECKING -> {
                         view.serverEntryTextInputLayout.isEnabled = false
-                        view.serverEntryTextInputEditText.setCompoundDrawablesRelative(null, null, null, null)
+                        view.serverEntryTextInputEditText.compoundDrawables[2].alpha = 0
                         view.serverEntryProgressBar.isVisible = true
                     }
                     ServerEntryCapabilitiesCheckState.SERVER_SUPPORTED -> {
-
+                        val bundle = Bundle()
+                        bundle.putString(BundleKeys.KEY_BASE_URL, it.url)
+                        //router.pushController(RouterTransaction.with(LoginEntryView(bundle)).popChangeHandler(HorizontalChangeHandler()).pushChangeHandler(HorizontalChangeHandler()))
                     }
                     // Unsupported
                     else -> {
                         view.serverEntryTextInputLayout.isEnabled = true
                         view.serverEntryProgressBar.isVisible = false
-                        view.serverEntryTextInputEditText.setCompoundDrawablesRelative(null, null, resources?.getDrawable(R.drawable.ic_arrow_forward_white_24px), null)
+                        view.serverEntryTextInputLayout.error = resources?.getString(R.string.nc_server_unsupported)
+                        view.serverEntryTextInputEditText.compoundDrawables[2].alpha = 99
                     }
                 }
             })
         }
 
+        view.serverEntryTextInputEditText.doOnTextChanged { text, start, count, after ->
+            view.serverEntryTextInputLayout.error = null
+
+            if (text.isNullOrBlank()) {
+                view.serverEntryTextInputEditText.compoundDrawables[2].alpha = 99
+            } else {
+                view.serverEntryTextInputEditText.compoundDrawables[2].alpha = 255
+            }
+        }
+
+        view.serverEntryTextInputEditText.setOnTouchListener { v, event ->
+            val drawableLeft = 0
+            val drawableTop = 1
+            val drawableRight = 2
+            val drawableBottom = 3
+
+            if(event.action == MotionEvent.ACTION_UP) {
+                if(event.rawX >= (view.serverEntryTextInputEditText.right - view.serverEntryTextInputEditText.compoundDrawables[drawableRight].bounds.width())) {
+                    if (view.serverEntryTextInputEditText.compoundDrawables[drawableRight].alpha == 255) {
+                        view.serverEntryTextInputEditText?.text?.let { serverUrl ->
+                            var baseUrl = serverUrl.toString()
+                            if (!serverUrl.startsWith("http://") && !serverUrl.startsWith("https://")) {
+                                baseUrl = "https://$serverUrl"
+                            }
+                            viewModel.fetchCapabilities(baseUrl)
+                            true
+                        }
+                    }
+                }
+            }
+
+            false
+        }
+
         return view
     }
 }

app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModel.kt

@@ -24,6 +24,7 @@ package com.nextcloud.talk.newarch.features.account
 
 import android.app.Application
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.distinctUntilChanged
 import androidx.lifecycle.viewModelScope
 import com.nextcloud.talk.models.json.capabilities.CapabilitiesOverall
 import com.nextcloud.talk.newarch.conversationsList.mvp.BaseViewModel
@@ -36,22 +37,22 @@ class ServerEntryViewModel constructor(
         application: Application,
         private val getCapabilitiesUseCase: GetCapabilitiesUseCase
 ) : BaseViewModel<ServerEntryView>(application) {
-    val checkState: MutableLiveData<ServerEntryCapabilitiesCheckState> = MutableLiveData(ServerEntryCapabilitiesCheckState.WAITING_FOR_INPUT)
+    val checkState: MutableLiveData<ServerEntryCapabilitiesCheckStateWrapper> = MutableLiveData(ServerEntryCapabilitiesCheckStateWrapper(ServerEntryCapabilitiesCheckState.WAITING_FOR_INPUT, null))
 
     fun fetchCapabilities(url: String) {
-        checkState.postValue(ServerEntryCapabilitiesCheckState.CHECKING)
+        checkState.postValue(ServerEntryCapabilitiesCheckStateWrapper(ServerEntryCapabilitiesCheckState.CHECKING, url))
         getCapabilitiesUseCase.invoke(viewModelScope, parametersOf(url), object : UseCaseResponse<CapabilitiesOverall> {
             override suspend fun onSuccess(result: CapabilitiesOverall) {
                 val hasSupportedTalkVersion = result.ocs?.data?.capabilities?.spreedCapability?.features?.contains("no-ping") == true
                 if (hasSupportedTalkVersion) {
-                    checkState.postValue(ServerEntryCapabilitiesCheckState.SERVER_SUPPORTED)
+                    checkState.postValue(ServerEntryCapabilitiesCheckStateWrapper(ServerEntryCapabilitiesCheckState.SERVER_SUPPORTED, url))
                 } else {
-                    checkState.postValue(ServerEntryCapabilitiesCheckState.SERVER_UNSUPPORTED)
+                    checkState.postValue(ServerEntryCapabilitiesCheckStateWrapper(ServerEntryCapabilitiesCheckState.SERVER_UNSUPPORTED, url))
                 }
             }
 
             override suspend fun onError(errorModel: ErrorModel?) {
-                checkState.postValue(ServerEntryCapabilitiesCheckState.SERVER_UNSUPPORTED)
+                checkState.postValue(ServerEntryCapabilitiesCheckStateWrapper(ServerEntryCapabilitiesCheckState.SERVER_UNSUPPORTED, url))
             }
 
         })

app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModelFactory.kt

@@ -27,7 +27,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.nextcloud.talk.newarch.domain.usecases.GetCapabilitiesUseCase
 
-class ServerEntryVideModelFactory constructor(private val application: Application, private val getCapabilitiesUseCase: GetCapabilitiesUseCase): ViewModelProvider.Factory {
+class ServerEntryViewModelFactory constructor(private val application: Application, private val getCapabilitiesUseCase: GetCapabilitiesUseCase): ViewModelProvider.Factory {
     override fun <T : ViewModel?> create(modelClass: Class<T>): T {
         return ServerEntryViewModel(application, getCapabilitiesUseCase) as T
     }

app/src/main/java/com/nextcloud/talk/newarch/features/account/di/module/AccountModule.kt

@@ -0,0 +1,24 @@
+package com.nextcloud.talk.newarch.features.account.di.module
+
+import android.app.Application
+import com.nextcloud.talk.newarch.domain.usecases.GetCapabilitiesUseCase
+import com.nextcloud.talk.newarch.features.account.ServerEntryViewModelFactory
+import org.koin.android.ext.koin.androidApplication
+import org.koin.dsl.module
+
+val AccountModule = module {
+    factory {
+        createServerEntryViewModelFactory(
+                androidApplication(), get()
+        )
+    }
+}
+
+fun createServerEntryViewModelFactory(
+        application: Application,
+        getCapabilitiesUseCase: GetCapabilitiesUseCase
+): ServerEntryViewModelFactory {
+    return ServerEntryViewModelFactory(
+            application, getCapabilitiesUseCase
+    )
+}

app/src/main/res/layout/server_entry_view.xml

@@ -56,7 +56,6 @@
             android:hint="@string/nc_server_url"
             android:imeOptions="actionDone"
             android:inputType="textUri"
-            android:drawableEnd="@drawable/ic_arrow_forward_white_24px"
             android:paddingTop="20dp"
             android:paddingBottom="20dp"
             android:singleLine="true"

app/src/main/res/values-b+en+001/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Import account from the %1$s app</string>
     <string name="nc_server_import_accounts">Import accounts from the %1$s app</string>
     <string name="nc_server_failed_to_import_account">Failed to import selected account</string>
-    <string name="nc_Server_account_imported">Selected account is now imported and available</string>
+    <string name="nc_server_account_imported">Selected account is now imported and available</string>
     <string name="nc_get_from_provider">Do you not have a server yet?\nClick here to get one from a provider</string>
 
     <!-- Account verification -->

app/src/main/res/values-ca/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">importa el compte des de l\'aplicació %1$s</string>
     <string name="nc_server_import_accounts">importa els comptes des de l\'aplicació %1$s</string>
     <string name="nc_server_failed_to_import_account">Ha fallat la importació del compte seleccionat</string>
-    <string name="nc_Server_account_imported">El compte que heu seleccionat s\'ha importat i ja és disponible</string>
+    <string name="nc_server_account_imported">El compte que heu seleccionat s\'ha importat i ja és disponible</string>
     <string name="nc_get_from_provider">Encara no teniu cap servidor?\nFeu clic aquí per obtenir-ne un d\'un proveïdor</string>
 
     <!-- Account verification -->

app/src/main/res/values-cs-rCZ/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importovat účet z aplikace %1$s</string>
     <string name="nc_server_import_accounts">Importovat účty z aplikace %1$s</string>
     <string name="nc_server_failed_to_import_account">Vyznačený účet se nepodařilo naimportovat</string>
-    <string name="nc_Server_account_imported">Vyznačený účet byl importován a je k dispozici</string>
+    <string name="nc_server_account_imported">Vyznačený účet byl importován a je k dispozici</string>
     <string name="nc_get_from_provider">Nemáte ještě server?\nKliknutím sem ho získejte od poskytovatele</string>
 
     <!-- Account verification -->

app/src/main/res/values-da/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importer konto fra %1$s appen</string>
     <string name="nc_server_import_accounts">Importer konti fra %1$s appen</string>
     <string name="nc_server_failed_to_import_account">Den valgte konto kunne ikke importeres</string>
-    <string name="nc_Server_account_imported">Den valgte konto blev importeret og kan bruges nu</string>
+    <string name="nc_server_account_imported">Den valgte konto blev importeret og kan bruges nu</string>
     <string name="nc_get_from_provider">Har du ikke en server endnu?\nKlik her for at skaffe en udbyder</string>
 
     <!-- Account verification -->

app/src/main/res/values-de/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importieren Sie ein Konto aus der App %1$s</string>
     <string name="nc_server_import_accounts">Importieren Sie Konten aus der App %1$s</string>
     <string name="nc_server_failed_to_import_account">Das Importieren des ausgewählten Kontos ist fehlgeschlagen</string>
-    <string name="nc_Server_account_imported">Das ausgewählte Konto ist nun importiert und verfügbar</string>
+    <string name="nc_server_account_imported">Das ausgewählte Konto ist nun importiert und verfügbar</string>
     <string name="nc_get_from_provider">Sie haben noch keinen Server?\nKlicken Sie hier um Server-Anbieter zu finden</string>
 
     <!-- Account verification -->

app/src/main/res/values-el/strings.xml

@@ -32,7 +32,7 @@
     <string name="nc_server_import_account">Εισαγωγή λογαριασμού από την %1$s εφαρμογή</string>
     <string name="nc_server_import_accounts">Εισαγωγή λογαριασμών από την εφαρμογή %1$s</string>
     <string name="nc_server_failed_to_import_account">Αποτυχία εισαγωγής επιλεγμένου λογαριασμού</string>
-    <string name="nc_Server_account_imported">Ο επιλεγμένος λογαριασμός έχει εισαχθεί και είναι διαθέσιμος</string>
+    <string name="nc_server_account_imported">Ο επιλεγμένος λογαριασμός έχει εισαχθεί και είναι διαθέσιμος</string>
     <string name="nc_get_from_provider">Δεν έχετε ακόμα διακομιστή;\nΚάντε κλικ εδώ για να αποκτήσετε έναν από κάποιον πάροχο</string>
 
     <!-- Account verification -->

app/src/main/res/values-es-rAR/strings.xml

@@ -28,7 +28,7 @@
     <string name="nc_server_import_account_plain">Importar cuenta</string>
     <string name="nc_server_import_accounts_plain">Importar cuentas</string>
     <string name="nc_server_failed_to_import_account">Error al importar la cuenta seleccionada</string>
-    <string name="nc_Server_account_imported">La cuenta seleccionada ahora está importada y disponible</string>
+    <string name="nc_server_account_imported">La cuenta seleccionada ahora está importada y disponible</string>
     <string name="nc_get_from_provider">Aún no tiene un servidor? \nHaga click aquí para obtener uno de un proveedor</string>
 
     <!-- Account verification -->

app/src/main/res/values-es-rCL/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importar cuenta de la aplicación %1$s</string>
     <string name="nc_server_import_accounts">Importar cuentas de la aplicación %1$s</string>
     <string name="nc_server_failed_to_import_account">Se presentó una falla al importar la cuenta seleccionada</string>
-    <string name="nc_Server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
+    <string name="nc_server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
     <string name="nc_get_from_provider">¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor</string>
 
     <!-- Account verification -->

app/src/main/res/values-es-rCO/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importar cuenta de la aplicación %1$s</string>
     <string name="nc_server_import_accounts">Importar cuentas de la aplicación %1$s</string>
     <string name="nc_server_failed_to_import_account">Se presentó una falla al importar la cuenta seleccionada</string>
-    <string name="nc_Server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
+    <string name="nc_server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
     <string name="nc_get_from_provider">¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor</string>
 
     <!-- Account verification -->

app/src/main/res/values-es-rCR/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importar cuenta de la aplicación %1$s</string>
     <string name="nc_server_import_accounts">Importar cuentas de la aplicación %1$s</string>
     <string name="nc_server_failed_to_import_account">Se presentó una falla al importar la cuenta seleccionada</string>
-    <string name="nc_Server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
+    <string name="nc_server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
     <string name="nc_get_from_provider">¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor</string>
 
     <!-- Account verification -->

app/src/main/res/values-es-rDO/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importar cuenta de la aplicación %1$s</string>
     <string name="nc_server_import_accounts">Importar cuentas de la aplicación %1$s</string>
     <string name="nc_server_failed_to_import_account">Se presentó una falla al importar la cuenta seleccionada</string>
-    <string name="nc_Server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
+    <string name="nc_server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
     <string name="nc_get_from_provider">¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor</string>
 
     <!-- Account verification -->

app/src/main/res/values-es-rEC/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importar cuenta de la aplicación %1$s</string>
     <string name="nc_server_import_accounts">Importar cuentas de la aplicación %1$s</string>
     <string name="nc_server_failed_to_import_account">Se presentó una falla al importar la cuenta seleccionada</string>
-    <string name="nc_Server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
+    <string name="nc_server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
     <string name="nc_get_from_provider">¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor</string>
 
     <!-- Account verification -->

app/src/main/res/values-es-rGT/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importar cuenta de la aplicación %1$s</string>
     <string name="nc_server_import_accounts">Importar cuentas de la aplicación %1$s</string>
     <string name="nc_server_failed_to_import_account">Se presentó una falla al importar la cuenta seleccionada</string>
-    <string name="nc_Server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
+    <string name="nc_server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
     <string name="nc_get_from_provider">¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor</string>
 
     <!-- Account verification -->

app/src/main/res/values-es-rMX/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importar cuenta de la aplicación %1$s</string>
     <string name="nc_server_import_accounts">Importar cuentas de la aplicación %1$s</string>
     <string name="nc_server_failed_to_import_account">Se presentó una falla al importar la cuenta seleccionada</string>
-    <string name="nc_Server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
+    <string name="nc_server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
     <string name="nc_get_from_provider">¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor</string>
 
     <!-- Account verification -->

app/src/main/res/values-es-rSV/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importar cuenta de la aplicación %1$s</string>
     <string name="nc_server_import_accounts">Importar cuentas de la aplicación %1$s</string>
     <string name="nc_server_failed_to_import_account">Se presentó una falla al importar la cuenta seleccionada</string>
-    <string name="nc_Server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
+    <string name="nc_server_account_imported">La cuenta seleccionada ha sido importada y está disponible</string>
     <string name="nc_get_from_provider">¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor</string>
 
     <!-- Account verification -->

app/src/main/res/values-es/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importar cuenta desde la app %1$s</string>
     <string name="nc_server_import_accounts">Importar cuentas desde la app %1$s</string>
     <string name="nc_server_failed_to_import_account">No se ha podido importar la cuenta seleccionada</string>
-    <string name="nc_Server_account_imported">La cuenta seleccionada ha sido importada y ya está disponible</string>
+    <string name="nc_server_account_imported">La cuenta seleccionada ha sido importada y ya está disponible</string>
     <string name="nc_get_from_provider">¿No tienes todavía un servidor?\nClic aquí para conseguir uno de un proveedor</string>
 
     <!-- Account verification -->

app/src/main/res/values-fi-rFI/strings.xml

@@ -30,7 +30,7 @@
     <string name="nc_server_import_account_plain">Tuo tili</string>
     <string name="nc_server_import_accounts_plain">Tuo tilejä</string>
     <string name="nc_server_failed_to_import_account">Valitun tilin tuominen epäonnistui</string>
-    <string name="nc_Server_account_imported">Valittu tili on nyt tuotu ja käytettävissä</string>
+    <string name="nc_server_account_imported">Valittu tili on nyt tuotu ja käytettävissä</string>
     <string name="nc_nextcloud_talk_app_not_installed">Sovellusta %1$s ei ole asennettu, keskeytetään</string>
     <string name="nc_search">Etsi</string>
     <string name="nc_certificate_dialog_title">Tarkista varmenne</string>

app/src/main/res/values-fr/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importer le compte depuis l\'application %1$s</string>
     <string name="nc_server_import_accounts">Importer les comptes depuis l\'application %1$s</string>
     <string name="nc_server_failed_to_import_account">Échec lors de l\'importation des comptes sélectionnés</string>
-    <string name="nc_Server_account_imported">Le compte sélectionné est maintenant importé et disponible</string>
+    <string name="nc_server_account_imported">Le compte sélectionné est maintenant importé et disponible</string>
     <string name="nc_get_from_provider">Vous n\'avez pas encore de serveur?\nCliquez-ici pour en obtenir un chez un fournisseur d\'accès.</string>
 
     <!-- Account verification -->

app/src/main/res/values-gl/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importar unha conta dende a aplicación %1$s</string>
     <string name="nc_server_import_accounts">Importar contas dende a aplicación%1$s</string>
     <string name="nc_server_failed_to_import_account">Produciuse un fallo ao importar a conta seleccionada</string>
-    <string name="nc_Server_account_imported">A conta seleccionada foi importada e xa está dispoñíbel</string>
+    <string name="nc_server_account_imported">A conta seleccionada foi importada e xa está dispoñíbel</string>
     <string name="nc_get_from_provider">Aínda non ten un servidor? \nPrema aquí para obter un dun provedo</string>
 
     <!-- Account verification -->

app/src/main/res/values-hr/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Uvezi račun iz %1$s aplikacije</string>
     <string name="nc_server_import_accounts">Uvezi račune iz %1$s aplikacije</string>
     <string name="nc_server_failed_to_import_account">Uvoz odabranog računa nije uspio</string>
-    <string name="nc_Server_account_imported">Odabrani račun sad je uvezen i dostupan</string>
+    <string name="nc_server_account_imported">Odabrani račun sad je uvezen i dostupan</string>
     <string name="nc_get_from_provider">Nemate poslužitelj?\nKliknite ovdje kako biste ga dobili od davatelja usluge</string>
 
     <!-- Account verification -->

app/src/main/res/values-hu-rHU/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Fiók importálása a(z) %1$s alkalmazásból</string>
     <string name="nc_server_import_accounts">Fiókok importálása a(z) %1$s alkalmazásból</string>
     <string name="nc_server_failed_to_import_account">A kiválasztott fiók importálása sikertelen</string>
-    <string name="nc_Server_account_imported">A kiválasztott fiók importálva lett és elérhető</string>
+    <string name="nc_server_account_imported">A kiválasztott fiók importálva lett és elérhető</string>
     <string name="nc_get_from_provider">Nincs még saját kiszolgálója?\nKattintson ide a beszerzéshez az egyik szolgáltatótól</string>
 
     <!-- Account verification -->

app/src/main/res/values-is/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Flytja inn aðgang úr %1$s forritinu</string>
     <string name="nc_server_import_accounts">Flytja inn aðganga úr %1$s forritinu</string>
     <string name="nc_server_failed_to_import_account">Mistókst að flytja inn valinn notandaaðgang</string>
-    <string name="nc_Server_account_imported">Valinn aðgangur er núna fluttur inn og tiltækur</string>
+    <string name="nc_server_account_imported">Valinn aðgangur er núna fluttur inn og tiltækur</string>
     <string name="nc_get_from_provider">Ertu ekki enn með skýjaþjón?\nSmelltu hér til að fá þér einn frá þjónustuaðila.</string>
 
     <!-- Account verification -->

app/src/main/res/values-it/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importa account dall\'applicazione %1$s</string>
     <string name="nc_server_import_accounts">Importa account dall\'applicazione %1$s</string>
     <string name="nc_server_failed_to_import_account">Importazione dell\'account selezionato non riuscita</string>
-    <string name="nc_Server_account_imported">L\'account selezionato è ora importato e disponibile</string>
+    <string name="nc_server_account_imported">L\'account selezionato è ora importato e disponibile</string>
     <string name="nc_get_from_provider">Non hai ancora un server?\nFai clic qui per ottenerne uno da un fornitore</string>
 
     <!-- Account verification -->

app/src/main/res/values-iw/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">ייבוא חשבון מהיישומון %1$s</string>
     <string name="nc_server_import_accounts">ייבוא חשבונות מהיישומון %1$s</string>
     <string name="nc_server_failed_to_import_account">ייבוא החשבון הנבחר נכשל</string>
-    <string name="nc_Server_account_imported">החשבון שנבחר עבר ייבוא והוא זמין</string>
+    <string name="nc_server_account_imported">החשבון שנבחר עבר ייבוא והוא זמין</string>
     <string name="nc_get_from_provider">עדיין אין לך שרת?\nניתן ללחוץ כאן ולקבל אחת מספק</string>
 
     <!-- Account verification -->

app/src/main/res/values-ja-rJP/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">%1$sアプリからアカウントをインポートする</string>
     <string name="nc_server_import_accounts">%1$sアプリからアカウントをインポートする</string>
     <string name="nc_server_failed_to_import_account">選択したアカウントのインポートに失敗しました</string>
-    <string name="nc_Server_account_imported">選択したアカウントがインポートされ、使用可能になりました</string>
+    <string name="nc_server_account_imported">選択したアカウントがインポートされ、使用可能になりました</string>
     <string name="nc_get_from_provider">まだサーバーがありませんか？\ nプロバイダーから取得するにはここをクリックしてください</string>
 
     <!-- Account verification -->

app/src/main/res/values-ko/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">%1$s 앱에서 계정 가져오기</string>
     <string name="nc_server_import_accounts">%1$s 앱에서 계정 가져오기</string>
     <string name="nc_server_failed_to_import_account">선택한 계정을 가져올 수 없음</string>
-    <string name="nc_Server_account_imported">선택한 계정을 가져왔고 사용할 수 있음</string>
+    <string name="nc_server_account_imported">선택한 계정을 가져왔고 사용할 수 있음</string>
     <string name="nc_get_from_provider">서버가 없으신가요?\n공급자를 알아보려면 누르십시오</string>
 
     <!-- Account verification -->

app/src/main/res/values-lt-rLT/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importuoti paskyrą iš programėlės %1$s</string>
     <string name="nc_server_import_accounts">Importuoti paskyras iš programėlės %1$s</string>
     <string name="nc_server_failed_to_import_account">Nepavyko importuoti pasirinktą paskyrą</string>
-    <string name="nc_Server_account_imported">Dabar, pasirinkta paskyra yra importuota ir prieinama</string>
+    <string name="nc_server_account_imported">Dabar, pasirinkta paskyra yra importuota ir prieinama</string>
     <string name="nc_get_from_provider">Neturite serverio? Spauskite čia, kad galėtumėte pasirinkti vieną iš paslaugų teikėjų</string>
 
     <string name="nc_search">Ieškoti</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importer konto fra %1$s-appen</string>
     <string name="nc_server_import_accounts">Importer kontoer fra %1$s-appen</string>
     <string name="nc_server_failed_to_import_account">Klarte ikke å importere valgt konto</string>
-    <string name="nc_Server_account_imported">Valgt konto er nå importert og tilgjengelig</string>
+    <string name="nc_server_account_imported">Valgt konto er nå importert og tilgjengelig</string>
     <string name="nc_get_from_provider">Har du ingen server enda?\nKlikk her for å opprette en hos en tilbyder</string>
 
     <!-- Account verification -->

app/src/main/res/values-nl/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importeren account van de %1$sapp</string>
     <string name="nc_server_import_accounts">Importeren accounts van de %1$sapp</string>
     <string name="nc_server_failed_to_import_account">Kon het geselecteerde account niet importeren</string>
-    <string name="nc_Server_account_imported">Het geselecteerde account is nu geïmporteerd en beschikbaar</string>
+    <string name="nc_server_account_imported">Het geselecteerde account is nu geïmporteerd en beschikbaar</string>
     <string name="nc_get_from_provider">Heb je nog geen server?\n
 Kies er eentje van een provider.</string>
 

app/src/main/res/values-pl/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importuj konto z aplikacji %1$s</string>
     <string name="nc_server_import_accounts">Importuj konta z aplikacji %1$s</string>
     <string name="nc_server_failed_to_import_account">Nie udało się zaimportować wybranego konta</string>
-    <string name="nc_Server_account_imported">Wybrane konto jest zaimportowane i dostępne</string>
+    <string name="nc_server_account_imported">Wybrane konto jest zaimportowane i dostępne</string>
     <string name="nc_get_from_provider">Nie masz jeszcze serwera?\nKliknij tutaj, aby uzyskać jeden od dostawcy</string>
 
     <!-- Account verification -->

app/src/main/res/values-pt-rBR/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importar conta do aplicativo %1$s</string>
     <string name="nc_server_import_accounts">Importar contas do aplicativo %1$s</string>
     <string name="nc_server_failed_to_import_account">Falha ao importar a conta</string>
-    <string name="nc_Server_account_imported">A conta selecionada foi importada e está disponível</string>
+    <string name="nc_server_account_imported">A conta selecionada foi importada e está disponível</string>
     <string name="nc_get_from_provider">Não tem servidor ainda?\nClique aqui para obter um</string>
 
     <!-- Account verification -->

app/src/main/res/values-pt-rPT/strings.xml

@@ -29,7 +29,7 @@
     <string name="nc_server_import_account">Importar conta da aplicação %1$s</string>
     <string name="nc_server_import_accounts">Importar contas da aplicação %1$s</string>
     <string name="nc_server_failed_to_import_account">Não foi possível importar a conta selecionada</string>
-    <string name="nc_Server_account_imported">A conta selecionada foi importada e está disponível</string>
+    <string name="nc_server_account_imported">A conta selecionada foi importada e está disponível</string>
     <string name="nc_get_from_provider">Ainda não tem um servidor?\nClique aqui para obter um de um fornecedor</string>
 
     <!-- Account verification -->

app/src/main/res/values-ru/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Импортировать учётную запись из приложения %1$s </string>
     <string name="nc_server_import_accounts">Импортировать учётные записи из приложения %1$s </string>
     <string name="nc_server_failed_to_import_account">Не удалось импортировать выбранную учётную запись</string>
-    <string name="nc_Server_account_imported">Выбранная учётная запись теперь доступна</string>
+    <string name="nc_server_account_imported">Выбранная учётная запись теперь доступна</string>
     <string name="nc_get_from_provider">Нет своего сервера?\nНажмите здесь чтобы заказать у провайдера</string>
 
     <!-- Account verification -->

app/src/main/res/values-sk-rSK/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importovať účet z aplikácie %1$s</string>
     <string name="nc_server_import_accounts">Importovať účty z aplikácie %1$s</string>
     <string name="nc_server_failed_to_import_account">Nepodarilo sa importovať vybrané kontá</string>
-    <string name="nc_Server_account_imported">Vybrané účty sú teraz importované a dostupné</string>
+    <string name="nc_server_account_imported">Vybrané účty sú teraz importované a dostupné</string>
     <string name="nc_get_from_provider">Ešte nemáte server? \nKliknite sem a získajte jeden od poskytovateľa</string>
 
     <!-- Account verification -->

app/src/main/res/values-sl/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Uvozi račun iz %1$s</string>
     <string name="nc_server_import_accounts">Uvozi račune iz %1$s</string>
     <string name="nc_server_failed_to_import_account">Uvoz izbranega računa je spodletel</string>
-    <string name="nc_Server_account_imported">Izbran račun je uvožen in na voljo za uporabo</string>
+    <string name="nc_server_account_imported">Izbran račun je uvožen in na voljo za uporabo</string>
     <string name="nc_get_from_provider">Še nimate izbranega oziroma nameščenega strežnika? Kliknite in si pridobite dostop.</string>
 
     <!-- Account verification -->

app/src/main/res/values-sq/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importoni llogarinë nga %1$s aplikacioni</string>
     <string name="nc_server_import_accounts">Importoni llogaritë nga %1$s aplikacioni</string>
     <string name="nc_server_failed_to_import_account">Dështoi të importonte llogarinë e përzgjedhur</string>
-    <string name="nc_Server_account_imported">Llogaria e përzgjedhur është tani e importuar dhe në dispozicion</string>
+    <string name="nc_server_account_imported">Llogaria e përzgjedhur është tani e importuar dhe në dispozicion</string>
     <string name="nc_get_from_provider">Akoma nuk ke një server ?\nKliko këtu për të marrë një nga një ofrues </string>
 
     <string name="nc_display_name_not_fetched">Emri i shfaqur nuk mund të merret, ndërpritet</string>

app/src/main/res/values-sr/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Увези налог из апликације %1$s</string>
     <string name="nc_server_import_accounts">Увези налоге из апликације %1$s</string>
     <string name="nc_server_failed_to_import_account">Грешка при учитавању одабраног налога</string>
-    <string name="nc_Server_account_imported">Одабрани налог је сада увезен и доступан</string>
+    <string name="nc_server_account_imported">Одабрани налог је сада увезен и доступан</string>
     <string name="nc_get_from_provider">Имате ли сервер?nКликните овде да направите један код провајдера</string>
 
     <!-- Account verification -->

app/src/main/res/values-sv/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Importera konton från %1$s-appen</string>
     <string name="nc_server_import_accounts">Importera konton från %1$s-appen</string>
     <string name="nc_server_failed_to_import_account">Misslyckades att importera valt konto</string>
-    <string name="nc_Server_account_imported">Valt konto är nu importerat och tillgängligt</string>
+    <string name="nc_server_account_imported">Valt konto är nu importerat och tillgängligt</string>
     <string name="nc_get_from_provider">Har du inte en server än?\nKlicka här för att få en från en leverantör</string>
 
     <!-- Account verification -->

app/src/main/res/values-tr/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">%1$s uygulamasındaki hesabı içe aktar</string>
     <string name="nc_server_import_accounts">%1$s uygulamasındaki hesapları içe aktar</string>
     <string name="nc_server_failed_to_import_account">Seçilmiş hesap içe aktarılamadı</string>
-    <string name="nc_Server_account_imported">Seçilmiş hesap içe aktarıldı ve kullanılabilir</string>
+    <string name="nc_server_account_imported">Seçilmiş hesap içe aktarıldı ve kullanılabilir</string>
     <string name="nc_get_from_provider">Henüz bir sunucunuz yok mu?\Listeden bir hizmet sağlayıcısı seçebilirsiniz</string>
 
     <!-- Account verification -->

app/src/main/res/values-vi/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">Thêm tài khoản từ ứng dụng %1$s</string>
     <string name="nc_server_import_accounts">Thêm tài khoản từ ứng dụng %1$s</string>
     <string name="nc_server_failed_to_import_account">Lỗi thêm tài khoản đã chọn</string>
-    <string name="nc_Server_account_imported">Bây giờ chọn tài khoản thêm vào và đang cho phép</string>
+    <string name="nc_server_account_imported">Bây giờ chọn tài khoản thêm vào và đang cho phép</string>
     <string name="nc_get_from_provider">Bạn đã có một máy chủ chưa?\nBấm vào đây để tìm từ một nhà cung cấp.</string>
 
     <!-- Account verification -->

app/src/main/res/values-zh-rCN/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">从 %1$s 应用导入账号</string>
     <string name="nc_server_import_accounts">从 %1$s 应用导入账号</string>
     <string name="nc_server_failed_to_import_account">选择的账号导入失败</string>
-    <string name="nc_Server_account_imported">所选账号现已导入并可立即使用</string>
+    <string name="nc_server_account_imported">所选账号现已导入并可立即使用</string>
     <string name="nc_get_from_provider">还没有服务器吗？\n点此查看供应商</string>
 
     <!-- Account verification -->

app/src/main/res/values-zh-rTW/strings.xml

@@ -33,7 +33,7 @@
     <string name="nc_server_import_account">從%1$s應用程式匯入帳戶</string>
     <string name="nc_server_import_accounts">從%1$s應用程式匯入帳戶</string>
     <string name="nc_server_failed_to_import_account">無法匯入所選的帳戶</string>
-    <string name="nc_Server_account_imported">選擇已匯入且可用的帳戶</string>
+    <string name="nc_server_account_imported">選擇已匯入且可用的帳戶</string>
     <string name="nc_get_from_provider">您沒有自己的伺服器嗎？\n點這裡向服務供應商購買</string>
 
     <!-- Account verification -->

app/src/main/res/values/strings.xml

@@ -33,7 +33,8 @@
     <string name="nc_server_import_account">Import account from the %1$s app</string>
     <string name="nc_server_import_accounts">Import accounts from the %1$s app</string>
     <string name="nc_server_failed_to_import_account">Failed to import selected account</string>
-    <string name="nc_Server_account_imported">Selected account is now imported and available</string>
+    <string name="nc_server_account_imported">Selected account is now imported and available</string>
+    <string name="nc_server_unsupported">Server does not have supported Talk app installed</string>
     <string name="nc_get_from_provider">Do you not have a server yet?\nClick here to get one from a provider</string>
 
     <!-- Account verification -->