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
SpiritCroc
4c9b304135 Automatic SchildiChat string correction 
Change-Id: Id7236cbbbc4a56dcef81d005e3e4e2523f11ea97
 2021-07-24 10:13:52 +02:00
SpiritCroc
c1d7fe76dc Automatic upstream merge postprocessing 
Change-Id: I30186a1eec92cdf96b1aac6a39f15e879ce7626a
 2021-07-24 10:13:50 +02:00
SpiritCroc
acb12c2005 Merge tag 'v1.1.14' into sc 
Change-Id: I7668fc7603c8f6e7aafa89886bb0fdf586e4a871

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
 2021-07-24 10:12:48 +02:00
SpiritCroc
ca81dfc982 [TMP] Automatic upstream merge preparation 
Change-Id: If2fa9aa197f3a922824a48f41058f85aacd4d262
 2021-07-23 17:37:47 +02:00
SpiritCroc
5b5ce76298 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I61e7986a0a3d243ff96e4eb65cf960566b28e790
 2021-07-23 17:37:47 +02:00
Onuray Sahin
bd2ed4c58a Stop playback when deleting record on locked mode. 2021-07-23 16:53:34 +03:00
David Langley
5d092ce18a simplify getHighlight logic 2021-07-23 14:29:37 +01:00
Onuray Sahin
a11941714d Code review fixes. 2021-07-23 15:19:50 +03:00
Benoit Marty
bdbfbe6175 Version++ 2021-07-23 11:53:21 +02:00
Benoit Marty
0bc007c2c3 Merge branch 'release/1.1.14' into main 2021-07-23 11:52:12 +02:00
Benoit Marty
a7e1d61144 Merge branch 'release/1.1.14' into develop 2021-07-23 11:52:12 +02:00
Benoit Marty
ba7c5acd92 fastlane change 2021-07-23 11:50:46 +02:00
Benoit Marty
9ad1ad2156 Changelog 2021-07-23 11:49:16 +02:00
Benoit Marty
adabb31688 Changelog 2021-07-23 11:25:56 +02:00
Benoit Marty
0c211d7b1e
Merge pull request #3723 from vector-im/feature/fga/log_tags_voip 
Feature/fga/log tags voip
 2021-07-23 11:23:09 +02:00
Benoit Marty
b764746323
Merge pull request #3724 from vector-im/feature/bma/ensureOTK 
Ensure OTKs are uploaded when the session is created
 2021-07-23 11:21:07 +02:00
Benoit Marty
d0647abcc6
Merge pull request #3719 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.3.1 
Bump appcompat from 1.3.0 to 1.3.1
 2021-07-23 11:18:15 +02:00
ganfra
45a51d138e Voip log: clean after Benoit review 2021-07-23 09:50:09 +02:00
ganfra
e3464f58fa Call notif: make end call notif better 2021-07-22 18:51:36 +02:00
Alireza
9ca940eba1 Translated using Weblate (Persian) 
Currently translated at 98.6% (2484 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-07-22 15:17:35 +00:00
metatek
0916dba0fa Translated using Weblate (Japanese) 
Currently translated at 65.6% (1653 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-22 14:40:18 +00:00
Rintan
53dbd7da96 Translated using Weblate (Japanese) 
Currently translated at 65.6% (1652 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-22 14:38:11 +00:00
metatek
91053616af Translated using Weblate (Japanese) 
Currently translated at 65.6% (1652 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-22 14:38:11 +00:00
oksya8and8
b72e6edd0a Translated using Weblate (Japanese) 
Currently translated at 65.6% (1652 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-22 14:38:06 +00:00
Benoit Marty
ed0143c240 Log errors 2021-07-22 16:20:16 +02:00
Benoit Marty
1d5ed46a49 Small cleanup 2021-07-22 16:01:01 +02:00
Benoit Marty
05988107a7 Ask the number of OTK if unknown from the sync. 2021-07-22 15:59:37 +02:00
Benoit Marty
952a0f7c07 change 2021-07-22 15:33:05 +02:00
ganfra
e356e71431 Merge branch 'develop' into feature/fga/log_tags_voip 2021-07-22 15:32:25 +02:00
Benoit Marty
7a7c292b3c Rename store API 2021-07-22 15:26:11 +02:00
Benoit Marty
be488ae75a Ensure OTK are uploaded when we upload the device keys 
The sync response can omit the field device_one_time_keys_count.signed_curve25519 and the SDK was waiting to know this value to upload the OTK.
Now the SDK uploads the OTK when it uploads the device keys.
 2021-07-22 15:24:05 +02:00
ganfra
79c8ef7ebf LoggerTag: try new thing and branch more on VOIP 2021-07-22 15:22:15 +02:00
dependabot[bot]
a75ceee03f
Bump appcompat from 1.3.0 to 1.3.1 
Bumps appcompat from 1.3.0 to 1.3.1.

---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-22 12:13:24 +00:00
Benoit Marty
2070b0ecde
Merge pull request #3718 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.6 
Bump fragment-ktx from 1.3.5 to 1.3.6
 2021-07-22 14:12:42 +02:00
Benoit Marty
0ff222bc0b
Merge pull request #3716 from vector-im/dependabot/gradle/androidx.media-media-1.4.0 
Bump media from 1.3.1 to 1.4.0
 2021-07-22 14:12:09 +02:00
Benoit Marty
19f9f5a6ee
Merge pull request #3715 from vector-im/feature/bma/initialState 
Add initialState support to CreateRoomParams
 2021-07-22 14:11:49 +02:00
Benoit Marty
a2d7d54550
Merge pull request #3721 from vector-im/anoa/servers 
grammar: Server matching ... -> Servers matching ...
 2021-07-22 14:11:07 +02:00
Benoit Marty
cededa8c3b
Merge pull request #3720 from vector-im/feature/bma/fix_signout_crash 
Fix a crash which can happen when user signs out.
 2021-07-22 14:10:53 +02:00
Andrew Morgan
74aea4611a Changelog 2021-07-22 12:02:44 +01:00
Andrew Morgan
4dd5b2c884
grammar: Server matching ... -> Servers matching ... 
This commit uses the plural form of Server as each message is talking about *one or more* servers in the room.
 2021-07-22 11:58:32 +01:00
Benoit Marty
4bbf175187 Fix a crash which can happen when user signs out. 
The crypto DB has been deleted, and the key download request is cancelled, but in the catch block we tried to write to the deleted DB
 2021-07-22 12:48:13 +02:00
ganfra
115f00ff1a Start experiment on log tags 2021-07-22 10:12:46 +02:00
Benoit Marty
5d65c83a3d
Merge pull request #3712 from vector-im/feature/fga/missed_call_notification 
Feature/fga/missed call notification
 2021-07-22 09:46:40 +02:00
dependabot[bot]
76f412ffe8
Bump fragment-ktx from 1.3.5 to 1.3.6 
Bumps fragment-ktx from 1.3.5 to 1.3.6.

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-21 23:05:41 +00:00
dependabot[bot]
b6e739afd3
Bump media from 1.3.1 to 1.4.0 
Bumps media from 1.3.1 to 1.4.0.

---
updated-dependencies:
- dependency-name: androidx.media:media
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-21 23:04:46 +00:00
Benoit Marty
966a959e41 do not send empty invite list when creating a room 2021-07-21 20:56:08 +02:00
Benoit Marty
b862e5ccbf Add initialState support to CreateRoomParams (#3713) 2021-07-21 20:53:17 +02:00
ganfra
8955049110 Minor changes after benoits review 2021-07-21 17:35:08 +02:00
metatek
5b96d80b06 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:31:19 +00:00
oksya8and8
c75554ebb9 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:31:19 +00:00