mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-25 06:25:40 +03:00
Code Issues Projects Releases Packages Wiki Activity
9626 commits 93 branches 408 tags 64 MiB
Commit graph

7271 commits

Author SHA1 Message Date
sowjanyakch
f20ec95b5f
Avoid conflicting overloads 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-12 17:26:26 +02:00
sowjanyakch
3946240e4f
Add verification metadata 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-12 17:26:26 +02:00
sowjanyakch
f8bc4f2e96
upload conversation avatar 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-12 17:26:25 +02:00
sowjanyakch
fa014aab3a
Make pickImage work 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-12 17:26:25 +02:00
sowjanyakch
df6d54d51c
Add endpoints upload and delete Conversation Avatar 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-12 17:26:25 +02:00
Marcel Hibbe
9976767591
Merge pull request #4193 from nextcloud/bugfix/4168/doNotPullMessagesWhenOfflineOrPaused 
do not try to pull chat messages when offline or paused
 2024-09-12 17:24:21 +02:00
Marcel Hibbe
50c9cfdb54
Merge pull request #4194 from nextcloud/bugfix/noid/delayWebsocketReconnect 
sleep one second before websocket reconnect
 2024-09-12 12:02:43 +02:00
Nextcloud bot
9a44a9bf19
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-12 02:50:22 +00:00
Marcel Hibbe
24c27d0029
sleep one second before websocket reconnect 
otherwise it's an endless loop without delay which may stress the devices...

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-11 17:21:41 +02:00
Marcel Hibbe
9a14764321
do not try to pull chat messages when offline or paused 
Otherwise, it resulted in a lot of flickering because _lastCommonReadFlow was emitted every 500ms. And anyway if we know we are offline or paused then it doesn't make sense to execute the sync method.

chain which caused the flickering was:
updateUiForLastCommonRead (_lastCommonReadFlow) -> updateReadStatusOfAllMessages - notifyDataSetChanged -> onBindViewHolder -> IncomingLinkPreviewMessageViewHolder

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-11 17:05:07 +02:00
Marcel Hibbe
796053e271
remove theming of call buttons to remove disabled look for dark mode 
In dark mode, the call buttons looked like disabled otherwise.

There is still the 3-dots menu next to the call icons like disabled for dark and light mode. But this is a different bug that needs to be fixed in another branch(could not find the reason for now).

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-11 13:49:20 +02:00
Marcel Hibbe
6ddf06e9fd
improve to align unread conversation after tapping on unread mentions button 
...instead to just show it on top

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-11 11:11:56 +02:00
Marcel Hibbe
4209bfa2b4
fix to set searchBehaviorSubject regardless of searchHelper being not null 
same for swipeRefreshLayoutView?.isRefreshing

