From 4e4b4536013376de3658093e01dcc97394f2af92 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sun, 26 Mar 2023 14:51:28 +0200 Subject: [PATCH] just say "Preparing acocunt..." more detailed text about internals, that maybe even flashes up only for a fraction of a second is not helpful after first user tests, and may even scare ppl. --- .../thoughtcrime/securesms/qr/BackupProviderFragment.java | 8 ++------ .../thoughtcrime/securesms/qr/BackupReceiverFragment.java | 5 +---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/org/thoughtcrime/securesms/qr/BackupProviderFragment.java b/src/org/thoughtcrime/securesms/qr/BackupProviderFragment.java index 3a561d5e4..b89343364 100644 --- a/src/org/thoughtcrime/securesms/qr/BackupProviderFragment.java +++ b/src/org/thoughtcrime/securesms/qr/BackupProviderFragment.java @@ -57,7 +57,7 @@ public class BackupProviderFragment extends Fragment implements DcEventCenter.Dc qrImageView = view.findViewById(R.id.qrImage); setHasOptionsMenu(true); - statusLine.setText(R.string.one_moment); + statusLine.setText(R.string.preparing_account); progressBar.setIndeterminate(true); dcContext = DcHelper.getContext(getActivity()); @@ -140,12 +140,8 @@ public class BackupProviderFragment extends Fragment implements DcEventCenter.Dc getTransferActivity().setTransferState(BackupTransferActivity.TransferState.TRANSFER_ERROR); getTransferActivity().showLastErrorAlert("Sending Error"); hideQrCode = true; - } else if(permille <= 100) { - statusLineText = getString(R.string.exporting_account); - } else if(permille <= 300) { - statusLineText = getString(R.string.preparing_account); } else if(permille <= 350) { - statusLineText = getString(R.string.account_prepared); + statusLineText = getString(R.string.preparing_account); } else if(permille <= 400) { statusLineText = getString(R.string.waiting_for_receiver); } else if(permille <= 450) { diff --git a/src/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java b/src/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java index 4a9bd4541..7580aa8d6 100644 --- a/src/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java +++ b/src/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java @@ -82,11 +82,8 @@ public class BackupReceiverFragment extends Fragment implements DcEventCenter.Dc if (permille == 0) { getTransferActivity().setTransferState(BackupTransferActivity.TransferState.TRANSFER_ERROR); getTransferActivity().showLastErrorAlert("Receiving Error"); - } else if (permille <= 50) { - statusLineText = getString(R.string.preparing_account); // "Connected" - hideSameNetworkHint = true; } else if (permille <= 100) { - statusLineText = getString(R.string.account_prepared); + statusLineText = getString(R.string.preparing_account); hideSameNetworkHint = true; } else if (permille <= 950 ) { percent = ((permille-100)*100)/850;