Commit graph

10774 commits

Author SHA1 Message Date
SpiritCroc
4918b7e7bf Merge branch 'unifiedpush' into sc
Change-Id: I0d19e4032b0f31cc1dee404cb383046d04a3259e
2021-08-21 09:21:19 +02:00
SpiritCroc
5f18fce771 Increment version
Change-Id: Iaee1fa3f6de051c2ea57b0e2cb286de25052e31c
2021-08-20 10:45:57 +02:00
SpiritCroc
d290ddae95 Merge branch 'sc' into unifiedpush
Change-Id: I90a603da765b718aae33b63fab92762316192038
2021-08-20 09:47:10 +02:00
SpiritCroc
540dd5b778 increment_version.sh: do not always update translations
Change-Id: Ia6257e15e50287eeffe1dcdf4bf9dcc11f8418e9
2021-08-20 09:45:42 +02:00
SpiritCroc
2f4d379ed0 Do not crash on sending 0 byte videos
java.lang.RuntimeException: setDataSource failed: status = 0xFFFFFFEA
    at android.media.MediaMetadataRetriever._setDataSource(MediaMetadataRetriever.java)
    at android.media.MediaMetadataRetriever.setDataSource(MediaMetadataRetriever.java:306)
    at android.media.MediaMetadataRetriever.setDataSource(MediaMetadataRetriever.java:327)
    at android.media.MediaMetadataRetriever.setDataSource(MediaMetadataRetriever.java:376)
    at org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory.createVideoEvent
    at org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory.createMediaEvent
    at org.matrix.android.sdk.internal.session.room.send.DefaultSendService.sendMedia(DefaultSendService.kt:253)
    at org.matrix.android.sdk.internal.session.room.send.DefaultSendService.sendMedias(DefaultSendService.kt:240)
    at org.matrix.android.sdk.internal.session.room.DefaultRoom.sendMedias
    at im.vector.app.features.home.room.detail.RoomDetailViewModel.handleSendMedia(RoomDetailViewModel.kt:1158)
    at im.vector.app.features.home.room.detail.RoomDetailViewModel.handle(RoomDetailViewModel.kt:298)
    at im.vector.app.features.home.room.detail.RoomDetailFragment$contentAttachmentActivityResultLauncher$1.invoke(RoomDetailFragment.kt:1161)
    at im.vector.app.features.home.room.detail.RoomDetailFragment$contentAttachmentActivityResultLauncher$1.invoke(RoomDetailFragment.kt:1156)
    at im.vector.app.core.extensions.FragmentKt.registerStartForActivityResult$lambda-0
    at im.vector.app.core.extensions.FragmentKt.lambda$6uyRKSScfR1yqThCkGUu8777SL8
    at im.vector.app.core.extensions.-$$Lambda$FragmentKt$6uyRKSScfR1yqThCkGUu8777SL8.onActivityResult(lambda:0)
    at androidx.activity.result.ActivityResultRegistry$1.onStateChanged(ActivityResultRegistry.java:148)
    at androidx.lifecycle.LifecycleRegistry$ObserverWithState.dispatchEvent(LifecycleRegistry.java:354)
    at androidx.lifecycle.LifecycleRegistry.forwardPass(LifecycleRegistry.java:265)
    at androidx.lifecycle.LifecycleRegistry.sync(LifecycleRegistry.java:307)
    at androidx.lifecycle.LifecycleRegistry.moveToState(LifecycleRegistry.java:148)
    at androidx.lifecycle.LifecycleRegistry.handleLifecycleEvent(LifecycleRegistry.java:134)
    at androidx.fragment.app.Fragment.performStart(Fragment.java:3026)
    at androidx.fragment.app.FragmentStateManager.start(FragmentStateManager.java:589)
    at androidx.fragment.app.FragmentStateManager.moveToExpectedState(FragmentStateManager.java:300)
    at androidx.fragment.app.FragmentStore.moveToExpectedState
    at androidx.fragment.app.FragmentManager.moveToState(FragmentManager.java:1647)
    at androidx.fragment.app.FragmentManager.dispatchStateChange(FragmentManager.java:3128)
    at androidx.fragment.app.FragmentManager.dispatchStart
    at androidx.fragment.app.FragmentController.dispatchStart
    at androidx.fragment.app.FragmentActivity.onStart(FragmentActivity.java:510)
    at androidx.appcompat.app.AppCompatActivity.onStart(AppCompatActivity.java:246)
    at android.app.Instrumentation.callActivityOnStart(Instrumentation.java:1455)
    at android.app.Activity.performStart(Activity.java:8076)
    at android.app.ActivityThread.handleStartActivity(ActivityThread.java:3653)
    at android.app.servertransaction.TransactionExecutor.performLifecycleSequence(TransactionExecutor.java:221)
    at android.app.servertransaction.TransactionExecutor.cycleToPath(TransactionExecutor.java:201)
    at android.app.servertransaction.TransactionExecutor.executeLifecycleState(TransactionExecutor.java:173)
    at android.app.servertransaction.TransactionExecutor.execute(TransactionExecutor.java:97)
    at android.app.ActivityThread$H.handleMessage(ActivityThread.java:2203)
    at android.os.Handler.dispatchMessage(Handler.java:106)
    at android.os.Looper.loopOnce(Looper.java:201)
    at android.os.Looper.loop(Looper.java:288)
    at android.app.ActivityThread.main(ActivityThread.java:7822)
    at java.lang.reflect.Method.invoke(Method.java)
    at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)
    at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1003)

