Commit graph

7096 commits

Author SHA1 Message Date
Marcel Hibbe
1b843d85d9
Merge pull request #2835 from nextcloud/bugfix/2834/avoidNPEscrollToMessage
Avoid NPE (replace scrollToPositionWithOffset(..) with scrollToPositi…
2023-03-06 13:38:36 +01:00
Marcel Hibbe
16a0ef8dcf
Avoid NPE (replace scrollToPositionWithOffset(..) with scrollToPosition(0))
Exception java.lang.NullPointerException:
  at com.nextcloud.talk.controllers.ChatController.processMessagesFromTheFuture (ChatController.kt:2500)
  at com.nextcloud.talk.controllers.ChatController.processMessages (ChatController.kt:2443)
  at com.nextcloud.talk.controllers.ChatController.processMessagesResponse (ChatController.kt:2404)
  at com.nextcloud.talk.controllers.ChatController.access$processMessagesResponse (ChatController.kt:221)
  at com.nextcloud.talk.controllers.ChatController$pullChatMessages$2.onNext (ChatController.kt:2315)
  at com.nextcloud.talk.controllers.ChatController$pullChatMessages$2.onNext (ChatController.kt:2300)
  at io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal (ObservableObserveOn.java:201)
  at io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run (ObservableObserveOn.java:255)
  at io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run (HandlerScheduler.java:124)
  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:7872)
  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)

 I don't know why scrollToPositionWithOffset was used. scrollToPosition(0) works just fine.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-03-06 12:09:17 +01:00
Andy Scherzinger
af2dba94b7
Merge pull request #2832 from nextcloud/dependabot/gradle/org.jlleitschuh.gradle-ktlint-gradle-11.3.1
Build(deps): Bump org.jlleitschuh.gradle:ktlint-gradle from 11.2.0 to 11.3.1
2023-03-06 09:13:34 +01:00
Nextcloud bot
94399a1833
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-06 04:34:21 +00:00
Nextcloud bot
9214b5b9a2
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-06 04:34:01 +00:00
Nextcloud Android Bot
362da7efed Weekly 16.1.0 Alpha 03 2023-03-06 03:15:32 +00:00
dependabot[bot]
6c9efac031
Build(deps): Bump org.jlleitschuh.gradle:ktlint-gradle
Bumps org.jlleitschuh.gradle:ktlint-gradle from 11.2.0 to 11.3.1.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle:ktlint-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-06 02:57:25 +00:00
Nextcloud bot
a2c95b34fa
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-05 04:33:30 +00:00
Nextcloud bot
8b4a320e5a
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-05 04:33:10 +00:00
Nextcloud bot
c9f75ba5ad
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-04 04:32:23 +00:00
Nextcloud bot
8abc1cc8ab
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-04 04:32:03 +00:00
Marcel Hibbe
dbbb0258cd
Merge pull request #2830 from nextcloud/bugfix/2817/fixOnlineStatusButtonsTheming
Fix theming of set status dialog buttons
2023-03-03 19:30:20 +01:00
Marcel Hibbe
13ca7746c1
Fix theming of set status dialog buttons
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-03-03 19:19:04 +01:00
Andy Scherzinger
9684ce15f2
Merge pull request #2828 from nextcloud/bugfix/noid/stringFix
fix string so build is possible again
2023-03-03 18:49:58 +01:00
Andy Scherzinger
195cb3c0b4
fix string so build is possible again
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-03-03 18:46:13 +01:00
Marcel Hibbe
467e6c9a67
Merge pull request #2826 from nextcloud/noid/addDebugToast
Add toast for debug mode if failed to get NC notification
2023-03-03 17:23:36 +01:00
Marcel Hibbe
2de0029c0e
Add toast for debug mode if failed to get NC notification
+ remove unused code

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-03-03 17:22:39 +01:00
Marcel Hibbe
b72fad3607
Merge pull request #2824 from nextcloud/bugfix/2784/avoidCrashWhenJoinOtherRoomDuringCall
Restrict to join other rooms while being in a call
2023-03-03 15:59:49 +01:00
Marcel Hibbe
e9f10864b9
Update app/src/main/res/values/strings.xml
Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-03-03 15:59:13 +01:00
Marcel Hibbe
5f2e2c5fe6
Restrict to join other rooms while being in a call
When clicking on a conversation in conversation overview, restrict opening immediately.
If joinRoomWithPassword in ChatController is reached in any other way (for example by creating a new conversation while being in a call), then it's restricted to join the room.

