From 1083e19356e57cdb3e9bb975c22393af5e879493 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sun, 9 Jun 2024 18:17:01 +0200 Subject: [PATCH 1/3] use name `deviceMsgLabel` as it is a label and no id came over that while targeting https://github.com/deltachat/deltachat-ios/pull/2204 and was shortly confused about what is going on there :) (the name saved to database is not changed, however, to avoid popping up the message again in case we do an update without a new device messase) --- .../securesms/ConversationListActivity.java | 10 +++++----- .../java/org/thoughtcrime/securesms/util/Prefs.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java index d994c8b42..4c9d48d3b 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java @@ -104,8 +104,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit // it is not needed to keep all past update messages, however, when deleted, also the strings should be deleted. try { DcContext dcContext = DcHelper.getContext(this); - final String deviceMsgId = "update_1_46_0l_android"; - if (!dcContext.wasDeviceMsgEverAdded(deviceMsgId)) { + final String deviceMsgLabel = "update_1_46_0l_android"; + if (!dcContext.wasDeviceMsgEverAdded(deviceMsgLabel)) { DcMsg msg = null; if (!getIntent().getBooleanExtra(FROM_WELCOME, false)) { msg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT); @@ -117,15 +117,15 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit msg.setText(getString(R.string.update_1_46_android, "https://get.delta.chat/#changelogs")); } - dcContext.addDeviceMsg(deviceMsgId, msg); + dcContext.addDeviceMsg(deviceMsgLabel, msg); - if (Prefs.getStringPreference(this, Prefs.LAST_DEVICE_MSG_ID, "").equals(deviceMsgId)) { + if (Prefs.getStringPreference(this, Prefs.LAST_DEVICE_MSG_LABEL, "").equals(deviceMsgLabel)) { int deviceChatId = dcContext.getChatIdByContactId(DcContact.DC_CONTACT_ID_DEVICE); if (deviceChatId != 0) { dcContext.marknoticedChat(deviceChatId); } } - Prefs.setStringPreference(this, Prefs.LAST_DEVICE_MSG_ID, deviceMsgId); + Prefs.setStringPreference(this, Prefs.LAST_DEVICE_MSG_LABEL, deviceMsgLabel); } } catch(Exception e) { e.printStackTrace(); diff --git a/src/main/java/org/thoughtcrime/securesms/util/Prefs.java b/src/main/java/org/thoughtcrime/securesms/util/Prefs.java index ba898fb4a..2d2758e42 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/Prefs.java +++ b/src/main/java/org/thoughtcrime/securesms/util/Prefs.java @@ -65,7 +65,7 @@ public class Prefs { public static final String ALWAYS_LOAD_REMOTE_CONTENT = "pref_always_load_remote_content"; public static final boolean ALWAYS_LOAD_REMOTE_CONTENT_DEFAULT = false; - public static final String LAST_DEVICE_MSG_ID = "pref_last_device_msg_id"; + public static final String LAST_DEVICE_MSG_LABEL = "pref_last_device_msg_id"; public enum VibrateState { DEFAULT(0), ENABLED(1), DISABLED(2); From d86d390fe71ddc52a53fbe6463ff4a0dd21c5935 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sat, 8 Jun 2024 23:30:21 +0200 Subject: [PATCH 2/3] add instructions for releasing for Huawei AppGallery --- RELEASE.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/RELEASE.md b/RELEASE.md index adfe79c47..2f0b1c889 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -109,6 +109,15 @@ on : f) on "Step 4" page: "Submit app" +## Release on Huawei AppGallery + +on : + +13. a) go to "Upload your app / Android / Delta Chat / Update", again "Update" upper right + b) "Manage Packages / Upload", upload the APK from above, hit "Submit" + c) Confirm version and language + + ## Releases on Apklis, Passkoocheh These stores are not under our control. From f7dfb875a715b2a69760a0f9cbf8130ab2db8f95 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 10 Jun 2024 21:20:07 +0200 Subject: [PATCH 3/3] do not forget to update changelog (i was searching for that before) --- RELEASE.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 2f0b1c889..0ac3ffcb2 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -114,8 +114,9 @@ on : on : 13. a) go to "Upload your app / Android / Delta Chat / Update", again "Update" upper right - b) "Manage Packages / Upload", upload the APK from above, hit "Submit" - c) Confirm version and language + b) "Manage Packages / Upload", upload the APK from above + c) Update "App Information / New Features" + d) Hit "Submit"; on the next page, confirm version and language ## Releases on Apklis, Passkoocheh