From 97da31ae2dfaf0a3fe81e969d85def7063ca663c Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sat, 28 Oct 2017 18:37:32 +0200 Subject: [PATCH] Init notifications for deaddrop. --- .../src/main/java/com/b44t/messenger/ApplicationLoader.java | 3 ++- .../src/main/java/com/b44t/messenger/ChatActivity.java | 5 +++-- .../src/main/java/com/b44t/messenger/ProfileActivity.java | 2 +- .../main/java/com/b44t/messenger/SettingsAdvFragment.java | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java index fa0ae21e5..937bdcbcd 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java @@ -203,9 +203,10 @@ public class ApplicationLoader extends Application { // make sure, the notifications for the "deaddrop" dialog are muted by default SharedPreferences notificationPreferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); - if( notificationPreferences.getInt("notify2_"+MrChat.MR_CHAT_ID_DEADDROP, 666)==666 ) { + if( notificationPreferences.getInt("deaddrop_initialized", 0)!=1 ) { SharedPreferences.Editor editor = notificationPreferences.edit(); editor.putInt("notify2_"+MrChat.MR_CHAT_ID_DEADDROP, 2); + editor.putInt("deaddrop_initialized", 1); editor.apply(); } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/messenger/ChatActivity.java index 2e6d14910..e461b1303 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ChatActivity.java @@ -593,8 +593,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not headerItem.addSubItem(ID_ATTACH, context.getString(R.string.AttachFiles), 0); // "Attach" means "Attach to chat", not "Attach to message" (which is not possible) } - //if( !m_isChatWithDeaddrop || m_isDeaddropInChatlist ) { -- we can disable this at a later time, for now, it may be handy to have all options - headerItem.addSubItem(ID_SHOW_PROFILE, context.getString(R.string.ViewProfile), 0); + if( !m_isChatWithDeaddrop ) { + headerItem.addSubItem(ID_SHOW_PROFILE, context.getString(R.string.ViewProfile), 0); + } if( !m_isChatWithDeaddrop ) { headerItem.addSubItem(ID_DELETE_CHAT, context.getString(R.string.DeleteChat), 0); diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/messenger/ProfileActivity.java index 1729f6e07..04876655a 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ProfileActivity.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ProfileActivity.java @@ -830,7 +830,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. emptyRow = rowCount++; - if( (chat_id!=0 && (chat_id!=MrChat.MR_CHAT_ID_DEADDROP || MrMailbox.getConfigInt("show_deaddrop", 0)!=0)) + if( (chat_id!=0 /*&& (chat_id!=MrChat.MR_CHAT_ID_DEADDROP || MrMailbox.getConfigInt("show_deaddrop", 0)!=0)*/) || MrMailbox.getChatIdByContactId(user_id)!=0 ) { settingsNotificationsRow = rowCount++; } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/SettingsAdvFragment.java b/MessengerProj/src/main/java/com/b44t/messenger/SettingsAdvFragment.java index 300bd9488..cc28046aa 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/SettingsAdvFragment.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/SettingsAdvFragment.java @@ -111,7 +111,7 @@ public class SettingsAdvFragment extends BaseFragment implements NotificationCen } autoplayGifsRow = rowCount++; textSizeRow = rowCount++; // for now, we have the font size in the advanced settings; this is because the numberical selection is a little bit weird and does only affect the message text. It would be better to use the font size defined by the system with "sp" (Scale-independent Pixels which included the user's font size preference) - showUnknownSendersRow = rowCount++; + showUnknownSendersRow = -1;// rowCount++; sendByEnterRow = rowCount++; raiseToSpeakRow = rowCount++; // outgoing message cacheRow = -1;// for now, the - non-functional - page is reachable by the "storage settings" in the "android App Settings" only @@ -212,7 +212,7 @@ public class SettingsAdvFragment extends BaseFragment implements NotificationCen // if showing deaddrop is disabled, also disable notifications for this chat (cannot be displayed otherwise) SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); - editor.putInt("notify2_" + MrChat.MR_CHAT_ID_DEADDROP, oldval==1? 2 /*always muted*/ : 0); + editor.putInt("notify2_" + MrChat.MR_CHAT_ID_DEADDROP, oldval==1? 2 : 0); editor.apply(); } else if(i==e2eEncryptionRow )