All this is done to avoid NPE:

D/ChatController: pullChatMessages - pullChatMessages[lookIntoFuture > 0] - got response
W/System.err: java.lang.NullPointerException
W/System.err:     at com.nextcloud.talk.controllers.ChatController.modifyMessageCount(ChatController.kt:2536)
W/System.err:     at com.nextcloud.talk.controllers.ChatController.addMessagesToAdapter(ChatController.kt:2515)
W/System.err:     at com.nextcloud.talk.controllers.ChatController.processMessagesFromTheFuture(ChatController.kt:2489)
W/System.err:     at com.nextcloud.talk.controllers.ChatController.processMessages(ChatController.kt:2437)
W/System.err:     at com.nextcloud.talk.controllers.ChatController.processMessagesResponse(ChatController.kt:2398)
W/System.err:     at com.nextcloud.talk.controllers.ChatController.access$processMessagesResponse(ChatController.kt:221)
W/System.err:     at com.nextcloud.talk.controllers.ChatController$pullChatMessages$2.onNext(ChatController.kt:2309)
W/System.err:     at com.nextcloud.talk.controllers.ChatController$pullChatMessages$2.onNext(ChatController.kt:2294)
W/System.err:     at io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)
W/System.err:     at io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)
W/System.err:     at io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)
W/System.err:     at android.os.Handler.handleCallback(Handler.java:883)
W/System.err:     at android.os.Handler.dispatchMessage(Handler.java:100)
W/System.err:     at android.os.Looper.loop(Looper.java:224)
W/System.err:     at android.app.ActivityThread.main(ActivityThread.java:7590)
W/System.err:     at java.lang.reflect.Method.invoke(Native Method)
W/System.err:     at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:539)
W/System.err:     at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:950)

Known issues:
- doesn't respect handling for other instances. E.g. when receiving notification from other instance and open it.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

Fix to always allow opening same room when being in call

Fix to set also other properties for ApplicationWideCurrentRoomHolder when joining room in chat.

Otherwise it could have been possible to not be allowed to open this chat again from conversation list while being in call.

In a next step, ApplicationWideCurrentRoomHolder should be refactored to hold the conversation itself. Maybe in a map of users to handle different instances.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-03-03 14:57:57 +01:00
Marcel Hibbe
96c1e581fb
Merge pull request #2815 from nextcloud/bugfix/noid/reduceGetRoomRequests
Request RoomInfo every 30 sec instead 5sec when not waiting in lobby
2023-03-03 09:43:52 +01:00
Marcel Hibbe
21b353c77a Request RoomInfo every 30 sec instead 5sec when not waiting in lobby
Before it was requested every 5 sec even when not waiting in a lobby.
This is a first improvement to reduce requests. In a next step, more signaling messages should be handled to maybe even avoid recursive calls at all.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-03-03 08:40:15 +00:00
Nextcloud bot
7b3fe475cf
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-03 03:50:10 +00:00
Nextcloud bot
df71fcaff0
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-03 03:49:50 +00:00
Andy Scherzinger
2fcd5e97c9
Merge pull request #2820 from nextcloud/feature/2794/hideBreakoutRoomsFromConvList
Hide inactive breakout rooms from conversation list
2023-03-02 19:05:33 +01:00
Marcel Hibbe
b6dccddcb9
Hide inactive breakout rooms from conversation list
+ create ConversationObjectTypeConverter for objectType

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-03-02 16:32:09 +01:00
Marcel Hibbe
6536ebb9a3
Merge pull request #2808 from nextcloud/bugfix/2060/fixDuplicatedMessages
Avoid duplicated messages / Fix messages not being displayed
2023-03-02 11:33:04 +01:00
Marcel Hibbe
d75e235ba2
Use session id returned from join room & more
1)
Use session id returned from join room
= introduce sessionIdAfterRoomJoined to make clear this is the session to use instead of currentConversation?.sessionId

