Login and signup: improve dialog text.

app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt

@@ -152,8 +152,8 @@ class SignupDoFragment(private val signupCredentials: SignupCredentials) : Dialo
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val progress = ProgressDialog(activity)
-        progress.setTitle(R.string.login_configuration_detection)
+        progress.setTitle(R.string.setting_up_encryption)
-        progress.setMessage(getString(R.string.login_querying_server))
+        progress.setMessage(getString(R.string.setting_up_encryption_content))
         progress.isIndeterminate = true
         progress.setCanceledOnTouchOutside(false)
         isCancelable = false

app/src/main/java/com/etesync/syncadapter/ui/setup/CreateAccountFragment.kt

@@ -13,20 +13,12 @@ import android.accounts.AccountManager
 import android.app.Activity
 import android.app.Dialog
 import android.app.ProgressDialog
-import android.content.Context
-import android.os.AsyncTask
 import android.os.Bundle
 import android.provider.CalendarContract
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import at.bitfire.ical4android.TaskProvider.Companion.OPENTASK_PROVIDERS
-import com.etesync.journalmanager.Crypto
-import com.etesync.journalmanager.Exceptions
 import com.etesync.syncadapter.*
 import com.etesync.syncadapter.log.Logger
-import com.etesync.syncadapter.model.CollectionInfo
-import com.etesync.syncadapter.model.JournalEntity
-import com.etesync.syncadapter.model.ServiceEntity
 import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder.Configuration
 import com.etesync.syncadapter.utils.AndroidCompat
 import com.etesync.syncadapter.utils.TaskProviderHandling
@@ -36,8 +28,8 @@ class CreateAccountFragment : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val progress = ProgressDialog(activity)
-        progress.setTitle(R.string.login_encryption_setup_title)
+        progress.setTitle(R.string.setting_up_encryption)
-        progress.setMessage(getString(R.string.login_encryption_setup))
+        progress.setMessage(getString(R.string.setting_up_encryption_content))
         progress.isIndeterminate = true
         progress.setCanceledOnTouchOutside(false)
         isCancelable = false

app/src/main/java/com/etesync/syncadapter/ui/setup/DetectConfigurationFragment.kt

@@ -28,8 +28,8 @@ class DetectConfigurationFragment : DialogFragment(), LoaderManager.LoaderCallba
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val progress = ProgressDialog(activity)
-        progress.setTitle(R.string.login_configuration_detection)
+        progress.setTitle(R.string.setting_up_encryption)
-        progress.setMessage(getString(R.string.login_querying_server))
+        progress.setMessage(getString(R.string.setting_up_encryption_content))
         progress.isIndeterminate = true
         progress.setCanceledOnTouchOutside(false)
         isCancelable = false
@@ -78,14 +78,9 @@ class DetectConfigurationFragment : DialogFragment(), LoaderManager.LoaderCallba
 
         override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
             return AlertDialog.Builder(activity!!)
-                    .setTitle(R.string.login_configuration_detection)
+                    .setTitle(R.string.setting_up_encryption)
                     .setIcon(R.drawable.ic_error_dark)
-                    .setMessage(R.string.login_wrong_username_or_password)
+                    .setMessage(requireArguments().getString(KEY_LOGS))
-                    .setNeutralButton(R.string.login_view_logs) { dialog, which ->
-                        val intent = DebugInfoActivity.newIntent(context, this::class.toString())
-                        intent.putExtra(DebugInfoActivity.KEY_LOGS, requireArguments().getString(KEY_LOGS))
-                        startActivity(intent)
-                    }
                     .setPositiveButton(android.R.string.ok) { dialog, which ->
                         // dismiss
                     }

app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt

@@ -12,7 +12,6 @@ import android.accounts.Account
 import android.app.Dialog
 import android.app.ProgressDialog
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
@@ -32,8 +31,8 @@ class LoginCredentialsChangeFragment : DialogFragment(), LoaderManager.LoaderCal
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val progress = ProgressDialog(activity)
-        progress.setTitle(R.string.login_configuration_detection)
+        progress.setTitle(R.string.setting_up_encryption)
-        progress.setMessage(getString(R.string.login_querying_server))
+        progress.setMessage(getString(R.string.setting_up_encryption_content))
         progress.isIndeterminate = true
         progress.setCanceledOnTouchOutside(false)
         isCancelable = false
@@ -84,7 +83,7 @@ class LoginCredentialsChangeFragment : DialogFragment(), LoaderManager.LoaderCal
 
         override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
             return AlertDialog.Builder(activity!!)
-                    .setTitle(R.string.login_configuration_detection)
+                    .setTitle(R.string.setting_up_encryption)
                     .setIcon(R.drawable.ic_error_dark)
                     .setMessage(R.string.login_wrong_username_or_password)
                     .setNeutralButton(R.string.login_view_logs) { dialog, which ->

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

@@ -197,7 +197,8 @@
     <string name="login_wrong_username_or_password">Kunne ikke logge inn (sannsynligvis feil brukernavn eller passord).\nHar du registrert deg?</string>
     <string name="login_view_logs">Vis logger</string>
     <string name="setting_up_encryption">Setter opp kryptering</string>
-    <string name="setting_up_encryption_content">Vent, setter opp kryptering …</string>
+    <string name="setting_up_encryption_content">Vennligst vent, setter opp kryptering…</string>
+
     <string name="account_creation_failed">Kunne ikke opprette konto</string>
     <string name="wrong_encryption_password">Feil krypteringspassord</string>
     <string name="wrong_encryption_password_content">Mottok en integritetsfeil ved tilgang til kontoen din, noe som mest sannsynlig skyldes at du skrev inn feil krypteringspassord.

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

@@ -244,8 +244,6 @@
     <string name="login_service_details_description">This is your login password, *not* your encryption password!</string>
     <string name="login_forgot_password">Forgot password?</string>
 
-    <string name="login_configuration_detection">Configuration detection</string>
-    <string name="login_querying_server">Please wait, querying server…</string>
     <string name="login_wrong_username_or_password">Couldn\'t authenticate (probably wrong username or password).\nHave you registered?</string>
     <string name="login_view_logs">View logs</string>