diff --git a/src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java
index f7ef297ad..3fc78a98e 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/BackupProviderFragment.java
@@ -38,7 +38,6 @@ public class BackupProviderFragment extends Fragment implements DcEventCenter.Dc
private ProgressBar progressBar;
private View topText;
private SVGImageView qrImageView;
- private View bottomText;
private boolean isFinishing;
private Thread prepareThread;
private Thread waitThread;
@@ -56,7 +55,6 @@ public class BackupProviderFragment extends Fragment implements DcEventCenter.Dc
progressBar = view.findViewById(R.id.progress_bar);
topText = view.findViewById(R.id.top_text);
qrImageView = view.findViewById(R.id.qrImage);
- bottomText = view.findViewById(R.id.bottom_text);
setHasOptionsMenu(true);
statusLine.setText(R.string.preparing_account);
@@ -88,7 +86,6 @@ public class BackupProviderFragment extends Fragment implements DcEventCenter.Dc
} catch (SVGParseException e) {
e.printStackTrace();
}
- bottomText.setVisibility(View.VISIBLE);
waitThread = new Thread(() -> {
Log.i(TAG, "##### waitForReceiver() with qr: "+dcBackupProvider.getQr());
dcBackupProvider.waitForReceiver();
@@ -196,7 +193,6 @@ public class BackupProviderFragment extends Fragment implements DcEventCenter.Dc
if (hideQrCode && qrImageView.getVisibility() != View.GONE) {
qrImageView.setVisibility(View.GONE);
topText.setVisibility(View.GONE);
- bottomText.setVisibility(View.GONE);
statusLine.setVisibility(View.VISIBLE);
progressBar.setVisibility(permille == 1000 ? View.GONE : View.VISIBLE);
}
diff --git a/src/main/res/layout/activity_registration_2nd_device_qr.xml b/src/main/res/layout/activity_registration_2nd_device_qr.xml
index 310257c28..f8108a86d 100644
--- a/src/main/res/layout/activity_registration_2nd_device_qr.xml
+++ b/src/main/res/layout/activity_registration_2nd_device_qr.xml
@@ -86,16 +86,4 @@
android:layout_width="match_parent"
android:layout_height="0dp"/>
-
-
diff --git a/src/main/res/layout/backup_provider_fragment.xml b/src/main/res/layout/backup_provider_fragment.xml
index 245995c64..1dcb83823 100644
--- a/src/main/res/layout/backup_provider_fragment.xml
+++ b/src/main/res/layout/backup_provider_fragment.xml
@@ -109,18 +109,4 @@
android:visibility="gone"
android:contentDescription="@string/qrscan_title" />
-
-
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 67b212e16..b9e6c733a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -559,6 +559,7 @@
The profile you want to import is from a newer Delta Chat version.\n\nTo continue setting up second device, please update this device to the latest version of Delta Chat.
Abort setting up second device?
This will invalidate the QR code copied to clipboard.
+
(experimental, version 1.36 required)
ℹ️ Profile transferred to your second device.
@@ -1118,6 +1119,7 @@
Tray icon cannot be disabled as Delta Chat was started with the --minimized option.
No spelling suggestions found.
Show Window
+
SOCKS5 support is currently experimental. Please use at your own risk. If you type in an address in the e-mail field, there will be DNS lookup that won\'t get tunneled through SOCKS5.