See https://nextcloud-talk.readthedocs.io/en/latest/conversation/#get-user-s-conversations :
"'0' if not connected, otherwise an up to 512 character long string that is the identifier of the user's session making the request. Should only be used to pre-check if the user joined already with this session, but this might be outdated by the time of usage, so better check via Get list of participants in a conversation"

2)
Also, trigger getRoomInfo() or handleFromNotification() in onAttach() instead of in onViewBound.
onViewBound is not called when returning back from an other view (e.g. conversation infos) so after this, new messages were not handled.

Furthermore, getRoomInfo()/joinRoomWithPassword() in onViewBound and onAttach were sometimes both called, because the handling of validSessionId was buggy. This resulted in duplicated messages.

3)
Use ApplicationWideCurrentRoomHolder to set sessionId from call and check in ChatController if there is already a session for the room. If yes, use this instead to joinRoom again.
This is necessary for PictureInPicture mode. Otherwise, call would be left whenever ChatController joins room again.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-03-02 11:31:37 +01:00
Marcel Hibbe
5d129ba03e
Replace "inConversation" with check of valid session id
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-03-02 11:31:37 +01:00
Andy Scherzinger
968593ccf7
Merge pull request #2810 from nextcloud/bugfix/noid/showUploadFailedNotificationForNormalUpload
Show upload failed notification when failed normal upload
2023-03-02 10:43:41 +01:00
Nextcloud bot
50d509cc0a
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-02 03:47:42 +00:00
Nextcloud bot
7d83a116e6
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-02 03:47:22 +00:00
Marcel Hibbe
4883f62964
Show upload failed notification when failed normal upload
avoid:

2023-03-01 16:47:40.443 23569-23628 UploadAndS...ilesWorker com.nextcloud.talk2                  E  Something went wrong when trying to upload file
                                                                                                    java.lang.NullPointerException
                                                                                                    	at com.nextcloud.talk.jobs.UploadAndShareFilesWorker.showFailedToUploadNotification(UploadAndShareFilesWorker.kt:258)
                                                                                                    	at com.nextcloud.talk.jobs.UploadAndShareFilesWorker.doWork(UploadAndShareFilesWorker.kt:163)
                                                                                                    	at androidx.work.Worker$1.run(Worker.java:86)
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1167)
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:641)
                                                                                                    	at java.lang.Thread.run(Thread.java:919)
2023-03-01 16:47:40.444 23569-23607 WM-WorkerWrapper        com.nextcloud.talk2                  E  Work [ id=27e4e319-a966-4515-ac07-d6ad7ee68268, tags={ com.nextcloud.talk.jobs.UploadAndShareFilesWorker } ] failed because it threw an exception/error
                                                                                                    java.util.concurrent.ExecutionException: java.lang.NullPointerException
                                                                                                    	at androidx.work.impl.utils.futures.AbstractFuture.getDoneValue(AbstractFuture.java:516)
                                                                                                    	at androidx.work.impl.utils.futures.AbstractFuture.get(AbstractFuture.java:475)
                                                                                                    	at androidx.work.impl.WorkerWrapper$2.run(WorkerWrapper.java:311)
                                                                                                    	at androidx.work.impl.utils.SerialExecutor$Task.run(SerialExecutor.java:91)
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1167)
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:641)
                                                                                                    	at java.lang.Thread.run(Thread.java:919)
                                                                                                    Caused by: java.lang.NullPointerException
                                                                                                    	at com.nextcloud.talk.jobs.UploadAndShareFilesWorker.showFailedToUploadNotification(UploadAndShareFilesWorker.kt:258)
                                                                                                    	at com.nextcloud.talk.jobs.UploadAndShareFilesWorker.doWork(UploadAndShareFilesWorker.kt:167)
                                                                                                    	at androidx.work.Worker$1.run(Worker.java:86)
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1167) 
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:641) 
                                                                                                    	at java.lang.Thread.run(Thread.java:919) 
