thedevstack/PiratX
3
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 29 Pull requests 1 Wiki Activity Actions 1

update fork #128

Manually merged
tristan merged 181 commits from mirror/monocles_chat_clean:master into master 2026-01-23 14:02:38 +01:00
Conversation 0 Commits 181 Files changed 135 +22 -35
2 changed files with 22 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 37125ce521 - Show all commits

Refactor story publishing to not use dummy messages

Prev Next
Arne 2025-12-30 01:45:45 +01:00
commit 37125ce521

3
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -7835,7 +7835,7 @@ public class XmppConnectionService extends Service {
}
mHttpConnectionManager.createNewUploadConnection(message, false, () -> {
final String url = message.getBody();
final String url = message.getFileParams().url.toString();
if (url != null) {
callback.success(url);
} else {
@ -7844,6 +7844,7 @@ public class XmppConnectionService extends Service {
});
};
FILE_ATTACHMENT_EXECUTOR.execute(runnable);
deleteMessage(message);
}
private final List<eu.siacs.conversations.entities.Story> stories = new java.util.concurrent.CopyOnWriteArrayList<>();

50
src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
View file

@ -732,48 +732,34 @@ public class ConversationsOverviewFragment extends XmppFragment implements XmppC
.setPositiveButton(R.string.publish, (dialog, which) -> {
final String title = input.getText().toString();
Toast.makeText(activity, R.string.uploading_story, Toast.LENGTH_SHORT).show();
// Use a dummy conversation with the user's own JID
final Conversation selfConversation = activity.xmppConnectionService.findOrCreateConversation(mSelectedAccount, mSelectedAccount.getJid().asBareJid(), false, false);
activity.xmppConnectionService.attachFileToConversation(selfConversation, uri, mimeType, null, new UiCallback<Message>() {
activity.xmppConnectionService.uploadFileForUrl(mSelectedAccount, uri, mimeType, new UiCallback<String>() {
@Override
public void success(Message message) {
// This callback is triggered after the message is sent.
// Now we can get the URL and publish the story.
final String url = message.getFileParams().url.toString();
if (url != null) {
activity.xmppConnectionService.publishStory(mSelectedAccount, url, mimeType, title, new UiCallback<Void>() {
@Override
public void success(Void aVoid) {
activity.runOnUiThread(() -> Toast.makeText(activity, R.string.story_published, Toast.LENGTH_SHORT).show());
// Clean up the dummy message
activity.xmppConnectionService.deleteMessage(message);
}
public void success(String url) {
activity.xmppConnectionService.publishStory(mSelectedAccount, url, mimeType, title, new UiCallback<Void>() {
@Override
public void success(Void aVoid) {
activity.runOnUiThread(() -> Toast.makeText(activity, R.string.story_published, Toast.LENGTH_SHORT).show());
}
@Override
public void error(int errorCode, Void object) {
activity.runOnUiThread(() -> Toast.makeText(activity, errorCode, Toast.LENGTH_SHORT).show());
activity.xmppConnectionService.deleteMessage(message);
}
@Override
public void error(int errorCode, Void object) {
activity.runOnUiThread(() -> Toast.makeText(activity, errorCode, Toast.LENGTH_SHORT).show());
}
@Override
public void userInputRequired(android.app.PendingIntent pi, Void object) {
// not used
}
});
} else {
error(R.string.upload_failed_server_not_found, message);
}
@Override
public void userInputRequired(android.app.PendingIntent pi, Void object) {
// not used
}
});
}
@Override
public void error(int errorCode, Message object) {
public void error(int errorCode, String object) {
activity.runOnUiThread(() -> Toast.makeText(activity, errorCode, Toast.LENGTH_SHORT).show());
}
@Override
public void userInputRequired(android.app.PendingIntent pi, Message object) {
public void userInputRequired(android.app.PendingIntent pi, String object) {
// not used
}
});