If searchHelper would be null (= when UnifiedSearch is not available) then going back to conversations list view would not trigger to check to show for unread mentions bubble. This fix will make it independent from searchHelper.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-11 11:11:56 +02:00
Marcel Hibbe
bef414fc10
fix logic to show UnifiedSearch results when federation capability exists 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-11 11:11:56 +02:00
Marcel Hibbe
270d76554f
fix flickering of unread mention bubble 
bug was introduced with https://github.com/nextcloud/talk-android/pull/3417

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-11 11:11:56 +02:00
Marcel Hibbe
5921faa8a8
set background color for password dialog 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-11 10:16:26 +02:00
Marcel Hibbe
2549e884fd
change background color for searchbar in contacts screen 
not the best solution. Needs to be improved with theming of Compose.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-11 09:56:54 +02:00
sowjanyakch
3d1644a76d
Avoid conflicting overloads 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-11 09:31:13 +02:00
sowjanyakch
082669a3bf
ktlint Format 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-11 09:30:41 +02:00
sowjanyakch
06e48c6aad
Set background color for search 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-11 09:30:41 +02:00
sowjanyakch
922c329fab
Fix bug - select contacts onclick 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-11 09:30:41 +02:00
sowjanyakch
9fcb1427db
Make contacts select and deselect via search 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-11 09:30:41 +02:00
sowjanyakch
f374e6fe50
ConversationCreationActivity UI 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-11 09:30:37 +02:00
Nextcloud bot
4fd9428fb4
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-11 02:58:58 +00:00
renovate[bot]
8f68d28016
fix(deps): update dependency androidx.compose:compose-bom to v2024.09.01 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-10 20:32:37 +00:00
renovate[bot]
2d46532f9f
fix(deps): update dependency androidx.compose.ui:ui-test-junit4 to v1.7.1 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-10 20:11:30 +00:00
renovate[bot]
beece3d892
fix(deps): update dependency androidx.compose.runtime:runtime to v1.7.1 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-10 19:54:03 +00:00
Nextcloud bot
216b9d8c0a
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-10 04:22:23 +00:00
Nextcloud bot
214fd0a803
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-09 04:17:30 +00:00
renovate[bot]
b2ebafaf2d
Update dependency io.gitlab.arturbosch.detekt:detekt-formatting to v1.23.7 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-08 17:00:40 +00:00
Nextcloud bot
758e454702
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-08 04:54:22 +00:00
Nextcloud bot
60ecfa72c5
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-07 06:12:22 +00:00
Marcel Hibbe
6858b32f2b
fix NPE when baseUrl is missing 
no idea how this happens, however this was
reported via gplay pre launch report for 20.0.0RC1
("Detected on 10 devices during testing"):

Exception java.lang.NullPointerException: Attempt to invoke virtual method 'java.lang.String com.nextcloud.talk.data.user.model.User.getBaseUrl()' on a null object reference
  at com.nextcloud.talk.activities.BaseActivity.startActivity (BaseActivity.kt:240)
  at com.nextcloud.talk.account.ServerSelectionActivity.showVisitProvidersInfo$lambda$5 (ServerSelectionActivity.kt:206)
  at com.nextcloud.talk.account.ServerSelectionActivity.$r8$lambda$pjpPT-LQbGLSCJPXeRE8IJvpLIE
  at com.nextcloud.talk.account.ServerSelectionActivity$$ExternalSyntheticLambda0.onClick (D8$$SyntheticClass)
  at android.view.View.performClick (View.java:7506)
  at android.view.View.performClickInternal (View.java:7483)
  at android.view.View.-$$Nest$mperformClickInternal
  at android.view.View$PerformClick.run (View.java:29335)
  at android.os.Handler.handleCallback (Handler.java:942)
  at android.os.Handler.dispatchMessage (Handler.java:99)
  at androidx.test.espresso.base.Interrogator.loopAndInterrogate (Interrogator.java:10)
  at androidx.test.espresso.base.UiControllerImpl.loopUntil (UiControllerImpl.java:7)
  at androidx.test.espresso.base.UiControllerImpl.loopUntil (UiControllerImpl.java:1)
  at androidx.test.espresso.base.UiControllerImpl.injectMotionEvent (UiControllerImpl.java:5)
  at androidx.test.espresso.action.MotionEvents.sendUp (MotionEvents.java:6)
  at androidx.test.espresso.action.MotionEvents.sendUp (MotionEvents.java:1)
  at androidx.test.espresso.action.Tap.sendSingleTap (Tap.java:5)
  at androidx.test.espresso.action.Tap.-$$Nest$smsendSingleTap
  at androidx.test.espresso.action.Tap$1.sendTap (Tap.java:1)
  at androidx.test.espresso.action.GeneralClickAction.perform (GeneralClickAction.java:4)
  at androidx.test.espresso.ViewInteraction$SingleExecutionViewAction.perform (ViewInteraction.java:2)
  at androidx.test.espresso.ViewInteraction.doPerform (ViewInteraction.java:23)
  at androidx.test.espresso.ViewInteraction.-$$Nest$mdoPerform
  at androidx.test.espresso.ViewInteraction$1.call (ViewInteraction.java:6)
  at androidx.test.espresso.ViewInteraction$1.call (ViewInteraction.java:1)
  at java.util.concurrent.FutureTask.run (FutureTask.java:264)
  at android.os.Handler.handleCallback (Handler.java:942)
  at android.os.Handler.dispatchMessage (Handler.java:99)
  at android.os.Looper.loopOnce (Looper.java:201)
  at android.os.Looper.loop (Looper.java:288)
  at android.app.ActivityThread.main (ActivityThread.java:7898)
  at java.lang.reflect.Method.invoke
  at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run (RuntimeInit.java:548)
  at com.android.internal.os.ZygoteInit.main (ZygoteInit.java:936)

