diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/AddAccountDialog.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/AddAccountDialog.kt index 632cd4b5..9b3f1e3c 100644 --- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/AddAccountDialog.kt +++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/AddAccountDialog.kt @@ -1,7 +1,5 @@ package net.dankito.banking.ui.android.dialogs -import android.content.Context -import android.content.DialogInterface import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle @@ -11,7 +9,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.EditText -import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.DialogFragment @@ -135,8 +132,6 @@ open class AddAccountDialog : DialogFragment() { context?.let { context -> if (response.successful) { this.dismiss() - - showMessageForSuccessfullyAddedAccount(context, response) } else { AlertDialog.Builder(context) @@ -147,35 +142,6 @@ open class AddAccountDialog : DialogFragment() { } } - protected open fun showMessageForSuccessfullyAddedAccount(context: Context, response: AddAccountResponse) { - val view = createSuccessfullyAddedAccountView(context, response) - - AlertDialog.Builder(context) - .setView(view) - .setPositiveButton(R.string.fetch) { dialog, _ -> retrieveAccountTransactionsAndDismiss(response, dialog) } - .setNeutralButton(R.string.no) { dialog, _ -> dialog.dismiss() } - .show() - } - - protected open fun createSuccessfullyAddedAccountView(context: Context, response: AddAccountResponse): View? { - - val messageId = if (response.supportsRetrievingTransactionsOfLast90DaysWithoutTan) - R.string.dialog_add_account_message_successfully_added_account_support_retrieving_transactions_of_last_90_days_without_tan - else R.string.dialog_add_account_message_successfully_added_account - - val view = context.asActivity()?.layoutInflater?.inflate(R.layout.view_successfully_added_account, null) - - view?.findViewById(R.id.txtSuccessfullyAddedAccountMessage)?.setText(messageId) - - return view - } - - protected open fun retrieveAccountTransactionsAndDismiss(response: AddAccountResponse, messageDialog: DialogInterface) { - presenter.fetchAllAccountTransactionsAsync(response.customer) { } - - messageDialog.dismiss() - } - protected val otherEditTextChangedWatcher = object : TextWatcher { diff --git a/ui/BankingAndroidApp/src/main/res/layout/view_successfully_added_account.xml b/ui/BankingAndroidApp/src/main/res/layout/view_successfully_added_account.xml deleted file mode 100644 index 61373fe4..00000000 --- a/ui/BankingAndroidApp/src/main/res/layout/view_successfully_added_account.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml index e2d42434..c49f97e6 100644 --- a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml +++ b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml @@ -6,7 +6,6 @@ Ja Nein - Abrufen Speichern Verwerfen @@ -46,15 +45,6 @@ Hinzufügen %s untersützt FinTS 3.0 nicht und kann deshalb mit dieser App nicht verwendet werden. Konto konnte nicht hinzugefügt werden.\n\nFehlermeldung Ihrer Bank:\n\n%s - - Konto erfolgreich hinzugefügt. - \n\nMöchten Sie nun die Kontoumsätze dieses Kontos abrufen? Hierfür muss eine TAN eingegeben werden. - - - Konto erfolgreich hinzugefügt. - \n\nKontoumsätze der letzten 90 Tage konnten ohne TAN abgerufen werden. - \n\nMöchten Sie nun alle Kontoumsätze abrufen? Hierfür muss eine TAN eingegeben werden. - Konto: Name: diff --git a/ui/BankingAndroidApp/src/main/res/values/strings.xml b/ui/BankingAndroidApp/src/main/res/values/strings.xml index 47feef43..96f36d4e 100644 --- a/ui/BankingAndroidApp/src/main/res/values/strings.xml +++ b/ui/BankingAndroidApp/src/main/res/values/strings.xml @@ -6,7 +6,6 @@ Yes No - Fetch Save Discard @@ -46,15 +45,6 @@ Add %s does not support FinTS 3.0 and therefore cannot be used in this application. Could not add account.\n\nError message from your bank:\n\n%s - - Successfully added account. - \n\nWould you like to fetch this account\'s transactions now? For this entering a TAN is required. - - - Successfully added account. - \n\nAccount transactions of last 90 days could be retrieved without a TAN. - \n\nWould you like to fetch all account transactions now? For this entering a TAN is required. - Account: Name: