diff --git a/app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt
index 2250849b..aba35580 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt
+++ b/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.setMessage(getString(R.string.login_querying_server))
+ progress.setTitle(R.string.setting_up_encryption)
+ progress.setMessage(getString(R.string.setting_up_encryption_content))
progress.isIndeterminate = true
progress.setCanceledOnTouchOutside(false)
isCancelable = false
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/CreateAccountFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/CreateAccountFragment.kt
index be50ec8f..5b9b0b2f 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/CreateAccountFragment.kt
+++ b/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.setMessage(getString(R.string.login_encryption_setup))
+ progress.setTitle(R.string.setting_up_encryption)
+ progress.setMessage(getString(R.string.setting_up_encryption_content))
progress.isIndeterminate = true
progress.setCanceledOnTouchOutside(false)
isCancelable = false
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/DetectConfigurationFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/DetectConfigurationFragment.kt
index 9f7e732c..28059cac 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/DetectConfigurationFragment.kt
+++ b/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.setMessage(getString(R.string.login_querying_server))
+ progress.setTitle(R.string.setting_up_encryption)
+ 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)
- .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)
- }
+ .setMessage(requireArguments().getString(KEY_LOGS))
.setPositiveButton(android.R.string.ok) { dialog, which ->
// dismiss
}
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt
index 1e18dac7..0887276e 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt
+++ b/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.setMessage(getString(R.string.login_querying_server))
+ progress.setTitle(R.string.setting_up_encryption)
+ 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 ->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7754e26a..0af276f3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -188,4 +188,4 @@
EteSync: Verbindungs-Sicherheit
EteSync hat ein unbekanntes Zertifikat vorgefunden. Wollen Sie ihm vertrauen?
Ausführliche Protokollierung
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index d87687e2..905d54f3 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -197,7 +197,8 @@
Kunne ikke logge inn (sannsynligvis feil brukernavn eller passord).\nHar du registrert deg?
Vis logger
Setter opp kryptering
- Vent, setter opp kryptering …
+ Vennligst vent, setter opp kryptering…
+
Kunne ikke opprette konto
Feil krypteringspassord
Mottok en integritetsfeil ved tilgang til kontoen din, noe som mest sannsynlig skyldes at du skrev inn feil krypteringspassord.
@@ -361,4 +362,4 @@
Foretrekk Tasks.org-gjøremålstilbyder
Synkroniser
Manglende tilganger: %s
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d356872e..cdb244e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -244,8 +244,6 @@
This is your login password, *not* your encryption password!
Forgot password?
- Configuration detection
- Please wait, querying server…
Couldn\'t authenticate (probably wrong username or password).\nHave you registered?
View logs