If baseUrl is really missing this may lead to followup issues, however this maybe only 'happens' in gplay pre launch report without any real world scenario. A best solution may be to make baseUrl not nullable, but don't want to do this on short term before release..

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-06 15:38:13 +02:00
Marcel Hibbe
06f5c0b7c8
Merge pull request #4162 from nextcloud/bugfix/4078/fixSelfReactionWhenReEnteringChat 
Bugfix/4078/fix self reaction when re entering chat
 2024-09-06 15:26:01 +02:00
Marcel Hibbe
129ba94af5
Merge pull request #4139 from nextcloud/bugfix/4010/fixSendTextToTalkApp 
fix to display text that was sent to app via "share to"
 2024-09-06 15:25:49 +02:00
Marcel Hibbe
a0a388cc07
fix to switch background color between incoming&outgoing reaction 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-06 14:32:00 +02:00
Marcel Hibbe
f53f9381b8
fix to always render selfReactions with background color 
= fix type of list in stringToArrayList

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-06 14:32:00 +02:00
renovate[bot]
dcd8782bbb
Update dependency org.junit.vintage:junit-vintage-engine to v5.11.0 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-06 09:20:29 +00:00
Marcel Hibbe
092499ce92
Merge pull request #4100 from nextcloud/restore-broken-tests 
Revert "fix: deactivate broken test and remove test platform config"
 2024-09-06 11:15:10 +02:00
Nextcloud bot
7fc47de696
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-06 03:20:33 +00:00
renovate[bot]
87011cc020
Update dependency com.google.firebase:firebase-messaging to v24.0.1 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 23:07:55 +00:00
renovate[bot]
e57be1ed4d
Update plugin com.google.devtools.ksp to v2.0.20-1.0.25 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 22:02:28 +00:00
renovate[bot]
c4bba78191
Update dependency androidx.compose.material3:material3 to v1.3.0 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 13:54:07 +00:00
Marcel Hibbe
2fbe3dbb14
change wording for visibility of new conversation 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-05 15:41:12 +02:00
Marcel Hibbe
5001fd0b95
colorize status bar 
...for ConversationCreationActivity and ContactsActivityCompose

