mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-24 18:36:21 +03:00
Code Issues Projects Releases Packages Wiki Activity
10669 commits 6 branches 120 tags 229 MiB
Commit graph

10669 commits

This branch
This branch
All branches
Author SHA1 Message Date
metatek
a8aa1299b1 Translated using Weblate (Japanese) 
Currently translated at 63.7% (1606 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 14:28:46 +00:00
oksya8and8
ff727c52dc Translated using Weblate (Japanese) 
Currently translated at 63.7% (1606 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 14:28:46 +00:00
metatek
c0430dac5c Translated using Weblate (Japanese) 
Currently translated at 63.2% (1592 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 13:04:06 +00:00
oksya8and8
c1cbbe2044 Translated using Weblate (Japanese) 
Currently translated at 63.2% (1592 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 13:04:06 +00:00
metatek
520d4ac737 Translated using Weblate (Japanese) 
Currently translated at 63.2% (1592 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 13:02:12 +00:00
oksya8and8
154e70cea2 Translated using Weblate (Japanese) 
Currently translated at 63.2% (1592 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 13:02:12 +00:00
metatek
b15f04dce7 Translated using Weblate (Japanese) 
Currently translated at 63.2% (1592 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 13:01:11 +00:00
oksya8and8
33ae094684 Translated using Weblate (Japanese) 
Currently translated at 63.2% (1592 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 13:01:11 +00:00
Joe Sagawa
435ca896b4 Translated using Weblate (Japanese) 
Currently translated at 63.1% (1591 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 12:41:38 +00:00
metatek
66adb9b312 Translated using Weblate (Japanese) 
Currently translated at 63.1% (1591 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 12:41:38 +00:00
oksya8and8
4586b7b7e6 Translated using Weblate (Japanese) 
Currently translated at 63.1% (1591 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 12:41:38 +00:00
Rintan
c5b32ea43f Translated using Weblate (Japanese) 
Currently translated at 62.6% (1577 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 12:15:11 +00:00
metatek
0a33f2c24d Translated using Weblate (Japanese) 
Currently translated at 62.6% (1577 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 12:15:10 +00:00
Joe Sagawa
270ca779ff Translated using Weblate (Japanese) 
Currently translated at 62.6% (1577 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-21 12:15:10 +00:00
SpiritCroc
8d0c133dde Theme code backgrounds in markdown 
Change-Id: Ia37dc51961e990e5b7a2c9c6890da01bcf076dd6
 2021-07-21 13:02:20 +02:00
ganfra
5dda5a107a Missed call notif: make some cleanup and minor changes 2021-07-21 12:28:14 +02:00
Benoit Marty
98720ce4a5
Merge pull request #3707 from poljar/poljar/fix/verification-transaction-id-mixup 
crypto: Don't use the transaction ID of the verification for the request
 2021-07-21 09:39:22 +02:00
Benoit Marty
e4ae80e348
Merge pull request #3708 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.28 
Bump libphonenumber from 8.12.27 to 8.12.28
 2021-07-21 09:28:19 +02:00
Benoit Marty
135123d265
Merge pull request #3709 from vector-im/dependabot/gradle/daggerVersion-2.38 
Bump daggerVersion from 2.37 to 2.38
 2021-07-21 09:27:47 +02:00
dependabot[bot]
89dc4bb13e
Bump daggerVersion from 2.37 to 2.38 
Bumps `daggerVersion` from 2.37 to 2.38.

Updates `dagger` from 2.37 to 2.38
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.37...dagger-2.38)

Updates `dagger-compiler` from 2.37 to 2.38
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.37...dagger-2.38)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-20 23:06:50 +00:00
dependabot[bot]
b809d4acf4
Bump libphonenumber from 8.12.27 to 8.12.28 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.27 to 8.12.28.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.27...v8.12.28)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-20 23:06:30 +00:00
ganfra
88cc7471a8 Call notification: add missed call icons. Also set tint. 2021-07-20 18:43:44 +02:00
Damir Jelić
278bba3ada crypto: Don't use the transaction ID of the verification for the request 
Verification flows have something called a transaction id. This is a
client-set custom ID that identifies the flow and is established by the
first message that gets sent out. This transaction ID needs to be kept the
same and be part of all events that are sent during the verification flow.

To-device requests have something called a transaction id. This is a
client-set custom ID that identifies a given request. It is used to
ensure idempotency of requests, i.e. retrying to send a request won't
result in two events being sent as long as the transaction id is kept
the same.

This patch removes usage of the first type of transaction ID for the
second use-case.

This closes: #3589.
 2021-07-20 17:17:42 +02:00
David Langley
608a1d3f8f clarify sdk update and cleanup typos 2021-07-20 11:24:17 +01:00
Benoit Marty
f5c79baf63
Merge pull request #3705 from vector-im/feature/bma/low_dm 
Show low priority rooms in dm
 2021-07-20 10:21:29 +02:00
ganfra
c59967fb6c Missed call: make some changes on notification 2021-07-20 09:40:09 +02:00
David Langley
da993b5b58 lint 2021-07-19 22:13:23 +01:00
David Langley
89ece22f73 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies 2021-07-19 22:08:34 +01:00
David Langley
55902b58ac checks 2021-07-19 22:07:20 +01:00
SpiritCroc
045f95326a Fix for crash on rendering media items 
07-19 19:28:53.039 E/AndroidRuntime(12141): java.lang.NoSuchMethodError: No virtual method updateMessageBubble(Landroid/content/Context;Lim/vector/app/features/home/room/detail/timeline/item/AbsMessageItem$Holder;)V in class Lim/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem; or its super classes (declaration of 'im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem' appears in base.apk)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem$bind$onImageSizeListener$1.onImageSizeUpdated(MessageImageVideoItem.kt:6)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.media.ImageContentRenderer.render(ImageContentRenderer.kt:20)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem.bind(MessageImageVideoItem.kt:12)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem.bind(MessageImageVideoItem.kt:6)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at com.airbnb.epoxy.BaseEpoxyAdapter.onBindViewHolder(BaseEpoxyAdapter.java:25)

Change-Id: Ic803b3bfb328ed3a56202df789500b162886250d
 2021-07-19 22:55:11 +02:00
David Langley
a29ccda68e move mutable push rule logic to static declarations as on web 2021-07-19 21:29:46 +01:00
ganfra
f7e2e741c0 Missed call: start showing notification when there is a missed call 2021-07-19 20:25:09 +02:00
Benoit Marty
256df7e869 Rework on how we dispose the subscriptions 2021-07-19 19:18:49 +02:00
Benoit Marty
ac2f1ee7fe Cleanup and comment 2021-07-19 19:03:41 +02:00
Benoit Marty
5990e5a52b Cleanup constructors 2021-07-19 18:59:27 +02:00
Benoit Marty
14b4bff477 Use the interface power! 2021-07-19 18:56:15 +02:00
Benoit Marty
b8abe1b7ad Rename class for code clarity 2021-07-19 18:54:14 +02:00
Benoit Marty
40907a71b6 Cleanup 2021-07-19 18:44:57 +02:00
Benoit Marty
ac8303bb99 Add low priority section in DM tab #3463 2021-07-19 18:43:05 +02:00
Benoit Marty
ca2794193c Typo 2021-07-19 18:16:36 +02:00
Benoit Marty
a34d445215
Merge pull request #3699 from vector-im/feature/bma/part_dl 
Complement for #3656
 2021-07-19 18:09:33 +02:00
SpiritCroc
a5db52fe62 increment_version.sh: exclude "Merge branch" lines 
Change-Id: I392d38c5408e7e3e1d76baffda246106536c5912
 2021-07-19 16:50:32 +02:00
Benoit Marty
a2996ee042 Rename var 2021-07-19 16:32:02 +02:00
Benoit Marty
765f7d634e
Merge pull request #3700 from psrpinto/fix/naming-2 
Standardise casing of terms in source strings
 2021-07-19 16:26:41 +02:00
SpiritCroc
37621d1fc7 Automatic SchildiChat string correction 
Change-Id: I20c511ac19bfbf0bd11c0ae96a5a1ff97b19a59e
 2021-07-19 16:15:39 +02:00
SpiritCroc
fc8be0c8c5 Automatic upstream merge postprocessing 
Change-Id: I76c44254c911cca11449d24928721ef0e01c5f3e
 2021-07-19 16:15:38 +02:00
SpiritCroc
8497a307a1 Merge tag 'v1.1.13' into sc 
Change-Id: Icc97ef8699b1cc96447369121f3c88582ac651bc

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
 2021-07-19 16:10:57 +02:00
SpiritCroc
2aa4d868e4 [TMP] Automatic upstream merge preparation 
Change-Id: Iaf09a78fbaad18a6581bfd5384239f471b007fdf
 2021-07-19 16:05:39 +02:00
SpiritCroc
a4f87f49dd Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I432f4130ab60f0a891a48609ad5bbe6a3a2b9583
 2021-07-19 16:05:38 +02:00
Benoit Marty
6d1cabaee3 Version++ 2021-07-19 15:28:14 +02:00