jubb 38164ea23d Merge remote-tracking branch 'upstream/master' into calls ... # Conflicts: # app/build.gradle # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt # app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt # app/src/main/res/values/strings.xml # gradle.properties # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPollerV2.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPollerV2.kt # libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt		2022-02-08 09:58:57 +11:00
..
AppModule.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
CallModule.kt	feat: handle discarding pending calls from linked devices	2021-11-22 16:58:28 +11:00
DatabaseComponent.kt	refactor: use hilt to provide DB instead of our own factory, inject it in some places where possible	2021-10-04 18:51:19 +11:00
DatabaseModule.kt	feat: adding remainder of basic functionality to services and CallManager.kt	2021-11-05 16:35:40 +11:00
InjectableType.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00