mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-22 17:10:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
10425 commits 7 branches 124 tags 230 MiB
Commit graph

10425 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
26b1a478f0 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ieaa970a813aa29bdc792add82c43f73062262056
 2021-07-30 18:33:30 +02:00
SpiritCroc
782141998d Increment version 
Change-Id: I710e0f58cc1fef70e5bc199ab4effb607ad321db
 2021-07-27 14:53:48 +02:00
SpiritCroc
1a1d19cf20 Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: Iad04e36677b9ba654be82632cb63f94dd35f435a
 2021-07-27 14:52:39 +02:00
waclaw66
e69011835e Translated using Weblate (Czech) 
Currently translated at 77.6% (66 of 85 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-07-27 14:52:38 +02:00
SpiritCroc
a8f1391c47 Fix fastlane 
Change-Id: If9f02ea28f6377c6fa218e9ac024469ceab5ad61
 2021-07-27 14:47:05 +02:00
SpiritCroc
7dcb2ebeb2 Add fastlane configuration 
Change-Id: I86b376d82ac4a833a16e7797cc3c0865a3c7a44f
 2021-07-26 14:54:29 +02:00
SpiritCroc
f8b9d3571c Increment version 
Change-Id: I04751368e916d37162f752abd25243400dc6575d
 2021-07-26 12:51:54 +02:00
SpiritCroc
abccf99f55 Theme color of quotation bar 
Change-Id: Ia9d9c34c1bb276fea42b00131ea1915f93f23263
 2021-07-25 10:34:27 +02:00
SpiritCroc
3e95246908 Update light bottomsheet dialog style 
Change-Id: Ic36059e93146eff2031dbd626cbe14f1ccfdf493
 2021-07-25 10:18:16 +02:00
SpiritCroc
e785bcc1f1 Tweak accents 
Change-Id: I3ccb799dd430c56fd4d27ef307618e255773d5fa
 2021-07-25 10:02:53 +02:00
SpiritCroc
a88f90e0e7 Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: I0f891680d74073a89018fbe13e2c477e31650bed
 2021-07-24 18:07:41 +02:00
SpiritCroc
ac4fe57995 Add some more accents 
Imported from AICP

Change-Id: Icce1c1d602bdf8a9d762448801df5cf57b221e60
 2021-07-24 17:57:41 +02:00
SpiritCroc
d54a9302fc Accent color theming 
Change-Id: I31b19858d0e01e1427df91750875bc470e741bcd
 2021-07-24 17:42:05 +02:00
SpiritCroc
8b7cae31a9 Import ColorMatrixListPreference from AICP 
Original commit history from frameworks/opt/aicpgear:

commit adf33979bdd1da0a3fd96e7276dd567e559db780
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Thu Oct 31 11:59:04 2019 +0100

    Use proper androidx attrs again

    Have been removed in the blueprint bringup commit

    Change-Id: I25f7781db9b39916680feec6fe75e1e39240e78a

commit 9de1e6ae734b3acc686c57d2b7984ffd2f3346ba
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Sun Oct 20 16:43:10 2019 +0200

    Migrate AicpGear to blueprint

    Change-Id: I6fecdb3c18a80b6fc9fda52bd730c20e4568f54b

commit 26931c7a31ee4aa1bb88b6de1f2f7c9fee7c68e5
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Sat Sep 7 11:08:01 2019 +0200

    AICP Q Theming [1/2]

    Change-Id: Ic947806f618d9e9a81def568781f409d3a428dba

commit 31b5eb51bd4ff3378eb4b8b5cac010c1b9e47932
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Fri Sep 6 17:29:44 2019 +0200

    androidx: PreferenceFragment is deprecated, use PreferenceFragmentCompat

    Change-Id: I000587f1e775900d92e9b3cf859f145995afa08b

commit 58e09c3dfaad470e9eaea5f11299c5504db9366d
Author: Michele Bono <bono.michele94@gmail.com>
Date:   Sat Aug 17 14:21:34 2019 +0200

    aicpgear: Migrate to androidx

    Change-Id: I3c63fe017128785bb541a7668bbb388a8cb2fed0

commit 4636b50f0c6788f9945f64427a8a541623f2b48d
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Mon Sep 2 18:48:51 2019 +0200

    ColorMatrixListPreferenceDialogFragment: It's a feature

    When previewing two colors for light and dark theme at the same time,
    this is considered as "glitchy" by some users.
    Enlighten them (hopefully) by hiding the second color with a toggle
    button.

    Change-Id: I90a70af5188687edd184e5937e55686843fdaba0

commit e1e6b7b44c2a801f787ee8e42aed9af24464d4b2
Author: SpiritCroc <dev@spiritcroc.de>
Date:   Fri Aug 9 13:09:14 2019 +0200

    Add ColorMatrixListPreference

    Change-Id: I3c03d95fa56aed2ee5754e58f0394f3ff55fae39

Change-Id: I41098d5f5255dc8efa515e8b68191dd89d94233f
 2021-07-24 10:27:57 +02:00
Allan Nordhøy
98b1e013e7 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 100.0% (62 of 62 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/nb_NO/
 2021-07-24 10:17:22 +02:00
Allan Nordhøy
47d90d9d21 Translated using Weblate (English) 
Currently translated at 100.0% (62 of 62 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/en/
 2021-07-24 10:17:22 +02:00
Weblate
a917e2c455 Added translation using Weblate (Norwegian Bokmål) 2021-07-24 10:17:22 +02:00
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
Benoit Marty
0bc007c2c3 Merge branch 'release/1.1.14' into main 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
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