Merge remote-tracking branch 'upstream/main'

src/org/thoughtcrime/securesms/ApplicationContext.java

@@ -166,6 +166,10 @@ public class ApplicationContext extends MultiDexApplication {
     }
     // /migrating chat backgrounds
 
+    for (int accountId : allAccounts) {
+      dcAccounts.getAccount(accountId).setConfig(CONFIG_VERIFIED_ONE_ON_ONE_CHATS, "1");
+    }
+
     // set translations before starting I/O to avoid sending untranslated MDNs (issue #2288)
     DcHelper.setStockTranslations(this);
 

src/org/thoughtcrime/securesms/BaseConversationItem.java

@@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -37,6 +38,7 @@ public abstract class BaseConversationItem extends LinearLayout
   protected final DcContext            dcContext;
   protected Recipient                  conversationRecipient;
   protected final Rpc rpc;
+  protected Recipient                  conversationRecipient;
 
   protected @NonNull  Set<DcMsg> batchSelected = new HashSet<>();
 

src/org/thoughtcrime/securesms/ConversationListActivity.java

@@ -122,12 +122,16 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     conversationListFragment = initFragment(R.id.fragment_container, new ConversationListFragment(), dynamicLanguage.getCurrentLocale(), bundle);
 
     initializeSearchListener();
-    initializeTitleListener();
 
     TooltipCompat.setTooltipText(searchAction, getText(R.string.search_explain));
 
     TooltipCompat.setTooltipText(selfAvatar, getText(R.string.switch_account));
     selfAvatar.setOnClickListener(v -> AccountManager.getInstance().showSwitchAccountMenu(this));
+    title.setOnClickListener(v -> {
+      if (!isRelayingMessageContent(this)) {
+        AccountManager.getInstance().showSwitchAccountMenu(this);
+      }
+    });
 
     refresh();
 
@@ -329,14 +333,6 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     });
   }
 
-  private void initializeTitleListener() {
-    title.setOnClickListener(v -> {
-      if (!isRelayingMessageContent(this)) {
-        startActivity(new Intent(this, ConnectivityActivity.class));
-      }
-    });
-  }
-
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);

src/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.accounts;
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,6 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.b44t.messenger.DcAccounts;
 
+import org.thoughtcrime.securesms.ConnectivityActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.connect.AccountManager;
 import org.thoughtcrime.securesms.connect.DcHelper;
@@ -51,6 +53,9 @@ public class AccountSelectionListFragment extends DialogFragment
   public Dialog onCreateDialog(Bundle savedInstanceState) {
     AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
             .setTitle(R.string.switch_account)
+            .setNeutralButton(R.string.connectivity, ((dialog, which) -> {
+              startActivity(new Intent(getActivity(), ConnectivityActivity.class));
+            }))
             .setNegativeButton(R.string.cancel, null);
 
     LayoutInflater inflater = getActivity().getLayoutInflater();

src/org/thoughtcrime/securesms/connect/DcHelper.java

@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.qr.QrActivity;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.FileUtils;
+import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.MediaUtil;
 
 import java.io.File;
@@ -451,23 +452,10 @@ public class DcHelper {
       }
   }
 
-  public static String getConnectivitySummary(Context context, String connectedString) {
-      int connectivity = getContext(context).getConnectivity();
-      if (connectivity >= DcContext.DC_CONNECTIVITY_CONNECTED) {
-          return connectedString;
-      } else if (connectivity >= DcContext.DC_CONNECTIVITY_WORKING) {
-          return context.getString(R.string.connectivity_updating);
-      } else if (connectivity >= DcContext.DC_CONNECTIVITY_CONNECTING) {
-          return context.getString(R.string.connectivity_connecting);
-      } else {
-          return context.getString(R.string.connectivity_not_connected);
-      }
-  }
-
   public static void showVerificationBrokenDialog(Context context, String name) {
     new AlertDialog.Builder(context)
             .setMessage(context.getString(R.string.chat_protection_broken_explanation, name))
-            .setNeutralButton(R.string.learn_more, (d, w) -> IntentUtils.showBrowserIntent(context, "https://staging.delta.chat/684/en/help#verificationbroken"))
+            .setNeutralButton(R.string.learn_more, (d, w) -> IntentUtils.showBrowserIntent(context, "https://staging.delta.chat/733/en/help#verificationbroken"))
             .setNegativeButton(R.string.qrscan_title, (d, w) -> context.startActivity(new Intent(context, QrActivity.class)))
             .setPositiveButton(R.string.ok, null)
             .setCancelable(true)
@@ -475,7 +463,12 @@ public class DcHelper {
   }
 
   public static void showProtectionEnabledDialog(Context context) {
-    IntentUtils.showBrowserIntent(context, "https://staging.delta.chat/684/en/help#whatdoesverifiedmean");
+    new AlertDialog.Builder(context)
+            .setMessage(context.getString(R.string.chat_protection_enabled_explanation))
+            .setNeutralButton(R.string.learn_more, (d, w) -> IntentUtils.showBrowserIntent(context, "https://staging.delta.chat/733/en/help#verifiedchats"))
+            .setPositiveButton(R.string.ok, null)
+            .setCancelable(true)
+            .show();
     // One day, it would be nice to point the user to the local help:
     //context.startActivity(new Intent(context, LocalHelpActivity.class));
   }