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
2025-07-09 23:51:26 +02:00
parent 111629ace2 23d521beed
commit 5af2d4fa8f
27 changed files with 132 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/b44t/messenger/DcChat.java
+1
View File
@@ -38,6 +38,7 @@ public class DcChat {
public native String getMailinglistAddr();
public native String getProfileImage ();
public native int getColor ();
public native boolean isEncrypted ();
public native boolean isUnpromoted ();
public native boolean isSelfTalk ();
public native boolean isDeviceTalk ();
src/main/java/com/b44t/messenger/DcContact.java
+1
View File
@@ -57,6 +57,7 @@ public class DcContact {
public native boolean wasSeenRecently();
public native boolean isBlocked ();
public native boolean isVerified ();
public native boolean isKeyContact ();
public native int getVerifierId ();
public native boolean isBot ();
src/main/java/com/b44t/messenger/rpc/Rpc.java
+4
View File
@@ -173,6 +173,10 @@ public class Rpc {
}
}
public String getMigrationError(int accountId) throws RpcException {
return gson.fromJson(getResult("get_migration_error", accountId), String.class);
}
private static class Response {
public final int id;
public final JsonElement result;
src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+4 -1
View File
@@ -452,7 +452,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
if (isMultiUser()) {
if (dcChat.canSend() && !dcChat.isBroadcast() && !dcChat.isMailingList()) {
if (dcChat.isEncrypted()
&& dcChat.canSend()
&& !dcChat.isBroadcast()
&& !dcChat.isMailingList()) {
menu.findItem(R.id.menu_leave).setVisible(true);
}
}
src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
+2
View File
@@ -198,6 +198,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
refresh();
if (BuildConfig.DEBUG) checkNdkArchitecture();
DcHelper.maybeShowMigrationError(this);
}
/**
src/main/java/org/thoughtcrime/securesms/ConversationTitleView.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class ConversationTitleView extends RelativeLayout {
else {
DcContact dcContact = dcContext.getContact(chatContacts[0]);
isOnline = dcContact.wasSeenRecently();
if (profileView) {
if (profileView || !dcChat.isEncrypted()) {
subtitleStr = dcContact.getAddr();
} else if (dcContact.isBot()) {
subtitleStr = context.getString(R.string.bot);
src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
+5 -3
View File
@@ -107,7 +107,8 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
boolean canReceive = true;
if (chatId != 0) {
menu.findItem(R.id.menu_clone).setVisible(chatIsMultiUser && !chatIsMailingList);
DcChat dcChat = dcContext.getChat(chatId);
menu.findItem(R.id.menu_clone).setVisible(chatIsMultiUser && !chatIsMailingList && dcChat.isEncrypted());
if (chatIsDeviceTalk) {
menu.findItem(R.id.edit_name).setVisible(false);
menu.findItem(R.id.show_encr_info).setVisible(false);
@@ -117,8 +118,9 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
if (chatIsBroadcast) {
canReceive = false;
} else {
DcChat dcChat = dcContext.getChat(chatId);
if (!chatIsMailingList && !dcChat.canSend()) {
if (!dcChat.isEncrypted()
|| !dcChat.canSend()
|| chatIsMailingList) {
menu.findItem(R.id.edit_name).setVisible(false);
}
}
src/main/java/org/thoughtcrime/securesms/ProfileAdapter.java
+2 -5
View File
@@ -277,7 +277,6 @@ public class ProfileAdapter extends RecyclerView.Adapter
itemDataStatusText = "";
isBroadcast = dcChat != null && dcChat.isBroadcast();
boolean isMailingList = dcChat != null && dcChat.isMailingList();
boolean isGroup = dcChat != null && dcChat.getType() == DcChat.DC_CHAT_TYPE_GROUP;
boolean isSelfTalk = dcChat != null && dcChat.isSelfTalk();
boolean isDeviceTalk = dcChat != null && dcChat.isDeviceTalk();
memberCount = memberList!=null ? memberList.length : 0;
@@ -309,10 +308,10 @@ public class ProfileAdapter extends RecyclerView.Adapter
itemData.add(new ItemData(ITEM_LAST_SEEN, lastSeenTxt, 0));
}
if (memberList!=null) {
if (memberList!=null && !isMailingList) {
itemData.add(new ItemData(ITEM_DIVIDER, null, 0));
if (dcChat != null) {
if (!isMailingList && dcChat.canSend()) {
if (dcChat.canSend() && dcChat.isEncrypted()) {
itemData.add(new ItemData(ITEM_MEMBERS, DcContact.DC_CONTACT_ID_ADD_MEMBER, 0));
if (!isBroadcast) {
itemData.add(new ItemData(ITEM_MEMBERS, DcContact.DC_CONTACT_ID_QR_INVITE, 0));
@@ -345,8 +344,6 @@ public class ProfileAdapter extends RecyclerView.Adapter
if (dcContact != null) {
itemData.add(new ItemData(ITEM_ADDRESS, dcContact.getAddr(), 0));
} else if (isMailingList) {
itemData.add(new ItemData(ITEM_ADDRESS, dcChat.getMailinglistAddr(), 0));
}
}
src/main/java/org/thoughtcrime/securesms/ProfileAvatarItem.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ProfileAvatarItem extends LinearLayout implements RecipientModified
greenCheckmark = dcChat.isProtected();
if (dcChat.isMailingList()) {
subtitle = getContext().getString(R.string.contacts_headline);
subtitle = dcChat.getMailinglistAddr();
} else if (dcChat.isBroadcast()) {
subtitle = getContext().getResources().getQuantityString(R.plurals.n_recipients, memberCount, memberCount);
} else if (dcChat.getType() == DcChat.DC_CHAT_TYPE_GROUP) {
src/main/java/org/thoughtcrime/securesms/ProfileFragment.java
+1 -1
View File
@@ -158,7 +158,7 @@ public class ProfileFragment extends Fragment
if (contactId>DcContact.DC_CONTACT_ID_LAST_SPECIAL || contactId==DcContact.DC_CONTACT_ID_SELF) {
if (actionMode==null) {
DcChat dcChat = dcContext.getChat(chatId);
if (dcChat.canSend()) {
if (dcChat.canSend() && dcChat.isEncrypted()) {
adapter.toggleMemberSelection(contactId);
actionMode = ((AppCompatActivity) requireActivity()).startSupportActionMode(actionModeCallback);
}
src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
+2
View File
@@ -80,6 +80,8 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen
intent.setAction(DC_REQUEST_ACCOUNT_DATA);
sendBroadcast(intent);
}
DcHelper.maybeShowMigrationError(this);
}
protected void initializeActionBar() {
src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+11 -4
View File
@@ -22,7 +22,7 @@ public class ConversationItemFooter extends LinearLayout {
private TextView dateView;
private TextView editedView;
private ImageView bookmarkIndicatorView;
private ImageView secureIndicatorView;
private ImageView emailIndicatorView;
private ImageView locationIndicatorView;
private DeliveryStatusView deliveryStatusView;
private Integer textColor = null;
@@ -48,7 +48,7 @@ public class ConversationItemFooter extends LinearLayout {
dateView = findViewById(R.id.footer_date);
editedView = findViewById(R.id.footer_edited);
bookmarkIndicatorView = findViewById(R.id.footer_bookmark_indicator);
secureIndicatorView = findViewById(R.id.footer_secure_indicator);
emailIndicatorView = findViewById(R.id.footer_email_indicator);
locationIndicatorView = findViewById(R.id.footer_location_indicator);
deliveryStatusView = new DeliveryStatusView(findViewById(R.id.delivery_indicator));
@@ -65,7 +65,14 @@ public class ConversationItemFooter extends LinearLayout {
boolean bookmark = messageRecord.getOriginalMsgId() != 0 || messageRecord.getSavedMsgId() != 0;
bookmarkIndicatorView.setVisibility(bookmark ? View.VISIBLE : View.GONE);
editedView.setVisibility(messageRecord.isEdited() ? View.VISIBLE : View.GONE);
secureIndicatorView.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE);
int downloadState = messageRecord.getDownloadState();
if (messageRecord.isSecure() || downloadState == DcMsg.DC_DOWNLOAD_AVAILABLE || downloadState == DcMsg.DC_DOWNLOAD_FAILURE || downloadState == DcMsg.DC_DOWNLOAD_IN_PROGRESS) {
emailIndicatorView.setVisibility(View.GONE);
} else {
emailIndicatorView.setVisibility(View.VISIBLE);
}
locationIndicatorView.setVisibility(messageRecord.hasLocation() ? View.VISIBLE : View.GONE);
presentDeliveryStatus(messageRecord);
}
@@ -74,7 +81,7 @@ public class ConversationItemFooter extends LinearLayout {
dateView.setTextColor(color);
editedView.setTextColor(color);
bookmarkIndicatorView.setColorFilter(color);
secureIndicatorView.setColorFilter(color);
emailIndicatorView.setColorFilter(color);
locationIndicatorView.setColorFilter(color);
deliveryStatusView.setTint(color);
}
src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
+60
View File
@@ -23,6 +23,7 @@ import com.b44t.messenger.DcContext;
import com.b44t.messenger.DcLot;
import com.b44t.messenger.DcMsg;
import com.b44t.messenger.rpc.Rpc;
import com.b44t.messenger.rpc.RpcException;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.BuildConfig;
@@ -36,6 +37,7 @@ import org.thoughtcrime.securesms.qr.QrActivity;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.FileUtils;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.Util;
import java.io.File;
import java.util.Date;
@@ -513,4 +515,62 @@ public class DcHelper {
if (section != null) { intent.putExtra(LocalHelpActivity.SECTION_EXTRA, section); }
context.startActivity(intent);
}
/**
* For the PGP-Contacts migration, things can go wrong.
* The migration happens when the account is setup, at which point no events can be sent yet.
* So, instead, if something goes wrong, it's returned by getLastError().
* This function shows the error message to the user.
* <p>
* A few releases after the PGP-contacts migration (which happened in 2025-05),
* we can remove this function again.
*/
public static void maybeShowMigrationError(Context context) {
try {
String lastError = DcHelper.getRpc(context).getMigrationError(DcHelper.getContext(context).getAccountId());
if (lastError != null && !lastError.isEmpty()) {
Log.w(TAG, "Opening account failed, trying to share error: " + lastError);
String subject = "Delta Chat failed to update";
String email = "delta@merlinux.eu";
new AlertDialog.Builder(context)
.setMessage(context.getString(R.string.error_x, lastError))
.setNeutralButton(R.string.global_menu_edit_copy_desktop, (d, which) -> {
Util.writeTextToClipboard(context, lastError);
})
.setPositiveButton(R.string.menu_send, (d, which) -> {
Intent sharingIntent = new Intent(
Intent.ACTION_SENDTO, Uri.fromParts(
"mailto", email, null
)
);
sharingIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{email});
sharingIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
sharingIntent.putExtra(Intent.EXTRA_TEXT, lastError);
if (sharingIntent.resolveActivity(context.getPackageManager()) == null) {
Log.w(TAG, "No email client found to send crash report");
sharingIntent = new Intent(Intent.ACTION_SEND);
sharingIntent.setType("text/plain");
sharingIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
sharingIntent.putExtra(Intent.EXTRA_TEXT, lastError);
sharingIntent.putExtra(Intent.EXTRA_EMAIL, email);
}
Intent chooser =
Intent.createChooser(sharingIntent, "Send using...");
chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
chooser.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
context.startActivity(chooser);
})
.setCancelable(false)
.show();
}
} catch (RpcException e) {
e.printStackTrace();
}
}
}
src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientM
this.nameView.setTypeface(null, Typeface.NORMAL);
}
if (specialId == DcContact.DC_CONTACT_ID_QR_INVITE) {
this.avatar.setImageDrawable(new ResourceContactPhoto(R.drawable.baseline_qr_code_24).asDrawable(getContext(), ThemeUtil.getDummyContactColor(getContext())));
this.avatar.setImageDrawable(new ResourceContactPhoto(R.drawable.ic_qr_code_24).asDrawable(getContext(), ThemeUtil.getDummyContactColor(getContext())));
} else {
this.avatar.setAvatar(glideRequests, recipient, false);
}
src/main/java/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java
+1
View File
@@ -80,6 +80,7 @@ public class BackupReceiverFragment extends Fragment implements DcEventCenter.Dc
Log.i(TAG,"DC_EVENT_IMEX_PROGRESS, " + permille);
if (permille == 0) {
DcHelper.maybeShowMigrationError(getTransferActivity());
getTransferActivity().setTransferError("Receiving Error");
} else if (permille < 1000) {
percent = permille/10;