From 634c8d1e49cc5576eb4f67dba5ccf76d37e31a74 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 23 Jul 2021 16:57:25 +0200 Subject: [PATCH] use accounts event emitter --- .../securesms/ApplicationContext.java | 21 +- .../ApplicationPreferencesActivity.java | 4 +- .../securesms/ConnectivityActivity.java | 4 +- .../ContactSelectionListFragment.java | 7 +- .../securesms/ConversationActivity.java | 20 +- .../securesms/ConversationFragment.java | 16 +- .../securesms/ConversationListActivity.java | 2 +- .../securesms/ConversationListFragment.java | 29 ++- .../securesms/GroupCreateActivity.java | 10 +- .../securesms/MessageSelectorFragment.java | 4 +- .../securesms/ProfileActivity.java | 10 +- .../securesms/ProfileDocumentsFragment.java | 8 +- .../securesms/ProfileGalleryFragment.java | 9 +- .../securesms/ProfileSettingsFragment.java | 14 +- .../securesms/RegistrationActivity.java | 21 +- .../securesms/WelcomeActivity.java | 28 +-- .../securesms/connect/AccountManager.java | 2 + .../connect/ApplicationDcContext.java | 179 ------------------ .../securesms/connect/DcEventCenter.java | 104 ++++++++++ .../securesms/connect/DcHelper.java | 16 +- .../securesms/connect/FetchWorker.java | 3 +- .../securesms/connect/ForegroundDetector.java | 4 +- .../connect/NetworkStateReceiver.java | 3 +- .../securesms/map/MapDataManager.java | 10 +- .../notifications/MarkReadReceiver.java | 7 +- .../notifications/NotificationCenter.java | 11 +- .../notifications/RemoteReplyReceiver.java | 6 +- .../AdvancedPreferenceFragment.java | 8 +- .../ListSummaryPreferenceFragment.java | 35 ++-- .../securesms/qr/QrCodeHandler.java | 13 +- .../securesms/qr/QrShowActivity.java | 7 +- .../securesms/qr/QrShowFragment.java | 5 +- 32 files changed, 288 insertions(+), 332 deletions(-) delete mode 100644 src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java index 85bfe564d..e91f42aae 100644 --- a/src/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/org/thoughtcrime/securesms/ApplicationContext.java @@ -15,11 +15,14 @@ import androidx.work.PeriodicWorkRequest; import androidx.work.WorkManager; import com.b44t.messenger.DcAccounts; +import com.b44t.messenger.DcAccountsEventEmitter; import com.b44t.messenger.DcContext; +import com.b44t.messenger.DcEvent; +import com.b44t.messenger.DcEventEmitter; import org.thoughtcrime.securesms.components.emoji.EmojiProvider; import org.thoughtcrime.securesms.connect.AccountManager; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; +import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.connect.FetchWorker; import org.thoughtcrime.securesms.connect.ForegroundDetector; @@ -44,6 +47,8 @@ public class ApplicationContext extends MultiDexApplication { public DcAccounts dcAccounts; public DcContext dcContext; public DcLocationManager dcLocationManager; + public DcEventCenter eventCenter; + public NotificationCenter notificationCenter; private JobManager jobManager; public static ApplicationContext getInstance(Context context) { @@ -76,6 +81,20 @@ public class ApplicationContext extends MultiDexApplication { dcAccounts.addAccount(); } dcContext = dcAccounts.getSelectedAccount(); + notificationCenter = new NotificationCenter(this); + eventCenter = new DcEventCenter(this); + new Thread(() -> { + DcAccountsEventEmitter emitter = dcAccounts.getEventEmitter(); + while (true) { + DcEvent event = emitter.getNextEvent(); + if (event==null) { + break; + } + eventCenter.handleEvent(event); + } + Log.i("DeltaChat", "shutting down event handler"); + }, "eventThread").start(); + dcAccounts.startIo(); new ForegroundDetector(ApplicationContext.getInstance(this)); diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index a8e400124..5fd795f25 100644 --- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -159,7 +159,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA tintIcons(getActivity()); } - DcHelper.getContext(getActivity()).eventCenter.addObserver(DcContext.DC_EVENT_CONNECTIVITY_CHANGED, this); + DcHelper.getEventCenter(getActivity()).addObserver(DcContext.DC_EVENT_CONNECTIVITY_CHANGED, this); } @Override @@ -178,7 +178,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA @Override public void onDestroy() { super.onDestroy(); - DcHelper.getContext(getActivity()).eventCenter.removeObservers(this); + DcHelper.getEventCenter(getActivity()).removeObservers(this); } @Override diff --git a/src/org/thoughtcrime/securesms/ConnectivityActivity.java b/src/org/thoughtcrime/securesms/ConnectivityActivity.java index 56378c90d..239b9f777 100644 --- a/src/org/thoughtcrime/securesms/ConnectivityActivity.java +++ b/src/org/thoughtcrime/securesms/ConnectivityActivity.java @@ -14,13 +14,13 @@ public class ConnectivityActivity extends WebViewActivity implements DcEventCent super.onCreate(state, ready); refresh(); - DcHelper.getContext(this).eventCenter.addObserver(DcContext.DC_EVENT_CONNECTIVITY_CHANGED, this); + DcHelper.getEventCenter(this).addObserver(DcContext.DC_EVENT_CONNECTIVITY_CHANGED, this); } @Override public void onDestroy() { super.onDestroy(); - DcHelper.getContext(this).eventCenter.removeObservers(this); + DcHelper.getEventCenter(this).removeObservers(this); } private void refresh() { diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java index 6a6c28549..89212f4d8 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java @@ -52,7 +52,6 @@ import com.b44t.messenger.DcContext; import com.b44t.messenger.DcEvent; import org.thoughtcrime.securesms.components.RecyclerViewFastScroller; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcContactsLoader; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; @@ -90,7 +89,7 @@ public class ContactSelectionListFragment extends Fragment public static final String FROM_SHARE_ACTIVITY_EXTRA = "from_share_activity"; public static final String PRESELECTED_CONTACTS = "preselected_contacts"; - private ApplicationDcContext dcContext; + private DcContext dcContext; private Set selectedContacts; private OnContactSelectedListener onContactSelectedListener; @@ -106,13 +105,13 @@ public class ContactSelectionListFragment extends Fragment super.onActivityCreated(icicle); dcContext = DcHelper.getContext(getActivity()); - dcContext.eventCenter.addObserver(this, DcContext.DC_EVENT_CONTACTS_CHANGED); + DcHelper.getEventCenter(getActivity()).addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this); initializeCursor(); } @Override public void onDestroy() { - DcHelper.getContext(getActivity()).eventCenter.removeObservers(this); + DcHelper.getEventCenter(getActivity()).removeObservers(this); super.onDestroy(); } diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index 86ad16dd6..3f0b077f2 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -84,7 +84,6 @@ import org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer.Attach import org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer.DrawerState; import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider; import org.thoughtcrime.securesms.components.emoji.MediaKeyboard; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.database.AttachmentDatabase; @@ -202,7 +201,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private InputPanel inputPanel; private Recipient recipient; - private ApplicationDcContext dcContext; + private DcContext dcContext; private DcChat dcChat = new DcChat(0); private int chatId; private final boolean isSecureText = true; @@ -263,9 +262,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } }); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this); + DcEventCenter eventCenter = DcHelper.getEventCenter(this); + eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); + eventCenter.addObserver(DcContext.DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED, this); + eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this); if (isForwarding(this)) { handleForwarding(); @@ -324,7 +324,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity titleView.setTitle(glideRequests, dcChat); - dcContext.notificationCenter.updateVisibleChat(chatId); + DcHelper.getNotificationCenter(this).updateVisibleChat(chatId); if (doReinitializeDraft) { initializeDraft(); @@ -342,7 +342,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity doReinitializeDraft = true; } - dcContext.notificationCenter.updateVisibleChat(0); + DcHelper.getNotificationCenter(this).updateVisibleChat(0); if (isFinishing()) overridePendingTransition(R.anim.fade_scale_in, R.anim.slide_to_right); quickAttachmentDrawer.onPause(); inputPanel.onPause(); @@ -370,7 +370,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity @Override protected void onDestroy() { - dcContext.eventCenter.removeObservers(this); + DcHelper.getEventCenter(this).removeObservers(this); super.onDestroy(); } @@ -1189,7 +1189,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity if (refreshFragment) { fragment.reload(recipient, chatId); - dcContext.notificationCenter.updateVisibleChat(chatId); + DcHelper.getNotificationCenter(this).updateVisibleChat(chatId); } fragment.scrollToBottom(); @@ -1445,7 +1445,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } else { processComposeControls(ACTION_SEND_OUT); - dcContext.notificationCenter.maybePlaySendSound(dcChat); + DcHelper.getNotificationCenter(ConversationActivity.this).maybePlaySendSound(dcChat); } } diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java index 4b8dd2134..7c868f785 100644 --- a/src/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationFragment.java @@ -56,6 +56,7 @@ import com.b44t.messenger.DcMsg; import org.thoughtcrime.securesms.ConversationAdapter.ItemClickListener; import org.thoughtcrime.securesms.components.reminder.DozeReminder; +import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.mms.GlideApp; @@ -116,12 +117,13 @@ public class ConversationFragment extends MessageSelectorFragment this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActionBarActivity.LOCALE_EXTRA); this.dcContext = DcHelper.getContext(getContext()); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSG_DELIVERED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSG_FAILED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSG_READ, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); + DcEventCenter eventCenter = DcHelper.getEventCenter(getContext()); + eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this); + eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this); + eventCenter.addObserver(DcContext.DC_EVENT_MSG_DELIVERED, this); + eventCenter.addObserver(DcContext.DC_EVENT_MSG_FAILED, this); + eventCenter.addObserver(DcContext.DC_EVENT_MSG_READ, this); + eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); markseenDebouncer = new Debouncer(800); reloadTimer = new Timer("reloadTimer", false); @@ -194,7 +196,7 @@ public class ConversationFragment extends MessageSelectorFragment @Override public void onDestroy() { - dcContext.eventCenter.removeObservers(this); + DcHelper.getEventCenter(getContext()).removeObservers(this); reloadTimer.cancel(); super.onDestroy(); } diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java index 5dfdc0067..68cd9e722 100644 --- a/src/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java @@ -127,7 +127,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit handleOpenpgp4fpr(); if (getIntent().getBooleanExtra(CLEAR_NOTIFICATIONS, false)) { - DcHelper.getContext(this).notificationCenter.removeAllNotifiations(); + DcHelper.getNotificationCenter(this).removeAllNotifiations(); } } diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 8dda93e1b..d92da966f 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -54,7 +54,6 @@ import org.thoughtcrime.securesms.ConversationListAdapter.ItemClickListener; import org.thoughtcrime.securesms.components.recyclerview.DeleteItemAnimator; import org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton; import org.thoughtcrime.securesms.components.reminder.DozeReminder; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.mms.GlideApp; @@ -105,22 +104,22 @@ public class ConversationListFragment extends Fragment locale = (Locale) getArguments().getSerializable(PassphraseRequiredActionBarActivity.LOCALE_EXTRA); archive = getArguments().getBoolean(ARCHIVE, false); - ApplicationDcContext dcContext = DcHelper.getContext(getActivity()); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSGS_NOTICED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSG_DELIVERED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSG_FAILED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSG_READ, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSG_READ, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CONNECTIVITY_CHANGED, this); + DcEventCenter eventCenter = DcHelper.getEventCenter(getActivity()); + eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); + eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this); + eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this); + eventCenter.addObserver(DcContext.DC_EVENT_MSGS_NOTICED, this); + eventCenter.addObserver(DcContext.DC_EVENT_MSG_DELIVERED, this); + eventCenter.addObserver(DcContext.DC_EVENT_MSG_FAILED, this); + eventCenter.addObserver(DcContext.DC_EVENT_MSG_READ, this); + eventCenter.addObserver(DcContext.DC_EVENT_MSG_READ, this); + eventCenter.addObserver(DcContext.DC_EVENT_CONNECTIVITY_CHANGED, this); } @Override public void onDestroy() { super.onDestroy(); - DcHelper.getContext(getActivity()).eventCenter.removeObservers(this); + DcHelper.getEventCenter(getActivity()).removeObservers(this); } @SuppressLint("RestrictedApi") @@ -315,7 +314,7 @@ public class ConversationListFragment extends Fragment @SuppressLint("StaticFieldLeak") private void handleDeleteAllSelected() { - final ApplicationDcContext dcContext = DcHelper.getContext(getActivity()); + final DcContext dcContext = DcHelper.getContext(getActivity()); int conversationsCount = getListAdapter().getBatchSelections().size(); AlertDialog.Builder alert = new AlertDialog.Builder(getActivity()); alert.setMessage(getActivity().getResources().getQuantityString(R.plurals.ask_delete_chat, @@ -341,7 +340,7 @@ public class ConversationListFragment extends Fragment @Override protected Void doInBackground(Void... params) { for (long chatId : selectedConversations) { - dcContext.notificationCenter.removeNotifications((int) chatId); + DcHelper.getNotificationCenter(getContext()).removeNotifications((int) chatId); dcContext.deleteChat((int) chatId); } return null; @@ -449,7 +448,7 @@ public class ConversationListFragment extends Fragment } private boolean areSomeSelectedChatsUnpinned() { - ApplicationDcContext dcContext = DcHelper.getContext(getActivity()); + DcContext dcContext = DcHelper.getContext(getActivity()); final Set selectedChats = getListAdapter().getBatchSelections(); for (long chatId : selectedChats) { DcChat dcChat = dcContext.getChat((int)chatId); diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java index 1b4f44add..70164117a 100644 --- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java +++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java @@ -30,7 +30,6 @@ import com.bumptech.glide.request.transition.Transition; import com.soundcloud.android.crop.Crop; import org.thoughtcrime.securesms.components.AvatarSelector; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto; @@ -71,7 +70,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity public static final int AVATAR_SIZE = 210; private static final int REQUEST_CODE_AVATAR = 2759; - private ApplicationDcContext dcContext; + private DcContext dcContext; private boolean verified; private EditText groupName; @@ -112,8 +111,9 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity initializeExistingGroup(); initializeResources(); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this); + DcEventCenter eventCenter = DcHelper.getEventCenter(this); + eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); + eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this); } @Override @@ -126,7 +126,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity @Override protected void onDestroy() { - dcContext.eventCenter.removeObservers(this); + DcHelper.getEventCenter(this).removeObservers(this); super.onDestroy(); } diff --git a/src/org/thoughtcrime/securesms/MessageSelectorFragment.java b/src/org/thoughtcrime/securesms/MessageSelectorFragment.java index fe28b9579..9760096c5 100644 --- a/src/org/thoughtcrime/securesms/MessageSelectorFragment.java +++ b/src/org/thoughtcrime/securesms/MessageSelectorFragment.java @@ -12,9 +12,9 @@ import androidx.appcompat.app.AlertDialog; import androidx.appcompat.view.ActionMode; import androidx.fragment.app.Fragment; +import com.b44t.messenger.DcContext; import com.b44t.messenger.DcMsg; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.permissions.Permissions; @@ -27,7 +27,7 @@ public abstract class MessageSelectorFragment implements DcEventCenter.DcEventDelegate { protected ActionMode actionMode; - protected ApplicationDcContext dcContext; + protected DcContext dcContext; protected abstract void setCorrectMenuVisibility(Menu menu); diff --git a/src/org/thoughtcrime/securesms/ProfileActivity.java b/src/org/thoughtcrime/securesms/ProfileActivity.java index 73363e321..e4adfd757 100644 --- a/src/org/thoughtcrime/securesms/ProfileActivity.java +++ b/src/org/thoughtcrime/securesms/ProfileActivity.java @@ -28,7 +28,6 @@ import com.b44t.messenger.DcContext; import com.b44t.messenger.DcEvent; import com.google.android.material.tabs.TabLayout; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.mms.GlideApp; @@ -65,7 +64,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme(); private final DynamicLanguage dynamicLanguage = new DynamicLanguage(); - private ApplicationDcContext dcContext; + private DcContext dcContext; private int chatId; private boolean chatIsGroup; private boolean chatIsDeviceTalk; @@ -118,8 +117,9 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity } } - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this); + DcEventCenter eventCenter = DcHelper.getEventCenter(this); + eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); + eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this); } @Override @@ -191,7 +191,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity @Override public void onDestroy() { - dcContext.eventCenter.removeObservers(this); + DcHelper.getEventCenter(this).removeObservers(this); super.onDestroy(); } diff --git a/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java b/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java index 494318175..2856d6106 100644 --- a/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java +++ b/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java @@ -24,6 +24,7 @@ import com.b44t.messenger.DcEvent; import com.b44t.messenger.DcMsg; import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager; +import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader; import org.thoughtcrime.securesms.util.ViewUtil; @@ -74,14 +75,15 @@ public class ProfileDocumentsFragment this.recyclerView.setLayoutManager(gridManager); this.recyclerView.setHasFixedSize(true); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this); + DcEventCenter eventCenter = DcHelper.getEventCenter(getContext()); + eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this); + eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this); return view; } @Override public void onDestroyView() { - dcContext.eventCenter.removeObservers(this); + DcHelper.getEventCenter(getContext()).removeObservers(this); super.onDestroyView(); } diff --git a/src/org/thoughtcrime/securesms/ProfileGalleryFragment.java b/src/org/thoughtcrime/securesms/ProfileGalleryFragment.java index 57277701b..6851d47eb 100644 --- a/src/org/thoughtcrime/securesms/ProfileGalleryFragment.java +++ b/src/org/thoughtcrime/securesms/ProfileGalleryFragment.java @@ -24,6 +24,7 @@ import com.b44t.messenger.DcEvent; import com.b44t.messenger.DcMsg; import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager; +import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader; @@ -77,14 +78,16 @@ public class ProfileGalleryFragment this.recyclerView.setLayoutManager(gridManager); this.recyclerView.setHasFixedSize(true); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this); + DcEventCenter eventCenter = DcHelper.getEventCenter(getContext()); + eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this); + eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this); return view; } @Override public void onDestroyView() { - dcContext.eventCenter.removeObservers(this); + DcEventCenter eventCenter = DcHelper.getEventCenter(getContext()); + eventCenter.removeObservers(this); super.onDestroyView(); } diff --git a/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java b/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java index 5c556dc8a..7e9342e76 100644 --- a/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java +++ b/src/org/thoughtcrime/securesms/ProfileSettingsFragment.java @@ -28,7 +28,6 @@ import com.b44t.messenger.DcContact; import com.b44t.messenger.DcContext; import com.b44t.messenger.DcEvent; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.mms.GlideApp; @@ -59,7 +58,7 @@ public class ProfileSettingsFragment extends Fragment private Locale locale; - private ApplicationDcContext dcContext; + private DcContext dcContext; protected int chatId; private int contactId; @@ -91,16 +90,17 @@ public class ProfileSettingsFragment extends Fragment update(); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this); + DcEventCenter eventCenter = DcHelper.getEventCenter(getContext()); + eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this); + eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this); + eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this); + eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this); return view; } @Override public void onDestroyView() { - dcContext.eventCenter.removeObservers(this); + DcHelper.getEventCenter(getContext()).removeObservers(this); super.onDestroyView(); } diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java index d61e52dff..749b30256 100644 --- a/src/org/thoughtcrime/securesms/RegistrationActivity.java +++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java @@ -33,7 +33,6 @@ import android.widget.Toast; import com.b44t.messenger.DcContext; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.permissions.Permissions; @@ -178,7 +177,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve certCheck.setSelection(certCheckFlags); } - DcHelper.getContext(this).eventCenter.addObserver(DcContext.DC_EVENT_CONFIGURE_PROGRESS, this); + DcHelper.getEventCenter(this).addObserver(DcContext.DC_EVENT_CONFIGURE_PROGRESS, this); } @Override @@ -234,7 +233,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve @Override public void onDestroy() { super.onDestroy(); - DcHelper.getContext(this).eventCenter.removeObservers(this); + DcHelper.getEventCenter(this).removeObservers(this); } @Override @@ -524,10 +523,9 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve // calling configure() results in // receiving multiple DC_EVENT_CONFIGURE_PROGRESS events - ApplicationDcContext dcContext = DcHelper.getContext(this); - dcContext.stopIo(); - dcContext.captureNextError(); - dcContext.configure(); + DcHelper.getAccounts(this).stopIo(); + DcHelper.getEventCenter(this).captureNextError(); + DcHelper.getContext(this).configure(); } private void setConfig(@IdRes int viewId, String configTarget, boolean doTrim) { @@ -546,11 +544,10 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve @Override public void handleEvent(DcEvent event) { if (event.getId()==DcContext.DC_EVENT_CONFIGURE_PROGRESS) { - ApplicationDcContext dcContext = DcHelper.getContext(this); long progress = event.getData1Int(); if (progress==0/*error/aborted*/) { - dcContext.maybeStartIo(); // start-io is also needed on errors to make previous config work in case of changes - dcContext.endCaptureNextError(); + DcHelper.getAccounts(this).startIo(); // start-io is also needed on errors to make previous config work in case of changes + DcHelper.getEventCenter(this).endCaptureNextError(); progressDialog.dismiss(); WelcomeActivity.maybeShowConfigurationError(this, event.getData2Str()); } @@ -559,8 +556,8 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve progressDialog.setMessage(getResources().getString(R.string.one_moment)+String.format(" %d%%", percent)); } else if (progress==1000/*done*/) { - dcContext.maybeStartIo(); - dcContext.endCaptureNextError(); + DcHelper.getAccounts(this).startIo(); + DcHelper.getEventCenter(this).endCaptureNextError(); progressDialog.dismiss(); Intent conversationList = new Intent(getApplicationContext(), ConversationListActivity.class); startActivity(conversationList); diff --git a/src/org/thoughtcrime/securesms/WelcomeActivity.java b/src/org/thoughtcrime/securesms/WelcomeActivity.java index 0c7b22901..b2eedb5bb 100644 --- a/src/org/thoughtcrime/securesms/WelcomeActivity.java +++ b/src/org/thoughtcrime/securesms/WelcomeActivity.java @@ -21,7 +21,6 @@ import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; import org.thoughtcrime.securesms.connect.AccountManager; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.permissions.Permissions; @@ -37,7 +36,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen private boolean manualConfigure = true; // false: configure by QR account creation private ProgressDialog progressDialog = null; - ApplicationDcContext dcContext; + DcContext dcContext; private NotificationController notificationController; @Override @@ -54,8 +53,9 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen backupButton.setOnClickListener((view) -> startImportBackup()); dcContext = DcHelper.getContext(this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_CONFIGURE_PROGRESS, this); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_IMEX_PROGRESS, this); + DcEventCenter eventCenter = DcHelper.getEventCenter(this); + eventCenter.addObserver(DcContext.DC_EVENT_CONFIGURE_PROGRESS, this); + eventCenter.addObserver(DcContext.DC_EVENT_IMEX_PROGRESS, this); } @Override @@ -71,7 +71,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen @Override public void onDestroy() { super.onDestroy(); - DcHelper.getContext(this).eventCenter.removeObservers(this); + DcHelper.getEventCenter(this).removeObservers(this); } @Override @@ -140,7 +140,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen }); progressDialog.show(); - dcContext.captureNextError(); + DcHelper.getEventCenter(this).captureNextError(); dcContext.imex(DcContext.DC_IMEX_IMPORT_BACKUP, backupFile); } @@ -160,15 +160,15 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen }); progressDialog.show(); - dcContext.captureNextError(); + DcHelper.getEventCenter(this).captureNextError(); if (!dcContext.setConfigFromQr(qrCode)) { - progressError(dcContext.getCapturedError()); + progressError(DcHelper.getEventCenter(this).getCapturedError()); } // calling configure() results in // receiving multiple DC_EVENT_CONFIGURE_PROGRESS events - dcContext.stopIo(); + DcHelper.getAccounts(this).stopIo(); dcContext.configure(); } @@ -183,7 +183,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen } private void progressSuccess(boolean enterDisplayname) { - dcContext.endCaptureNextError(); + DcHelper.getEventCenter(this).endCaptureNextError(); progressDialog.dismiss(); if (enterDisplayname) { @@ -219,7 +219,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen if (eventId== DcContext.DC_EVENT_IMEX_PROGRESS ) { long progress = event.getData1Int(); if (progress==0/*error/aborted*/) { - progressError(dcContext.getCapturedError()); + progressError(DcHelper.getEventCenter(this).getCapturedError()); notificationController.close(); } else if (progress<1000/*progress in permille*/) { @@ -227,7 +227,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen notificationController.setProgress(1000, progress, String.format(" %d%%", (int) progress / 10)); } else if (progress==1000/*done*/) { - dcContext.maybeStartIo(); + DcHelper.getAccounts(this).startIo(); progressSuccess(false); notificationController.close(); } @@ -235,7 +235,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen else if (manualConfigure && eventId==DcContext.DC_EVENT_CONFIGURE_PROGRESS) { long progress = event.getData1Int(); if (progress==1000/*done*/) { - dcContext.maybeStartIo(); + DcHelper.getAccounts(this).startIo(); finish(); // remove ourself from the activity stack (finishAffinity is available in API 16, we're targeting API 14) } } @@ -248,7 +248,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen progressUpdate((int)progress); } else if (progress==1000/*done*/) { - dcContext.maybeStartIo(); + DcHelper.getAccounts(this).startIo(); progressSuccess(true); } } diff --git a/src/org/thoughtcrime/securesms/connect/AccountManager.java b/src/org/thoughtcrime/securesms/connect/AccountManager.java index 2531d76de..10760a28b 100644 --- a/src/org/thoughtcrime/securesms/connect/AccountManager.java +++ b/src/org/thoughtcrime/securesms/connect/AccountManager.java @@ -97,12 +97,14 @@ public class AccountManager { private void resetDcContext(Context context) { // create an empty DcContext object - this will be set up then, starting with // getSelectedAccount() + /* TODO ApplicationContext appContext = (ApplicationContext)context.getApplicationContext(); appContext.dcContext.notificationCenter.removeAllNotifiations(); appContext.dcContext.stopIo(); appContext.dcContext.unref(); appContext.dcContext = new ApplicationDcContext(context); DcHelper.setStockTranslations(context); + */ } diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java deleted file mode 100644 index 13f016784..000000000 --- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java +++ /dev/null @@ -1,179 +0,0 @@ -package org.thoughtcrime.securesms.connect; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.net.Uri; -import android.os.Build; -import android.os.Environment; -import android.provider.Settings; -import android.util.Log; -import android.webkit.MimeTypeMap; -import android.widget.Toast; - -import androidx.annotation.IntDef; -import androidx.annotation.NonNull; -import androidx.core.content.FileProvider; - -import com.b44t.messenger.DcChat; -import com.b44t.messenger.DcContact; -import com.b44t.messenger.DcContext; -import com.b44t.messenger.DcEvent; -import com.b44t.messenger.DcEventEmitter; -import com.b44t.messenger.DcLot; -import com.b44t.messenger.DcMsg; - -import org.thoughtcrime.securesms.BuildConfig; -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.database.model.ThreadRecord; -import org.thoughtcrime.securesms.notifications.NotificationCenter; -import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.util.Prefs; -import org.thoughtcrime.securesms.util.Util; - -import java.io.File; -import java.util.Date; -import java.util.HashMap; - -public class ApplicationDcContext extends DcContext { - - public static final String TAG = "DeltaChat"; - - public Context context; - public NotificationCenter notificationCenter; - - public ApplicationDcContext(Context context) { - super("Android "+BuildConfig.VERSION_NAME, AccountManager.getInstance().getSelectedAccount(context).getAbsolutePath()); - this.context = context; - - new Thread(() -> { - DcEventEmitter emitter = getEventEmitter(); - while (true) { - DcEvent event = emitter.getNextEvent(); - if (event==null) { - break; - } - handleEvent(event); - } - Log.i(TAG, "shutting down event handler"); - }, "eventThread").start(); - - notificationCenter = new NotificationCenter(this); - maybeStartIo(); - } - - public void maybeStartIo() { - Log.i("DeltaChat", "++++++++++++++++++ ApplicationDcContext.maybeStartIo() ++++++++++++++++++"); - if (isConfigured()!=0) { - startIo(); - } - } - - /*********************************************************************************************** - * Event Handling - **********************************************************************************************/ - - public DcEventCenter eventCenter = new DcEventCenter(); - - private final Object lastErrorLock = new Object(); - private String lastErrorString = ""; - private boolean showNextErrorAsToast = true; - - public void captureNextError() { - synchronized (lastErrorLock) { - showNextErrorAsToast = false; - lastErrorString = ""; - } - } - - public boolean hasCapturedError() { - synchronized (lastErrorLock) { - return !lastErrorString.isEmpty(); - } - } - - public String getCapturedError() { - synchronized (lastErrorLock) { - return lastErrorString; - } - } - - public void endCaptureNextError() { - synchronized (lastErrorLock) { - showNextErrorAsToast = true; - } - } - - private void handleError(int event, String string) { - // log error - boolean showAsToast; - Log.e(TAG, string); - synchronized (lastErrorLock) { - lastErrorString = string; - showAsToast = showNextErrorAsToast; - showNextErrorAsToast = true; - } - - // show error to user - Util.runOnMain(() -> { - if (showAsToast) { - String toastString = null; - - if (event == DC_EVENT_ERROR_SELF_NOT_IN_GROUP) { - toastString = context.getString(R.string.group_self_not_in_group); - } - - ForegroundDetector foregroundDetector = ForegroundDetector.getInstance(); - if (toastString != null && (foregroundDetector == null || foregroundDetector.isForeground())) { - Toast.makeText(context, toastString, Toast.LENGTH_LONG).show(); - } - } - }); - } - - public long handleEvent(DcEvent event) { - int id = event.getId(); - switch (id) { - case DC_EVENT_INFO: - Log.i(TAG, event.getData2Str()); - break; - - case DC_EVENT_WARNING: - Log.w(TAG, event.getData2Str()); - break; - - case DC_EVENT_ERROR: - handleError(id, event.getData2Str()); - break; - - case DC_EVENT_ERROR_SELF_NOT_IN_GROUP: - handleError(id, event.getData2Str()); - break; - - case DC_EVENT_INCOMING_MSG: - notificationCenter.addNotification(event.getData1Int(), event.getData2Int()); - if (eventCenter != null) { - eventCenter.sendToObservers(event); - } - break; - - case DC_EVENT_MSGS_NOTICED: - notificationCenter.removeNotifications(event.getData1Int()); - if (eventCenter != null) { - eventCenter.sendToObservers(event); - } - break; - - default: { - if (eventCenter != null) { - eventCenter.sendToObservers(event); - } - } - break; - } - return 0; - } - -} diff --git a/src/org/thoughtcrime/securesms/connect/DcEventCenter.java b/src/org/thoughtcrime/securesms/connect/DcEventCenter.java index db600274d..9c4428ab2 100644 --- a/src/org/thoughtcrime/securesms/connect/DcEventCenter.java +++ b/src/org/thoughtcrime/securesms/connect/DcEventCenter.java @@ -1,7 +1,13 @@ package org.thoughtcrime.securesms.connect; +import android.content.Context; +import android.util.Log; +import android.widget.Toast; + +import com.b44t.messenger.DcContext; import com.b44t.messenger.DcEvent; +import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.util.Util; import java.util.ArrayList; @@ -10,6 +16,7 @@ import java.util.Hashtable; public class DcEventCenter { private Hashtable> allObservers = new Hashtable<>(); private final Object LOCK = new Object(); + private final Context context; public interface DcEventDelegate { void handleEvent(DcEvent event); @@ -18,6 +25,10 @@ public class DcEventCenter { } } + public DcEventCenter(Context context) { + this.context = context.getApplicationContext(); + } + /** * @deprecated use addObserver(int, DcEventDelegate) instead. */ @@ -87,4 +98,97 @@ public class DcEventCenter { } } } + + private final Object lastErrorLock = new Object(); + private String lastErrorString = ""; + private boolean showNextErrorAsToast = true; + + public void captureNextError() { + synchronized (lastErrorLock) { + showNextErrorAsToast = false; + lastErrorString = ""; + } + } + + public boolean hasCapturedError() { + synchronized (lastErrorLock) { + return !lastErrorString.isEmpty(); + } + } + + public String getCapturedError() { + synchronized (lastErrorLock) { + return lastErrorString; + } + } + + public void endCaptureNextError() { + synchronized (lastErrorLock) { + showNextErrorAsToast = true; + } + } + + private void handleError(int event, String string) { + // log error + boolean showAsToast; + Log.e("DeltaChat", string); + synchronized (lastErrorLock) { + lastErrorString = string; + showAsToast = showNextErrorAsToast; + showNextErrorAsToast = true; + } + + // show error to user + Util.runOnMain(() -> { + if (showAsToast) { + String toastString = null; + + if (event == DcContext.DC_EVENT_ERROR_SELF_NOT_IN_GROUP) { + toastString = context.getString(R.string.group_self_not_in_group); + } + + ForegroundDetector foregroundDetector = ForegroundDetector.getInstance(); + if (toastString != null && (foregroundDetector == null || foregroundDetector.isForeground())) { + Toast.makeText(context, toastString, Toast.LENGTH_LONG).show(); + } + } + }); + } + + public long handleEvent(DcEvent event) { + int id = event.getId(); + switch (id) { + case DcContext.DC_EVENT_INFO: + Log.i("DeltaChat", event.getData2Str()); + break; + + case DcContext.DC_EVENT_WARNING: + Log.w("DeltaChat", event.getData2Str()); + break; + + case DcContext.DC_EVENT_ERROR: + handleError(id, event.getData2Str()); + break; + + case DcContext.DC_EVENT_ERROR_SELF_NOT_IN_GROUP: + handleError(id, event.getData2Str()); + break; + + case DcContext.DC_EVENT_INCOMING_MSG: + DcHelper.getNotificationCenter(context).addNotification(event.getData1Int(), event.getData2Int()); + sendToObservers(event); + break; + + case DcContext.DC_EVENT_MSGS_NOTICED: + DcHelper.getNotificationCenter(context).removeNotifications(event.getData1Int()); + sendToObservers(event); + break; + + default: { + sendToObservers(event); + } + break; + } + return 0; + } } diff --git a/src/org/thoughtcrime/securesms/connect/DcHelper.java b/src/org/thoughtcrime/securesms/connect/DcHelper.java index bf911eed9..e59b58775 100644 --- a/src/org/thoughtcrime/securesms/connect/DcHelper.java +++ b/src/org/thoughtcrime/securesms/connect/DcHelper.java @@ -16,6 +16,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.core.content.FileProvider; +import com.b44t.messenger.DcAccounts; import com.b44t.messenger.DcChat; import com.b44t.messenger.DcContact; import com.b44t.messenger.DcContext; @@ -27,6 +28,7 @@ import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.ConversationActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.model.ThreadRecord; +import org.thoughtcrime.securesms.notifications.NotificationCenter; import org.thoughtcrime.securesms.recipients.Recipient; import java.io.File; @@ -63,10 +65,22 @@ public class DcHelper { public static final String CONFIG_MEDIA_QUALITY = "media_quality"; public static final String CONFIG_WEBRTC_INSTANCE = "webrtc_instance"; - public static ApplicationDcContext getContext(@NonNull Context context) { + public static DcContext getContext(@NonNull Context context) { return ApplicationContext.getInstance(context).dcContext; } + public static DcAccounts getAccounts(@NonNull Context context) { + return ApplicationContext.getInstance(context).dcAccounts; + } + + public static DcEventCenter getEventCenter(@NonNull Context context) { + return ApplicationContext.getInstance(context).eventCenter; + } + + public static NotificationCenter getNotificationCenter(@NonNull Context context) { + return ApplicationContext.getInstance(context).notificationCenter; + } + public static boolean isConfigured(Context context) { DcContext dcContext = getContext(context); return dcContext.isConfigured() == 1; diff --git a/src/org/thoughtcrime/securesms/connect/FetchWorker.java b/src/org/thoughtcrime/securesms/connect/FetchWorker.java index 45986333f..0f3f33481 100644 --- a/src/org/thoughtcrime/securesms/connect/FetchWorker.java +++ b/src/org/thoughtcrime/securesms/connect/FetchWorker.java @@ -26,8 +26,7 @@ public class FetchWorker extends Worker { @Override public @NonNull Result doWork() { Log.i("DeltaChat", "++++++++++++++++++ FetchWorker.doWork() started ++++++++++++++++++"); - ApplicationDcContext dcContext = DcHelper.getContext(context); - dcContext.maybeStartIo(); + DcHelper.getAccounts(context).startIo(); // as we do not know when startIo() has done it's work or if is even doable in one step, // we go the easy way and just wait for some amount of time. diff --git a/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java b/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java index 6a33f6f39..08fda2f3f 100644 --- a/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java +++ b/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java @@ -38,11 +38,11 @@ public class ForegroundDetector implements Application.ActivityLifecycleCallback public void onActivityStarted(Activity activity) { if (refs == 0) { Log.i("DeltaChat", "++++++++++++++++++ first ForegroundDetector.onActivityStarted() ++++++++++++++++++"); - DcHelper.getContext(application).maybeStartIo(); + DcHelper.getAccounts(application).startIo(); if (DcHelper.isNetworkConnected(application)) { new Thread(() -> { Log.i("DeltaChat", "calling maybeNetwork()"); - DcHelper.getContext(application).maybeNetwork(); + DcHelper.getAccounts(application).maybeNetwork(); Log.i("DeltaChat", "maybeNetwork() returned"); }).start(); } diff --git a/src/org/thoughtcrime/securesms/connect/NetworkStateReceiver.java b/src/org/thoughtcrime/securesms/connect/NetworkStateReceiver.java index ed4fc3afa..03c592a5f 100644 --- a/src/org/thoughtcrime/securesms/connect/NetworkStateReceiver.java +++ b/src/org/thoughtcrime/securesms/connect/NetworkStateReceiver.java @@ -20,14 +20,13 @@ public class NetworkStateReceiver extends BroadcastReceiver { if (ni != null && ni.getState() == NetworkInfo.State.CONNECTED) { Log.i("DeltaChat", "++++++++++++++++++ Connected ++++++++++++++++++"); - DcContext dcContext = DcHelper.getContext(context); new Thread(() -> { // call dc_maybe_network() from a worker thread. // theoretically, dc_maybe_network() can be called from the main thread and returns at once, // however, in reality, it does currently halt things for some seconds. // this is a workaround that make things usable for now. Log.i("DeltaChat", "calling maybeNetwork()"); - dcContext.maybeNetwork(); + DcHelper.getAccounts(context).maybeNetwork(); Log.i("DeltaChat", "maybeNetwork() returned"); }).start(); } diff --git a/src/org/thoughtcrime/securesms/map/MapDataManager.java b/src/org/thoughtcrime/securesms/map/MapDataManager.java index e5354a8c2..d4aaa148b 100644 --- a/src/org/thoughtcrime/securesms/map/MapDataManager.java +++ b/src/org/thoughtcrime/securesms/map/MapDataManager.java @@ -8,6 +8,7 @@ import android.util.Log; import androidx.annotation.NonNull; +import com.b44t.messenger.DcContext; import com.b44t.messenger.DcEvent; import com.mapbox.android.core.permissions.PermissionsManager; import com.mapbox.geojson.Feature; @@ -26,7 +27,6 @@ import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.emoji.EmojiProvider; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.map.DataCollectionTask.DataCollectionCallback; @@ -127,7 +127,7 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, private int chatId; private LatLngBounds.Builder boundingBuilder; private Context context; - private ApplicationDcContext dcContext; + private DcContext dcContext; private MapDataState callback; private boolean isInitial = true; private boolean showTraces = false; @@ -158,13 +158,13 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, applyLastPositionFilter(); updateSources(); - dcContext.eventCenter.addObserver(DC_EVENT_LOCATION_CHANGED, this); + DcHelper.getEventCenter(context).addObserver(DC_EVENT_LOCATION_CHANGED, this); Log.d(TAG, "performance test - create map manager finished"); } public void onResume() { - dcContext.eventCenter.addObserver(DC_EVENT_LOCATION_CHANGED, this); + DcHelper.getEventCenter(context).addObserver(DC_EVENT_LOCATION_CHANGED, this); if (!isInitial) { updateSources(); } @@ -172,7 +172,7 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, } public void onPause() { - dcContext.eventCenter.removeObserver(DC_EVENT_LOCATION_CHANGED, this); + DcHelper.getEventCenter(context).removeObserver(DC_EVENT_LOCATION_CHANGED, this); } public void onDestroy() { diff --git a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java index 71a199816..3c0df2378 100644 --- a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java +++ b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java @@ -6,7 +6,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.util.Util; @@ -27,12 +26,10 @@ public class MarkReadReceiver extends BroadcastReceiver { return; } - final ApplicationDcContext dcContext = DcHelper.getContext(context); - Util.runOnAnyBackgroundThread(() -> { - dcContext.notificationCenter.removeNotifications(chatId); + DcHelper.getNotificationCenter(context).removeNotifications(chatId); if (markNoticed) { - dcContext.marknoticedChat(chatId); + DcHelper.getContext(context).marknoticedChat(chatId); } }); } diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java b/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java index ca9f889ef..1f7bc3b92 100644 --- a/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java +++ b/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java @@ -24,13 +24,14 @@ import androidx.core.app.RemoteInput; import androidx.core.app.TaskStackBuilder; import com.b44t.messenger.DcChat; +import com.b44t.messenger.DcContext; import com.b44t.messenger.DcMsg; import com.bumptech.glide.load.engine.DiskCacheStrategy; import org.thoughtcrime.securesms.ConversationActivity; import org.thoughtcrime.securesms.ConversationListActivity; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; +import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference; @@ -48,16 +49,16 @@ import java.util.concurrent.TimeUnit; public class NotificationCenter { private static final String TAG = NotificationCenter.class.getSimpleName(); - @NonNull private ApplicationDcContext dcContext; + @NonNull private DcContext dcContext; @NonNull private Context context; private volatile int visibleChatId = 0; private volatile long lastAudibleNotification = 0; private static final long MIN_AUDIBLE_PERIOD_MILLIS = TimeUnit.SECONDS.toMillis(2); private final HashMap> inboxes = new HashMap<>(); // contains the last lines of each chat - public NotificationCenter(ApplicationDcContext dcContext) { - this.dcContext = dcContext; - this.context = dcContext.context.getApplicationContext(); + public NotificationCenter(Context context) { + this.context = context.getApplicationContext(); + this.dcContext = DcHelper.getContext(context); } private @Nullable Uri effectiveSound(int chatId) { // chatId=0: return app-global setting diff --git a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java index c39fcb668..bf8b34270 100644 --- a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java +++ b/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java @@ -25,7 +25,6 @@ import android.os.AsyncTask; import android.os.Bundle; import androidx.core.app.RemoteInput; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcHelper; @@ -54,9 +53,8 @@ public class RemoteReplyReceiver extends BroadcastReceiver { new AsyncTask() { @Override protected Void doInBackground(Void... params) { - ApplicationDcContext dcContext = DcHelper.getContext(context); - dcContext.sendTextMsg(chatId, responseText.toString()); - dcContext.notificationCenter.removeNotifications(chatId); + DcHelper.getContext(context).sendTextMsg(chatId, responseText.toString()); + DcHelper.getNotificationCenter(context).removeNotifications(chatId); return null; } }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index bd8584605..a6769e8de 100644 --- a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -111,19 +111,19 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment private boolean handleImapCheck(Preference preference, Object newValue, String dc_config_name) { final boolean newEnabled = (Boolean) newValue; if(newEnabled) { - dcContext.stopIo(); + DcHelper.getAccounts(getContext()).stopIo(); dcContext.setConfigInt(dc_config_name, 1); - dcContext.maybeStartIo(); + DcHelper.getAccounts(getContext()).startIo(); return true; } else { new AlertDialog.Builder(getContext()) .setMessage(R.string.pref_imap_folder_warn_disable_defaults) .setPositiveButton(R.string.ok, (dialogInterface, i) -> { - dcContext.stopIo(); + DcHelper.getAccounts(getContext()).stopIo(); dcContext.setConfigInt(dc_config_name, 0); ((CheckBoxPreference)preference).setChecked(false); - dcContext.maybeStartIo(); + DcHelper.getAccounts(getContext()).startIo(); }) .setNegativeButton(R.string.cancel, null) .show(); diff --git a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java index 83b9741b1..99962639c 100644 --- a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms.preferences; +import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.widget.Toast; @@ -13,7 +14,6 @@ import com.b44t.messenger.DcContext; import com.b44t.messenger.DcEvent; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.service.GenericForegroundService; @@ -26,19 +26,19 @@ import java.util.Arrays; public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceFragment implements DcEventCenter.DcEventDelegate { protected static final int REQUEST_CODE_CONFIRM_CREDENTIALS_BACKUP = ScreenLockUtil.REQUEST_CODE_CONFIRM_CREDENTIALS + 1; protected static final int REQUEST_CODE_CONFIRM_CREDENTIALS_KEYS = REQUEST_CODE_CONFIRM_CREDENTIALS_BACKUP + 1; - protected ApplicationDcContext dcContext; + protected DcContext dcContext; private NotificationController notificationController; @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); dcContext = DcHelper.getContext(getContext()); - dcContext.eventCenter.addObserver(DcContext.DC_EVENT_IMEX_PROGRESS, this); + DcHelper.getEventCenter(getContext()).addObserver(DcContext.DC_EVENT_IMEX_PROGRESS, this); } @Override public void onDestroy() { - dcContext.eventCenter.removeObservers(this); + DcHelper.getEventCenter(getContext()).removeObservers(this); if (notificationController != null) { // cancel backup when settings-activity is destroyed. @@ -120,8 +120,8 @@ public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceF progressDialog.show(); imexDir = DcHelper.getImexDir().getAbsolutePath(); - dcContext.stopIo(); - dcContext.captureNextError(); + DcHelper.getAccounts(getActivity()).stopIo(); + DcHelper.getEventCenter(getActivity()).captureNextError(); dcContext.imex(progressWhat, imexDir); } @@ -129,14 +129,15 @@ public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceF public void handleEvent(DcEvent event) { if (event.getId()== DcContext.DC_EVENT_IMEX_PROGRESS) { long progress = event.getData1Int(); + Context context = getActivity(); if (progress==0/*error/aborted*/) { - dcContext.endCaptureNextError(); - dcContext.maybeStartIo(); + DcHelper.getEventCenter(context).endCaptureNextError(); + DcHelper.getAccounts(context).startIo(); progressDialog.dismiss(); progressDialog = null; - if (dcContext.hasCapturedError()) { - new AlertDialog.Builder(getActivity()) - .setMessage(dcContext.getCapturedError()) + if (DcHelper.getEventCenter(context).hasCapturedError()) { + new AlertDialog.Builder(context) + .setMessage(DcHelper.getEventCenter(context).getCapturedError()) .setPositiveButton(android.R.string.ok, null) .show(); } @@ -150,23 +151,23 @@ public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceF notificationController.setProgress(1000, progress, formattedPercent); } else if (progress==1000/*done*/) { - dcContext.endCaptureNextError(); - dcContext.maybeStartIo(); + DcHelper.getEventCenter(context).endCaptureNextError(); + DcHelper.getAccounts(context).startIo(); progressDialog.dismiss(); progressDialog = null; notificationController.close(); notificationController = null; String msg = ""; if (progressWhat==DcContext.DC_IMEX_EXPORT_BACKUP) { - msg = getActivity().getString(R.string.pref_backup_written_to_x, imexDir); + msg = context.getString(R.string.pref_backup_written_to_x, imexDir); } else if (progressWhat==DcContext.DC_IMEX_EXPORT_SELF_KEYS) { - msg = getActivity().getString(R.string.pref_managekeys_secret_keys_exported_to_x, imexDir); + msg = context.getString(R.string.pref_managekeys_secret_keys_exported_to_x, imexDir); } else if (progressWhat==DcContext.DC_IMEX_IMPORT_SELF_KEYS) { - msg = getActivity().getString(R.string.pref_managekeys_secret_keys_imported_from_x, imexDir); + msg = context.getString(R.string.pref_managekeys_secret_keys_imported_from_x, imexDir); } - new AlertDialog.Builder(getActivity()) + new AlertDialog.Builder(context) .setMessage(msg) .setPositiveButton(android.R.string.ok, null) .show(); diff --git a/src/org/thoughtcrime/securesms/qr/QrCodeHandler.java b/src/org/thoughtcrime/securesms/qr/QrCodeHandler.java index 36167b163..f942945ca 100644 --- a/src/org/thoughtcrime/securesms/qr/QrCodeHandler.java +++ b/src/org/thoughtcrime/securesms/qr/QrCodeHandler.java @@ -16,7 +16,6 @@ import com.google.zxing.integration.android.IntentResult; import org.thoughtcrime.securesms.ConversationActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.connect.AccountManager; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.util.IntentUtils; @@ -28,7 +27,7 @@ public class QrCodeHandler implements DcEventCenter.DcEventDelegate { private Activity activity; ProgressDialog progressDialog; - private ApplicationDcContext dcContext; + private DcContext dcContext; public QrCodeHandler(Activity activity) { this.activity = activity; @@ -219,13 +218,13 @@ public class QrCodeHandler implements DcEventCenter.DcEventDelegate { progressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, activity.getString(android.R.string.cancel), (dialog, which) -> dcContext.stopOngoingProcess()); progressDialog.show(); - dcContext.captureNextError(); + DcHelper.getEventCenter(activity).captureNextError(); new Thread(() -> { - dcContext.eventCenter.addObserver(this, DcContext.DC_EVENT_SECUREJOIN_JOINER_PROGRESS); + DcHelper.getEventCenter(activity).addObserver(DcContext.DC_EVENT_SECUREJOIN_JOINER_PROGRESS, this); int newChatId = dcContext.joinSecurejoin(qrRawString); // joinSecurejoin() runs until all needed messages are sent+received! - dcContext.eventCenter.removeObservers(this); + DcHelper.getEventCenter(activity).removeObservers(this); Util.runOnMain(() -> { if (progressDialog != null) { @@ -233,8 +232,8 @@ public class QrCodeHandler implements DcEventCenter.DcEventDelegate { progressDialog = null; } - String errorString = dcContext.getCapturedError(); - dcContext.endCaptureNextError(); + String errorString = DcHelper.getEventCenter(activity).getCapturedError(); + DcHelper.getEventCenter(activity).endCaptureNextError(); if (newChatId != 0) { Intent intent = new Intent(activity, ConversationActivity.class); intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, newChatId); diff --git a/src/org/thoughtcrime/securesms/qr/QrShowActivity.java b/src/org/thoughtcrime/securesms/qr/QrShowActivity.java index a77d92859..a7d197ea3 100644 --- a/src/org/thoughtcrime/securesms/qr/QrShowActivity.java +++ b/src/org/thoughtcrime/securesms/qr/QrShowActivity.java @@ -6,8 +6,9 @@ import android.view.MenuItem; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; +import com.b44t.messenger.DcContext; + import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.util.DynamicLanguage; @@ -22,7 +23,7 @@ public class QrShowActivity extends AppCompatActivity { DcEventCenter dcEventCenter; - ApplicationDcContext dcContext; + DcContext dcContext; @Override protected void onCreate(Bundle savedInstanceState) { @@ -33,7 +34,7 @@ public class QrShowActivity extends AppCompatActivity { setContentView(R.layout.activity_qr_show); dcContext = DcHelper.getContext(this); - dcEventCenter = dcContext.eventCenter; + dcEventCenter = DcHelper.getEventCenter(this); Bundle extras = getIntent().getExtras(); int chatId = 0; diff --git a/src/org/thoughtcrime/securesms/qr/QrShowFragment.java b/src/org/thoughtcrime/securesms/qr/QrShowFragment.java index 88b2bca8f..b3e42ff02 100644 --- a/src/org/thoughtcrime/securesms/qr/QrShowFragment.java +++ b/src/org/thoughtcrime/securesms/qr/QrShowFragment.java @@ -30,7 +30,6 @@ import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; @@ -46,7 +45,7 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel private DcEventCenter dcEventCenter; - private ApplicationDcContext dcContext; + private DcContext dcContext; private String hint; @@ -69,7 +68,7 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel View view = inflater.inflate(R.layout.qr_show_fragment, container, false); dcContext = DcHelper.getContext(getActivity()); - dcEventCenter = dcContext.eventCenter; + dcEventCenter = DcHelper.getEventCenter(getActivity()); Bundle extras = getActivity().getIntent().getExtras(); int chatId = 0;