Commit Graph

48 Commits

Author SHA1 Message Date
jubb e7b0707377 feat: add in call settings dialog for if calls is disabled in conversation 2022-04-05 16:09:51 +10:00
Harris 4355322ee5 Merge branch '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/messages/ControlMessageView.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
#	app/src/main/res/values/strings.xml
#	app/src/main/res/values/styles.xml
#	libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt
#	libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
#	libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
2022-03-17 16:49:35 +11:00
Harris ad5911e247 fix: don't enable expiring messages in not approvedMe conversations 2022-03-17 13:31:25 +11:00
jubb 53127b69de refactor: compile errors and refactoring to view binding 2022-02-08 12:04:55 +11:00
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
ceokot c113a447cf
refactor: Use view binding to replace Kotlin synthetics (#824)
* refactor: Migrate home screen to data binding

* Add view binding

* Migrate ConversationView to view binding

* Migrate ConversationActivityV2 to view binding

* View model refactor

* Move more functionality to the view model

* Add ui state events flow

* Update conversation item bindings

* Update profile picture view bindings

* Replace Kotlin synthetics with view bindings

* Fix qr code fragment binding and optimize imports

* View binding refactors

* Make TextSecurePreferences an interface and add an implementation to improve testability

* Add conversation repository

* Migrate remaining TextSecurePreferences functions into the interface

* Add unit conversation unit tests

* Add unit test coverage for remaining view model functions
2022-01-14 07:56:15 +02:00
jubb 045d1f5027 Merge remote-tracking branch 'upstream/dev' into rtc_calls
# Conflicts:
#	app/build.gradle
2021-12-20 09:38:13 +11:00
Harris 28b97e45cc
Remove ID copy interactions (#811)
* fix: remove selected session ID interactions

* fix: include thread ID in home activity's creation of user details bottom sheet

* refactor: use bundleOf builder instead of old bundle put value methods
2021-12-16 06:47:26 +02:00
Harris ad9cd8b231 fix: don't display call option in conversation and don't show notification if option not enabled 2021-11-17 14:22:33 +11:00
jubb a0e604dbaf feat: hooking up calls and fixing broken dependencies and compile errors 2021-11-08 17:32:25 +11:00
jubb 3755315b4c feat: adding remainder of basic functionality to services and CallManager.kt 2021-11-05 16:35:40 +11:00
jubb 5cff5ffb45 feat: adding more lifecycle vm and callmanager / call service functionality 2021-11-04 12:07:06 +11:00
Harris 40cca532c2 feat: adding call service functionality and permissions for calls 2021-10-25 18:18:47 +11:00
Harris 97de286896 feat: update to utilise call ID 2021-10-22 08:52:57 +11:00
Harris 50c2ac60d7 Merge remote-tracking branch 'upstream/dev' into rtc_calls
# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
#	app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
2021-10-21 14:19:20 +11:00
Harris 0516526923 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
Harris 287fa9918c feat: add relay toggle for answer and offer 2021-09-14 09:23:10 +10:00
Harris 9e5e137919 feat: added basic call functionality 2021-08-30 16:39:47 +10:00
Harris 1f3db80d36 fix: only show notification settings if the contact is not muted and a group 2021-08-18 12:15:49 +10:00
ryanzhao b03ba5bfa7 clean 2021-08-17 16:16:17 +10:00
ryanzhao b9dd229207 add a flag to disable unsend requests 2021-08-16 15:09:12 +10:00
ryanzhao e8551a3545 improve delete option ui 2021-08-16 12:08:35 +10:00
Harris 2becf9fabe refactor: only display notification settings when the conversation is unmuted, notify the conversation list listeners when notify settings are updated 2021-07-26 14:50:43 +10:00
Harris b95cb2bedb feat: add notification types for all / mentions only or none with UI and push logic 2021-07-20 16:06:59 +10:00
Ryan Zhao 496d9683e3 Merge branch 'dev' of https://github.com/oxen-io/session-android into message-details 2021-07-13 14:43:50 +10:00
Ryan Zhao 0211239360 add message info item in menu 2021-07-13 14:42:16 +10:00
Niels Andriesse 6b7c7d1d2a Add support for new ban and delete all endpoint 2021-07-13 14:28:25 +10:00
Niels Andriesse c984d90b04 Re-organize files 2021-07-09 13:18:48 +10:00
Niels Andriesse 05cc6ea742 Re-enable copying Session IDs in closed groups & clean 2021-07-09 13:01:16 +10:00
Niels Andriesse a9b5c269f6 Re-organize files & delete unused code 2021-07-09 11:14:21 +10:00
ryanzhao 956681f00a Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-30 14:40:00 +10:00
Niels Andriesse 91570dc0b2 Remove resolved TODO 2021-06-30 14:05:53 +10:00
ryanzhao ba1099d276 Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-30 11:48:54 +10:00
ryanzhao 55ad96dcf7 hide search screen when long pressing 2021-06-30 11:44:26 +10:00
ryanzhao c5b117406e fix spinner shows incorrectly the second time open search screen 2021-06-30 10:59:35 +10:00
Niels Andriesse e147b3f5e9 React to mute & block status changes 2021-06-30 10:45:31 +10:00
Ryan Zhao 2159d6836b fix spinning forever 2021-06-29 16:20:55 +10:00
Ryan Zhao 64a70d0555 Merge branch 'ui' of https://github.com/oxen-io/session-android into ui 2021-06-29 16:03:10 +10:00
Ryan Zhao 628477f2fd link event listener 2021-06-29 14:00:47 +10:00
Niels Andriesse 1133cf45c3 Fix crash 2021-06-29 13:48:46 +10:00
Niels Andriesse 9f4571b0c1 Implement remaining menu actions 2021-06-29 13:26:33 +10:00
Ryan Zhao 6b4acd0232 clean 2021-06-29 11:51:04 +10:00
Ryan Zhao 61ff68b532 add search bottom bar ui 2021-06-29 11:49:10 +10:00
Niels Andriesse 8d45efde4d Implement more option menu actions 2021-06-29 11:14:58 +10:00
Niels Andriesse 05cfb0dfd9 Implement various option menu actions 2021-06-29 10:39:00 +10:00
Niels Andriesse 4fc75e5a78 Implement remaining contextual actions 2021-06-29 10:05:39 +10:00
Niels Andriesse 18e345733e Implement a few basic contextual actions 2021-06-28 16:28:00 +10:00
nielsandriesse e1345a8774 Implement conversation item context menu interaction 2021-06-07 14:04:55 +10:00