Merge remote-tracking branch 'upstream/main'

This commit is contained in:
adbenitez
2024-06-14 13:39:01 +02:00
3 changed files with 16 additions and 6 deletions
+10
View File
@@ -109,6 +109,16 @@ on <https://developer.amazon.com/dashboard>:
f) on "Step 4" page: "Submit app"
## Release on Huawei AppGallery
on <https://developer.huawei.com/consumer/en/appgallery>:
13. a) go to "Upload your app / Android / Delta Chat / Update", again "Update" upper right
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
These stores are not under our control.
@@ -107,8 +107,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);
@@ -120,15 +120,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();
@@ -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);