awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse Source
This commit is contained in:
adbenitez
2023-10-24 20:11:13 +02:00
parent 9b0ad97918 f0b2a9f2ad
commit 32ca6d7a80
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class ProfilePreference extends Preference {
public void refresh() {
if (profileAddressView == null) return;
final String address = DcHelper.get(getContext(), DcHelper.CONFIG_ADDRESS);
final String address = DcHelper.get(getContext(), DcHelper.CONFIG_CONFIGURED_ADDRESS);
String profileName = DcHelper.get(getContext(), DcHelper.CONFIG_DISPLAY_NAME);
if(profileName==null || profileName.isEmpty()) {
src/org/thoughtcrime/securesms/qr/QrShowActivity.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class QrShowActivity extends AppCompatActivity {
// verify-contact
String selfName = DcHelper.get(this, DcHelper.CONFIG_DISPLAY_NAME); // we cannot use MrContact.getDisplayName() as this would result in "Me" instead of
if (selfName.isEmpty()) {
selfName = DcHelper.get(this, DcHelper.CONFIG_ADDRESS, "unknown");
selfName = DcHelper.get(this, DcHelper.CONFIG_CONFIGURED_ADDRESS, "unknown");
}
supportActionBar.setTitle(selfName);
supportActionBar.setSubtitle(R.string.qrshow_join_contact_title);
src/org/thoughtcrime/securesms/service/IPCAddAccountsService.java
+2 -1
View File
@@ -24,6 +24,7 @@ import org.thoughtcrime.securesms.connect.DcHelper;
import java.lang.ref.WeakReference;
import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_ADDRESS;
import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_CONFIGURED_ADDRESS;
import com.b44t.messenger.DcAccounts;
import com.b44t.messenger.DcContext;
@@ -58,7 +59,7 @@ public class IPCAddAccountsService extends Service {
int[] accountIds = accounts.getAll();
for (int accountId : accountIds) {
DcContext dcContext = accounts.getAccount(accountId);
String accountAddress = dcContext.getConfig(CONFIG_ADDRESS);
String accountAddress = dcContext.getConfig(CONFIG_CONFIGURED_ADDRESS);
if (accountAddress.equals(newAddress)) {
Log.d(TAG, newAddress + " already exists. Switching account.");
AccountManager.getInstance().switchAccount(context, accountId);