just a quick fix, this may not be the best solution!

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-05 15:41:12 +02:00
Marcel Hibbe
8a59dd900d
fix to align Participants header 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-05 15:41:12 +02:00
Marcel Hibbe
8d1d44692e
only set password if not empty 
otherwise response will be 400

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-05 15:41:12 +02:00
sowjanyakch
ecb3d5380c
Ktlint Format 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:12 +02:00
sowjanyakch
52378327f9
Work on warnings 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:11 +02:00
sowjanyakch
ff63bcd855
Properly select and deselect contact items 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:11 +02:00
sowjanyakch
5f3d73efce
make conversation available for registered users and guest app users 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:11 +02:00
sowjanyakch
1187b41e51
Set password 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:11 +02:00
sowjanyakch
cb6fdf6fe1
Refactor createRoom() 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:11 +02:00
sowjanyakch
dba56ddac0
Solved error unable to create call adapter for GenericOverall 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:11 +02:00
sowjanyakch
3db1f72981
Created a public conversation 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:10 +02:00
sowjanyakch
2959d8e13a
Create public conversation 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:10 +02:00
sowjanyakch
6b82d7209f
Start ContactsActivity to edit participants 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:10 +02:00
sowjanyakch
6d0144db1a
add participants list 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:10 +02:00
sowjanyakch
6a01309f2f
add participants 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:10 +02:00
sowjanyakch
9ae0d524c0
update ContactsViewModelTest - shareTypes 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:09 +02:00
sowjanyakch
0913b162b3
add participants endpoint 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:09 +02:00
sowjanyakch
e57c13efed
MultiSelect contacts 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:09 +02:00
sowjanyakch
b5f7556b3d
don't create room on clicking contacts when creating a new conversation 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:09 +02:00
sowjanyakch
9f61793c86
add isAddParticipant flag 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:09 +02:00
sowjanyakch
d32bc74559
ConversationCreationActivity - Refactoring 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:08 +02:00
sowjanyakch
cd01c80d71
ConversationCreationActivity UI 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-09-05 15:41:08 +02:00
Marcel Hibbe
ac217163e9
add dummy initialization of Conversation 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-05 14:54:40 +02:00
Marcel Hibbe
22182d211d
add junit-vintage-engine + remove duplicated junit dependency 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-05 14:54:37 +02:00
rapterjet2004
bc0dae7dce
fixed CI 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-05 14:53:36 +02:00
Joas Schilling
8957cff0d0
Revert "fix: deactivate broken test and remove test platform config" 
This reverts commit 37625403d6.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-05 14:53:36 +02:00
renovate[bot]
74b71c613e
fix(deps): update emojiversion to v1.5.0 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 11:28:13 +00:00
renovate[bot]
cd828a0605
fix(deps): update dependency androidx.compose:compose-bom to v2024.09.00 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 11:06:59 +00:00
github-actions[bot]
e48b6587bb
Merge pull request #4150 from nextcloud/renovate/androidx.compose.ui-ui-test-junit4-1.x 
fix(deps): update dependency androidx.compose.ui:ui-test-junit4 to v1.7.0
 2024-09-05 09:52:02 +02:00
renovate[bot]
35885edf1a
fix(deps): update dependency androidx.compose.ui:ui-test-junit4 to v1.7.0 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 07:43:36 +00:00
renovate[bot]
137aaacfcc
fix(deps): update dependency androidx.compose.runtime:runtime to v1.7.0 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 07:42:11 +00:00
renovate[bot]
67461e4b23
fix(deps): update lifecycleversion to v2.8.5 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 04:20:41 +00:00
github-actions[bot]
0fc8cb85e4
Merge pull request #4145 from nextcloud/renovate/androidx.lifecycle-lifecycle-viewmodel-compose-2.x 
fix(deps): update dependency androidx.lifecycle:lifecycle-viewmodel-compose to v2.8.5
 2024-09-05 05:35:03 +02:00
github-actions[bot]
c0f080bee7
Merge pull request #4144 from nextcloud/renovate/androidx.lifecycle-lifecycle-runtime-ktx-2.x 
fix(deps): update dependency androidx.lifecycle:lifecycle-runtime-ktx to v2.8.5
 2024-09-05 05:34:08 +02:00
renovate[bot]
c6bc89b5d6
fix(deps): update dependency androidx.lifecycle:lifecycle-viewmodel-compose to v2.8.5 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 03:10:43 +00:00
renovate[bot]
6ff1c4d72f
fix(deps): update dependency androidx.lifecycle:lifecycle-runtime-ktx to v2.8.5 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 03:08:48 +00:00
Nextcloud bot
20fe1fb8fc
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-05 03:02:22 +00:00
github-actions[bot]
1ad1d1b777
Merge pull request #4142 from nextcloud/renovate/androidx.activity-activity-compose-1.x 
fix(deps): update dependency androidx.activity:activity-compose to v1.9.2
 2024-09-05 04:58:03 +02:00
renovate[bot]
96d743060f
fix(deps): update dependency androidx.activity:activity-ktx to v1.9.2 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 02:27:36 +00:00
renovate[bot]
1e28470c9d
fix(deps): update dependency androidx.activity:activity-compose to v1.9.2 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 02:25:49 +00:00
Julius Linus
7b63d0b432
Merge pull request #4135 from nextcloud/issue-4099-time-picker-bug 
Fixing remind-me-later options
 2024-09-04 08:03:24 -05:00
