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
2026-02-22 13:00:11 +01:00
parent b99426b7c6 b625c57d2d
commit b0762a8b46
5 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/b44t/messenger/DcMsg.java
+1
View File
@@ -36,6 +36,7 @@ public class DcMsg {
public final static int DC_INFO_INVALID_UNENCRYPTED_MAIL = 13;
public final static int DC_INFO_WEBXDC_INFO_MESSAGE = 32;
public final static int DC_INFO_CHAT_E2EE = 50;
public final static int DC_INFO_CHAT_DESCRIPTION_CHANGED = 70;
public final static int DC_STATE_UNDEFINED = 0;
public final static int DC_STATE_IN_FRESH = 10;
src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
+4
View File
@@ -854,6 +854,10 @@ public class ConversationFragment extends MessageSelectorFragment
WebxdcActivity.openWebxdcActivity(getContext(), messageRecord.getParent(), messageRecord.getWebxdcHref());
}
}
else if (messageRecord.getInfoType() == DcMsg.DC_INFO_CHAT_DESCRIPTION_CHANGED) {
Intent intent = new Intent(getContext(), ProfileActivity.class);
intent.putExtra(ProfileActivity.CHAT_ID_EXTRA, (int) chatId);
startActivity(intent);
else if (!TextUtils.isEmpty(messageRecord.getPOILocation()) && messageRecord.getType() == DcMsg.DC_MSG_TEXT && !messageRecord.hasHtml()) {
WebxdcActivity.openMaps(getContext(), getListAdapter().getChat().getId(), "index.html#"+messageRecord.getPOILocation());
}
src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
+5 -2
View File
@@ -287,7 +287,10 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
groupChatId = rpc.createGroupChat(accId, groupName, false);
}
rpc.setChatDescription(accId, groupChatId, getChatDescription());
String description = getChatDescription();
if (!description.isEmpty()) {
rpc.setChatDescription(accId, groupChatId, description);
}
} catch (RpcException e) {
Log.e(TAG, "RPC error", e);
return;
@@ -353,7 +356,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
return ret;
}
private @Nullable String getChatDescription() {
private String getChatDescription() {
return chatDescription.getText() != null ? chatDescription.getText().toString().trim() : "";
}