TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,023 Commits 46 Branches 892 Tags 481 MiB
1efda68334
Commit Graph

8023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
andrew
1efda68334 Merge branch 'dev' into utilise-dialog-dsl 2023-06-06 19:51:50 +09:30
Morgan Pretty
6edf0d46f8 build: increment build number 2023-06-06 09:30:43 +10:00
Morgan Pretty
31608111b3 Merge remote-tracking branch 'upstream/master' into dev 2023-06-06 09:08:45 +10:00
Morgan Pretty
7f7ab63d15
Merge pull request #1164 from RyanRory/bluetooth-manager-crash 
Fix crash & ANRs
 2023-06-06 09:00:49 +10:00
Morgan Pretty
f1686ea260
Merge pull request #1236 from bemusementpark/fix-dialog-theme-background 
Fix dialog theme to set windowColor and not background of every view
 2023-06-06 08:53:40 +10:00
andrew
e5db7fc886 Fix dialog theme so it sets window color and not background of every child view 2023-06-05 19:15:42 +09:30
Morgan Pretty
9d5fa1239c Commented out the plus button on the replace profile modal 2023-06-05 17:15:05 +10:00
Morgan Pretty
346bdc1774 Merge remote-tracking branch 'upstream/dev' into bluetooth-manager-crash 2023-06-05 16:05:20 +10:00
Morgan Pretty
6c14ed26e2
Merge pull request #1229 from bemusementpark/fix-long-message 
[SES-571] Fix long message not visible on react
 2023-06-05 16:04:52 +10:00
Morgan Pretty
f21100eff7 [SES-569] Merge branch 'fix-pic' into bluetooth-manager-crash 2023-06-05 16:02:11 +10:00
andrew
a6cfe5817d Change unset profile pic in dialog 2023-06-05 14:58:56 +09:30
Morgan Pretty
6b006b9d91
Merge pull request #1235 from bemusementpark/fix-colorControlHighlight 
Fix back button background in light themes
 2023-06-05 14:44:51 +10:00
Morgan Pretty
c92ef09d09 [SES-570] Fixed an issue where quotes weren't using their quoted message media 2023-06-05 14:31:41 +10:00
andrew
e99133fd8b Fix back button background in light themes 2023-06-05 13:13:49 +09:30
andrew
09b241ba67 Fix dialog#view(layoutRes) 2023-06-05 11:11:59 +09:30
Morgan Pretty
1980113e41 [SES-566] Fixed an issue where the blocked state wasn't syncing 2023-06-05 09:39:31 +10:00
andrew
94b48d5fb9 Utilise dialog dsl in DeleteMediaPreviewDialog 2023-06-02 22:36:15 +09:30
andrew
975f9fc4d1 Utilise dialog dsl in DeleteMediaDialog 2023-06-02 22:05:34 +09:30
andrew
033eabbc53 Utilise dialog dsl in SettingsDialog 2023-06-02 19:19:43 +09:30
andrew
4641512644 Utilise dialog dsl in RationaleDialog 2023-06-02 19:11:58 +09:30
Morgan Pretty
2b7bd7417e [SES-567] Fixed a couple of issues where the Group poller would be stopped during creation 2023-06-02 17:00:20 +10:00
andrew
cbe90e7bfc Cleanup ConversationReactionOverlay 2023-06-02 15:46:28 +09:30
andrew
6d528d0e92 Fix long message not visible on react 2023-06-02 15:35:35 +09:30
andrew
72c07f4b99 Utilise dialog dsl in PrivacySettingsPreferenceFragment 2023-06-01 00:07:15 +09:30
andrew
80f21aeb41 Convert PrivacySettingsPreferenceFragment to Kotlin 2023-05-31 22:23:46 +09:30
andrew
c5f821add0 Utilise dialog dsl in ExpirationDialog 2023-05-31 21:58:38 +09:30
andrew
50271685af Utilise dialog dsl in MuteDialog 2023-05-31 18:05:23 +09:30
andrew
623cfde8b1 Utilise dialog dsl in CallToggleListener 2023-05-31 13:07:28 +09:30
andrew
391735dc28 Convert CallToggleListener to Kotlin 2023-05-31 13:02:33 +09:30
andrew
4e92c40210 Remove BaseDialog and utilise dialog DSL 2023-05-31 12:43:51 +09:30
andrew
1d8d678047 Make kotlin code use dialog dsl 2023-05-30 21:39:03 +09:30
andrew
4ee68cbbb1 Utilise dialog dsl 2023-05-30 16:49:07 +09:30
andrew
1b88d4f950 Utilise dialog dsl 2023-05-30 16:49:01 +09:30
Morgan Pretty
9b7fb3dd86 Removed the JobDatabase since it's no longer used 2023-05-30 13:31:36 +10:00
Morgan Pretty
8ce6e997aa Fixed a potential crash after changing a property to be nullable 2023-05-30 12:50:51 +10:00
Morgan Pretty
b7744f4f2d Addressed PR feedback 2023-05-30 12:43:51 +10:00
Morgan Pretty
c77d465438 Merge remote-tracking branch 'upstream/dev' into bluetooth-manager-crash 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt
#	app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt
 2023-05-30 12:25:13 +10:00
Morgan Pretty
0c2a635d03 Merge remote-tracking branch 'upstream/dev' into bluetooth-manager-crash 2023-05-30 12:24:32 +10:00
Morgan Pretty
10af2815ac
Merge pull request #1176 from bemusementpark/sync-everything 
Synchronize usage of Cipher
 2023-05-30 12:22:28 +10:00
Andrew
e8d26222b9
Fix scroll to bottom button visibility (#1219) 2023-05-30 11:44:20 +09:30
andrew
0af713317a Merge branch 'dev' into sync-everything 2023-05-30 11:34:34 +09:30
Morgan Pretty
22ed2dd8aa
Merge pull request #1205 from bemusementpark/disable-unblock 
Disable unblock button
 2023-05-30 10:30:51 +10:00
Morgan Pretty
d541f395a5
Merge pull request #1213 from bemusementpark/fix-id-divider-color 
Fix ID divider color
 2023-05-30 10:29:57 +10:00
andrew
03aa19aae4 . 2023-05-29 18:02:20 +09:30
Andrew
5519f17775
Truncate session id when displayed as username (#1215) 2023-05-25 10:58:52 +09:30
Andrew
7d31af9eb0
Fix isScrolledToBottom (#1217) 2023-05-25 10:57:05 +09:30
Andrew
331d523c45
Improve notification content dialog (#1211) 2023-05-24 18:03:27 +09:30
Andrew
47d5b242ca
Fix share button color (#1212) 2023-05-24 18:00:32 +09:30
Andrew
1b231bfff3
Fix dialog button style (#1214) 2023-05-24 13:06:26 +09:30
Andrew
945df19aef
Fix radio button selection transition (#1209) 2023-05-24 11:23:57 +09:30