2023-03-01 16:47:40.446 23569-23607 WM-WorkerWrapper        com.nextcloud.talk2                  I  Worker result FAILURE for Work [ id=27e4e319-a966-

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-03-01 17:30:57 +01:00
Nextcloud bot
667696659d
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-01 04:06:37 +00:00
Nextcloud bot
cee569da88
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-03-01 04:06:13 +00:00
Andy Scherzinger
362a2be7cd
Merge pull request #2805 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-7.4.2
Build(deps): Bump com.android.tools.build:gradle from 7.4.1 to 7.4.2
2023-02-28 08:17:14 +01:00
Andy Scherzinger
14c698b0f3
Merge pull request #2806 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
2023-02-28 08:14:42 +01:00
Andy Scherzinger
c1e392d285
Merge pull request #2804 from nextcloud/dependabot/github_actions/github/codeql-action-2.2.5
Build(deps): Bump github/codeql-action from 2.2.4 to 2.2.5
2023-02-28 08:13:53 +01:00
Nextcloud bot
2f3af516bd
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-02-28 03:50:22 +00:00
Nextcloud bot
5707aaf68f
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-02-28 03:50:01 +00:00
nextcloud-android-bot
cdaf738604 🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2023-02-28 03:05:51 +00:00
dependabot[bot]
0c422b9509
Build(deps): Bump com.android.tools.build:gradle from 7.4.1 to 7.4.2
Bumps com.android.tools.build:gradle from 7.4.1 to 7.4.2.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 02:58:13 +00:00
dependabot[bot]
8d5016b84a
Build(deps): Bump github/codeql-action from 2.2.4 to 2.2.5
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.2.4 to 2.2.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](17573ee1cc...32dc499307)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 00:01:41 +00:00
Andy Scherzinger
7c75f8254d
Merge pull request #2802 from nextcloud/issue-1090
Implemented automatic scrolling to quoted messages on tap
2023-02-27 18:13:10 +01:00
Andy Scherzinger
19e3b6d0b1
improve code formatting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2023-02-27 17:21:43 +01:00
rapterjet2004
6cdfa88992
Implemented issue 1090 Signed-off-by: Julius Linus <juliuslinus1@gmail.com> 2023-02-27 17:06:38 +01:00
Andy Scherzinger
18af67b360
Merge pull request #2775 from nextcloud/dependabot/gradle/com.google.android.gms-play-services-base-18.2.0
Build(deps): Bump com.google.android.gms:play-services-base from 18.1.0 to 18.2.0
2023-02-27 16:44:48 +01:00
Andy Scherzinger
f1fd334b64
Merge pull request #2800 from nextcloud/bugfix/noid/avoidNpeForUnreadBubble
Bugfix/noid/avoid npe for unread bubble
2023-02-27 16:44:25 +01:00
dependabot[bot]
404b203075
Build(deps): Bump com.google.android.gms:play-services-base
Bumps com.google.android.gms:play-services-base from 18.1.0 to 18.2.0.

---
updated-dependencies:
- dependency-name: com.google.android.gms:play-services-base
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-27 15:43:15 +01:00
Marcel Hibbe
1c660cc02f
Hide scroll to bottom button when automatically scrolled to new message
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2023-02-27 13:28:58 +01:00