rapterjet2004
ece1f2ed65
fixed weekendTimeStamp, added a comment for clarity 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
 2024-09-04 07:15:34 -05:00
Marcel Hibbe
07cd9e1ced
fix to display text that was sent to app via "share to" 
the bug was, that the sent text was overwritten with "" in restoreState.

With this fix the saved state is only applied when the input field is empty (which means there was nothing shared)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-04 13:41:15 +02:00
rapterjet2004
ea453dba3e
Follow up bug fixes for offline support 
Got join conversation to work
Unread message popup should work when entering a conversation now
"Delete All Messages" now works without breaking the initMessagePolling
linter

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-04 10:14:51 +02:00
Marcel Hibbe
20724c5efb
fix to scroll to last read message 
This will fix to scroll to the last read message when a chat is opened.

Some refactorings were made that are not necessary for the fix (I tried to also show the "Unread messages" hint in the adapter but came to the conclusion this is not a good idea until chatkit is removed. Chatkit doesn't support to add some item in between but only at the end or start which will make it too complicated..)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-09-04 09:48:42 +02:00
rapterjet2004
08d5d41229
Should be fixed for good , need to test though 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
 2024-09-03 07:59:16 -05:00
Nextcloud bot
a5c6c2abaf
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-02 02:55:24 +00:00
Nextcloud bot
03691644be
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-09-01 03:00:35 +00:00
Nextcloud bot
64912d9d32
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-30 05:22:58 +00:00
renovate[bot]
6d035fca1a
fix(deps): update dependency org.apache.commons:commons-lang3 to v3.17.0 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-29 23:19:14 +00:00
sowjanyakch
2636979136
No Edit Time limit on Note to Self 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-29 09:06:29 +02:00
renovate[bot]
e2be6ad1b0
fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.7.2 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-28 18:51:11 +00:00
renovate[bot]
85049a467a
fix(deps): update mockito monorepo to v5.13.0 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-27 19:39:39 +00:00
renovate[bot]
a1e61de093
fix(deps): update media3_version to v1.4.1 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-27 11:22:04 +00:00
rapterjet2004
64ac46e605
Got it fixed 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
 2024-08-26 10:20:32 +02:00
rapterjet2004
a4fd2e6a4b
Got the highlighting fixed - need to fix the submit button (or disable it) as tapping it destroys the searchViewDisposable for some reason 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
 2024-08-26 10:20:32 +02:00
rapterjet2004
45cb74d4ce
partial fix - now need to reset highlighting after exit 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
 2024-08-26 10:20:32 +02:00
Marcel Hibbe
0564aef1c3 bump version to 20.1.0 Alpha 01 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-26 09:53:44 +02:00
Nextcloud bot
f1a41301cc
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-24 02:52:23 +00:00
Nextcloud bot
974463794f
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-23 02:49:28 +00:00
renovate[bot]
b7713d9333
chore(deps): update plugin com.google.devtools.ksp to v2.0.20-1.0.24 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-22 21:57:34 +00:00
renovate[bot]
9c9aecc1e4
chore(deps): update plugin org.jetbrains.kotlin.plugin.compose to v2.0.20 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-22 09:57:25 +00:00
renovate[bot]
0cb9d5c463
fix(deps): update dependency androidx.compose:compose-bom to v2024.08.00 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-21 18:29:13 +00:00
rapterjet2004
9d75550482
fixed bug where the state of message input fragment wasn't saved because of capabilities 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
 2024-08-21 17:11:38 +02:00
Julius Linus
cb306d905c
Merge branch 'master' into issue-4075-filter-conversation-constrast 2024-08-21 09:26:37 -05:00
Julius Linus
1c52acc95d
Merge branch 'master' into issue-4072-federated-accept-message-should-be-system 2024-08-21 08:24:27 -05:00
renovate[bot]
64831278e4
fix(deps): update dependency com.google.firebase:firebase-messaging to v24 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-20 16:51:48 +00:00
github-actions[bot]
f21af51e60
Merge pull request #4092 from nextcloud/renovate/com.google.android.gms-play-services-base-18.x 
fix(deps): update dependency com.google.android.gms:play-services-base to v18.5.0
 2024-08-20 18:43:59 +02:00
Andy Scherzinger
0fa8d574c0
Revert "jackson-core to 2.14.3 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2024-08-20 18:39:43 +02:00
github-actions[bot]
54a8b4224c
Merge pull request #3627 from nextcloud/renovate/com.fasterxml.jackson.core-jackson-core-2.x 
fix(deps): update dependency com.fasterxml.jackson.core:jackson-core to v2.17.2
 2024-08-20 18:05:41 +02:00
renovate[bot]
711a7853bd
fix(deps): update dependency com.google.android.gms:play-services-base to v18.5.0 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-20 15:58:53 +00:00
renovate[bot]
44cc750dfa
fix(deps): update dependency com.fasterxml.jackson.core:jackson-core to v2.17.2 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-20 15:55:15 +00:00
renovate[bot]
717b8fbbfa
fix(deps): update dependency androidx.test:core to v1.6.1 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-20 15:52:43 +00:00
renovate[bot]
2890b3fa7d
fix(deps): update dependency org.conscrypt:conscrypt-android to v2.5.3 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-20 14:39:16 +00:00
Andy Scherzinger
37625403d6
fix: deactivate broken test and remove test platform config 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2024-08-20 14:56:05 +02:00
renovate[bot]
f3887eca20
fix(deps): update dependency org.osmdroid:osmdroid-android to v6.1.20 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-20 06:08:07 +00:00
Nextcloud bot
7d225f7581
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-20 02:55:42 +00:00
Nextcloud bot
7fcf6add96
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-18 03:16:26 +00:00
Andy Scherzinger
8422b0836b
Merge pull request #4067 from nextcloud/renovate/androidx.test.ext-junit-ktx-1.x 
fix(deps): update dependency androidx.test.ext:junit-ktx to v1.2.1
 2024-08-18 00:13:42 +02:00
Andy Scherzinger
b11d26826d
Merge pull request #4056 from nextcloud/renovate/composeoptions-1.x 
fix(deps): update dependency composeoptions to v1.5.15
 2024-08-18 00:08:46 +02:00
renovate[bot]
9f2dc19ed7 fix(deps): update dependency composeoptions to v1.5.15 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-17 23:55:37 +02:00
renovate[bot]
44a6f6846f Update dependency androidx.test.ext:junit-ktx to v1.2.1 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-17 23:52:36 +02:00
renovate[bot]
53800e646e fix(deps): update dependency androidx.activity:activity-ktx to v1.9.1 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-17 23:50:38 +02:00
Andy Scherzinger
b0351f016e
style: move error color to M3 theme code 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2024-08-17 23:31:57 +02:00
Andy Scherzinger
31d3c83abb
style: M3 divider specs implemented 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2024-08-17 23:31:57 +02:00
Andy Scherzinger
42207a8c10
fix: use theme primary color for stick headers 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2024-08-17 23:31:57 +02:00
Andy Scherzinger
31aacadf6f
fix: status bar color is themed now 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2024-08-17 23:31:57 +02:00
renovate[bot]
4ae1710c61
Update dependency com.github.nextcloud.android-common:ui to v0.23.0 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-17 22:28:51 +02:00
Andy Scherzinger
9d62a6f745
fix: improve detekt score and threshold 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2024-08-17 20:42:26 +02:00
Andy Scherzinger
69ed8207d0
fix: ktlintCheck by reformatting kt code 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2024-08-17 20:20:42 +02:00
Andy Scherzinger
2c7c720a4d
fix: use layoutInflater directly 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2024-08-17 19:56:45 +02:00
renovate[bot]
dba9dc982d chore(deps): update plugin com.google.devtools.ksp to v2.0.10-1.0.24 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-17 19:36:28 +02:00
Nextcloud bot
b03e6f1ff6
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-17 02:52:02 +00:00
rapterjet2004
1930bf0b6d
fix 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
 2024-08-16 09:28:21 -05:00
Nextcloud bot
388de89471
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-16 02:52:15 +00:00
rapterjet2004
7ca68b334a
fix 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
 2024-08-15 11:29:38 -05:00
rapterjet2004
903dd07a1b
fix 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
 2024-08-15 08:38:26 -05:00
Nextcloud bot
176ec82e2f
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-15 09:48:55 +00:00
Sowjanya Kota
ed88841787
Merge pull request #4073 from nextcloud/rakekniven-patch-1 
chore(i18n): Capitalization standardized
 2024-08-15 11:17:44 +02:00
Sowjanya Kota
672ccef79a
Merge pull request #4077 from nextcloud/rename_conversation_gained_string 
Rename string from connection gained to connection established
 2024-08-15 11:17:08 +02:00
Nextcloud bot
4aef18d27e
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-15 03:03:37 +00:00
sowjanyakch
2e96817bcc
Modify string connection_gained 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-14 11:11:57 +02:00
rakekniven
d9cc5a68dd chore(i18n): Capitalization standardized 
Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
 2024-08-14 10:51:54 +02:00
Nextcloud bot
3e52c38f5b
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-14 02:51:06 +00:00
Nextcloud bot
e476092567
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-13 02:52:05 +00:00
Marcel Hibbe
82b3eb3647
fix tests 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 17:13:37 +02:00
Marcel Hibbe
8885b999ca
bump database version to 11 + add migration 
comment in openHelperFactory

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:07 +02:00
Marcel Hibbe
6e2ee1f001
add index to ChatBlockEntity 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:07 +02:00
Marcel Hibbe
edc0554fd2
sort entity attributes of ChatMessageEntity and ConversationEntity alphabetically 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:07 +02:00
Marcel Hibbe
76e6bb0f82
set values to not nullable in ChatMessage wherever this makes sense 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:07 +02:00
Marcel Hibbe
a632765cce
set values to not nullable in ConversationEntity.kt wherever this makes sense 
remove roomId from Conversation (deprecated. only token should be used)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:06 +02:00
Marcel Hibbe
9892613984
rearrange ConversationEntity columns to match documentation 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:06 +02:00
Marcel Hibbe
da04f536f7
remove dao methods to delete data when user is removed 
...will be done by foreign keys cascading. Therefore, also added foreign key to ChatBlockEntity

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:06 +02:00
Marcel Hibbe
e951b3d53a
fix to load newest conversations (online first) 
Before, old conversations that were left still occurred in the list (only adding+updating was done, but never deleting)

also, the list is up to date when coming back from chat. Otherwise there may be unread messages shown for a short moment which were already read.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:06 +02:00
Marcel Hibbe
beb7b150be
minor cleanup 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:06 +02:00
rapterjet2004
6a3ece6703
disabled message queuing - still kept code for now until i can fix it or remove it otherwise 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
 2024-08-12 16:47:05 +02:00
Marcel Hibbe
fe4bf942ab
remove SyncableModel and SyncUtils 
not needed for our requirements + it simplifies code

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:05 +02:00
Marcel Hibbe
a84e69b6bb
fix to processExpiredMessages 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:05 +02:00
Marcel Hibbe
d18bd20bf1
extract a method to getItemFromAdapter 
method was extracted for other purposes but was not used in the end. Anyway it made sense to use it for resumeAudioPlaybackIfNeeded.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:05 +02:00
Marcel Hibbe
217ff6af74
remove comments and unused code 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:05 +02:00
Marcel Hibbe
b757164c6d
only delay readStatus handling for initial loading 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:05 +02:00
Marcel Hibbe
0390c93ed2
implement lastCommonRead handling 
contains one workaround for now, see TODO in updateUiForLastCommonRead method

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:04 +02:00
Marcel Hibbe
5bccdada7c
minor cleanup in OfflineFirstChatRepository 
fix to show unreadMessagesPopup at bottom (typingIndicatorWrapper must not be gone but invisible)

align unreadMessagesPopup to not overlap typingIndicator

fix to hide scrollDown button when unreadMessagesPopup is shown

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:04 +02:00
Marcel Hibbe
a13a53f7fd
fix to hide popupBubbleView for system messages like reactions 
rename popupBubbleView to unreadMessagesPopup

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:04 +02:00
Marcel Hibbe
299e8508c4
handle CLEARED_CHAT for scrolling into past 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:04 +02:00
Marcel Hibbe
85f4d8cd92
handle special system messages in ChatRepo instead in UI 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:04 +02:00
rapterjet2004
db8d7b91d4
WIP UI fixes for offline conversations - next up get queued messges to work and show up as temp messages ( I have some creative ideas for the UI ) 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
 2024-08-12 16:47:03 +02:00
Marcel Hibbe
aa76636f72
handle reaction message for lookIntoFuture 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:03 +02:00
Marcel Hibbe
15d54f745b
revert to bump fido version 
was falsely merged, so now reapplying commit 98f83617

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:03 +02:00
Marcel Hibbe
2408d639e4
Offline support for conversations and chats 
Authors: Julius Linus and Marcel Hibbe

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-12 16:47:03 +02:00
Nextcloud bot
b15c1787c2
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-12 02:48:27 +00:00
Nextcloud bot
fdb0011ed0
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-11 02:47:15 +00:00
Nextcloud bot
ff61a659d2
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-10 02:51:07 +00:00
renovate[bot]
23df5d1953
fix(deps): update dependency org.mockito.kotlin:mockito-kotlin to v5 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-09 17:41:34 +00:00
github-actions[bot]
c162f9f913
Merge pull request #4062 from nextcloud/renovate/coroutines_version 
fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-coroutines-test to v1.8.1
 2024-08-09 16:23:40 +02:00
renovate[bot]
1f47986099
fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-coroutines-test to v1.8.1 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-09 14:05:12 +00:00
renovate[bot]
6b78269a3c
fix(deps): update dependency androidx.lifecycle:lifecycle-viewmodel-compose to v2.8.4 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-09 14:00:38 +00:00
sowjanyakch
4508cbb0aa
work on codacy warnings 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:36 +02:00
sowjanyakch
c6fb2ef6e1
refactoring 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:35 +02:00
sowjanyakch
77a9ae601f
add signature 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:35 +02:00
sowjanyakch
a51e3b98ad
Image uri test cases 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:35 +02:00
sowjanyakch
d656a93e8a
add test cases for create room 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:35 +02:00
sowjanyakch
8d52a6fcc9
add error test case for contacts fetch 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:35 +02:00
sowjanyakch
62b2ecd338
Add tests for fetching contacts 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:35 +02:00
sowjanyakch
9526825da7
Refactor - use Icons 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:34 +02:00
sowjanyakch
acbda6f887
Create fake data for unit tests 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:34 +02:00
sowjanyakch
5d73b65a31
test dependencies 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:34 +02:00
sowjanyakch
d3ff2e9ee9
ViewModelModule.kt changes 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:34 +02:00
sowjanyakch
2582476a54
Contacts Screen 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
 2024-08-09 15:44:34 +02:00
Marcel Hibbe
a9593f25b6
Merge pull request #4060 from nextcloud/fixStringsForBanning 
Fix strings for banning
 2024-08-09 14:16:05 +02:00
Marcel Hibbe
94fbdb25ac
rename layouts for banning 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-09 12:58:53 +02:00
renovate[bot]
2c458254e5
fix(deps): update dependency com.github.nextcloud.android-common:ui to v0.23.0 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-09 10:49:46 +00:00
Marcel Hibbe
5f0563aae3
fix strings for banning (use 'participant' instead 'actor') 
replace key ban_actor with ban_participant

fix upper/lower case

fix to use translation in ConversationInfoActivity instead hardcoded string

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
 2024-08-09 12:38:19 +02:00
Nextcloud bot
e1fe39c93b
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-09 02:55:12 +00:00
Nextcloud bot
43a73f6c84
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2024-08-08 02:51:18 +00:00
renovate[bot]
c32685357d
fix(deps): update workversion to v2.9.1 
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-07 18:27:44 +00:00