Change-Id: Ib909abe6468703452d53e760bde414e81a8876e3
2021-08-20 09:15:58 +02:00
SpiritCroc
8917e78ced Work around voice message crashes on Android 5
- Catch NPE in onVisibilityChanged (happens for SDK 21 and 22)
- Do not allow voice messages on SDK 21: segfaults as soon as recording
  stops

Change-Id: I0cfc55fbb7880dc29e29df4fba14d57af1f82bba
2021-08-20 09:13:44 +02:00
waclaw66
7ba2ba16a6 Translated using Weblate (Czech)
Currently translated at 100.0% (90 of 90 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2021-08-20 09:13:37 +02:00
SpiritCroc
f9f11b604c Make composer notification (not allowing to send messages) more compact
Change-Id: Iba087f569d8928e844bf34d5660ea7256156ad9d
2021-08-20 09:13:32 +02:00
SpiritCroc
d11b6cf154 Add to rageshake whether it is a debug build or not
Change-Id: I90336416c10d2f09979eb7518cc651c3e33a40fa
2021-08-20 09:13:21 +02:00
PoorPocketsMcNewHold
bf0204a99e Translated using Weblate (French)
Currently translated at 98.8% (88 of 89 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fr/
2021-08-20 09:13:12 +02:00
SpiritCroc
1af014a527 Work around voice message crashes on Android 5
- Catch NPE in onVisibilityChanged (happens for SDK 21 and 22)
- Do not allow voice messages on SDK 21: segfaults as soon as recording
  stops

Change-Id: I0cfc55fbb7880dc29e29df4fba14d57af1f82bba
2021-08-19 11:56:20 +02:00
SpiritCroc
cad30d4790 Actually, we're still at 1.2.0
Got develop in by accident due to unifiedpush, but whatever

Change-Id: I3d15dd820274076e4383aa17467a87dac9eebe31
2021-08-19 10:42:47 +02:00
waclaw66
19f9de9db0 Translated using Weblate (Czech)
Currently translated at 100.0% (90 of 90 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2021-08-19 10:37:17 +02:00
SpiritCroc
2b93557fd1 Make composer notification (not allowing to send messages) more compact
Change-Id: Iba087f569d8928e844bf34d5660ea7256156ad9d
2021-08-19 10:10:23 +02:00
PoorPocketsMcNewHold
89145f8ad5 Translated using Weblate (French)
Currently translated at 98.8% (88 of 89 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fr/
2021-08-18 17:35:32 +02:00
SpiritCroc
ba89b11097 Add to rageshake whether it is a debug build or not
Change-Id: I90336416c10d2f09979eb7518cc651c3e33a40fa
2021-08-18 17:31:56 +02:00
SpiritCroc
6fd5ef9094 Add unifiedpush information to rageshake
Change-Id: I2434931f71a5012ba7d64c8c58ce6617cf3d2cd9
2021-08-18 17:26:43 +02:00
SpiritCroc
3cdf4f9d24 Explicitely specify unifiedpush pusher app id
We use the upstream pusher_app_id for their sygnal, but we do not need
to do this for unifiedpush, so we can explicitely define the SchildiChat
package here.

Change-Id: Ib56fcde242a584514978ccbdd7e8b337fa7c6529
2021-08-18 16:21:02 +02:00
SpiritCroc
8215c786b2 Merge branch 'unifiedpush' into sc
Change-Id: I3de68e2da07d144b2ee82c1ffe1eb6ff535a76f2
2021-08-18 15:45:22 +02:00
SpiritCroc
6048e12669 Fix reaction color for non-emojis on dark theme
Hardcoding it to black is bad for dark themes. It was probably done
because the default color would make emojis look pale due to
transparency. If we use a primary text color which hopefully does not
feature transparency (it does not for SC themes, at least), everything
looks fine.

Change-Id: I207290a777086db1b27209c4dc34a9810be0a37c
2021-08-18 15:35:56 +02:00
SpiritCroc
8475f24f17 Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush
Change-Id: Ief98ae56d40f0724ba0e5f1f1c6ec09832425e58
2021-08-18 13:16:37 +02:00
SpiritCroc
3b3e39bbb6 Merge branch 'sc' into unifiedpush
Change-Id: I715e67cc1600706a6cfd7a2317df38909c74e11e
2021-08-18 13:16:19 +02:00
SpiritCroc
b55a83a657 Always update image measures when actual known
Previuos measures might not what we actually display, e.g. for videos.

Change-Id: I20a80c2ba61d3ca6dd62bde1d5c06d4738553f83
2021-08-18 12:55:49 +02:00
SpiritCroc
f2f15ed7e4 Add some note to bug reports for SchildiChat
Change-Id: I2e0360ba041e06bdccfe069b0ea0d62f33afe42f
2021-08-18 12:33:37 +02:00
SpiritCroc
e2bf0a927d Hide suggestion button again
Change-Id: I2e9bb7dc8c473b3096c11b24c51e294aea7e4d46
2021-08-18 12:15:35 +02:00
SpiritCroc
86108b1031 Fix crash when trying to persist expand status with null context
Change-Id: I4748445f4cf6701e417d137958859157fab72a38
2021-08-18 12:12:04 +02:00
SpiritCroc
387459ae6b Fix material alert dialog brightening up the desired background color
Change-Id: I0b805d1605d80765631fdf093ed645b5be35c57b
2021-08-18 12:07:44 +02:00
S1m
7e258282a2 Change troubleshoot description if using FCM 2021-08-16 18:01:10 +02:00
S1m
c584fa60dd Merge remote-tracking branch 'upstream/develop' into unifiedpush 2021-08-16 18:00:33 +02:00
SpiritCroc
3a1cb53c98 Fix some UP crashes
Change-Id: I16f47f86a58c23210cc99c85081da1703bbda5ac
2021-08-16 17:02:56 +02:00
SpiritCroc
6a29821273 fastlane: build app bundle
Change-Id: I6b75272f450dde708dd15b205d9bc2d456340b78
2021-08-15 14:13:08 +02:00
SpiritCroc
8fe2a0021f Increment version
Change-Id: I5c2d1293f5251d6d4c0cb889195f2db8a509e378
2021-08-14 14:38:23 +02:00
SpiritCroc
a59efc0c9f Merge branch 'sc' into unifiedpush
Change-Id: Id7b4d4d7e5e74cf2e0e13e44f977e1efb0f61044
2021-08-14 11:14:14 +02:00
Nikita Epifanov
037977a817 Translated using Weblate (Russian)
Currently translated at 100.0% (89 of 89 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ru/
2021-08-14 10:56:11 +02:00
waclaw66
dd6842e26a Translated using Weblate (Czech)
Currently translated at 100.0% (89 of 89 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2021-08-14 10:56:11 +02:00
SpiritCroc
ed89f7fb1b Fix composerView having issues with long texts pasted from gboard clipboard
The pasted text would not properly fill the editText, but show moved up
with empty space below instead.

Change-Id: I82d2a0bafbb402ec0728f21075d4641fbce90890
2021-08-12 13:50:37 +02:00
SpiritCroc
cf756b8789 Merge branch 'sc' into unifiedpush
Change-Id: Ieae8e880360266f2f5e44aac371701e0356419de
2021-08-12 09:30:41 +02:00
SpiritCroc
2ff3989230 Proper tint for voice message send button
Change-Id: I25202dea6c794c8dcca3412bca098825b79a01d6
2021-08-12 09:28:28 +02:00
SpiritCroc
8892248071 Bring back setting to disable voice message recorder button
Change-Id: I81d647796b82e2034383278da7b169795a092f2e
2021-08-12 09:22:35 +02:00
SpiritCroc
033c3f7792 Automatic SchildiChat string correction
Change-Id: Iad534d811812f2a07adbffa4bfc68a73186e3e34
2021-08-12 09:04:01 +02:00
SpiritCroc
6aba012772 Automatic upstream merge postprocessing
Change-Id: If4b404091e76ab298085a1151de222f423ce89f7
2021-08-12 09:04:00 +02:00
SpiritCroc
58f5310e83 Merge tag 'v1.2.0' into sc
v1.2.0

Change-Id: I900672607ec264e60c96c886d0accb053934fa4a

Conflicts:
	vector/src/main/res/xml/vector_settings_labs.xml
2021-08-12 09:03:42 +02:00
SpiritCroc
6443ae4c7d [TMP] Automatic upstream merge preparation
Change-Id: I042bcc5e6ed6a00473f32d1270b5b620c69a5691
2021-08-12 09:02:53 +02:00
SpiritCroc
3e368c56ff Automatic revert to unchanged upstream strings, pt.1
Change-Id: I84ef9d6b2053914fd11cc202c17562d7f351ade6
2021-08-12 09:02:52 +02:00
Onuray Sahin
37e722e85d version++ 2021-08-12 02:36:39 +03:00
Onuray Sahin
e0b9fddd18 Merge branch 'release/1.2.0' into develop 2021-08-12 02:33:25 +03:00
Onuray Sahin
4f6b6ddfa8 Merge branch 'release/1.2.0' into main 2021-08-12 02:33:02 +03:00
Onuray Sahin
dfc2460189 Changelog added. 2021-08-12 02:32:54 +03:00
SpiritCroc
38212b6410 Fix some UP crashes
Change-Id: I16f47f86a58c23210cc99c85081da1703bbda5ac
2021-08-11 22:45:14 +02:00
Onuray Sahin
d8177c4b5d
Merge pull request #3826 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2021-08-11 22:12:59 +03:00