diff --git a/Makefile b/Makefile
index 5a897e6..e2f261b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
+.PHONY: all setup regenerate-i18n reskindex web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
.PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
.PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
.PHONY: clean
@@ -60,8 +60,12 @@ icns: element-desktop/build/icon.icns element-desktop/build/dmg.icns
regenerate-i18n: setup
./regenerate_i18n.sh
+reskindex: setup
+ $(YARN) --cwd matrix-react-sdk reskindex
+ $(YARN) --cwd element-web reskindex
+
web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION)
-web: setup
+web: setup reskindex
cp $(CFGDIR)/config.json element-web/
$(YARN) --cwd element-web dist
echo "$(VERSION)" > element-web/webapp/version
diff --git a/README.md b/README.md
index 12a7bb2..20b0099 100644
--- a/README.md
+++ b/README.md
@@ -15,18 +15,6 @@ Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-we
-
-Public key used to sign the Debian packages
-
-```
-pub rsa4096 2020-12-08 [SC]
- 560BB70DA86A6633A39CEC6023358905FE294D01
-uid Super apt repo key
-sub rsa4096 2020-12-08 [E]
-```
-
-
-
## Building SchildiChat Web/Desktop
diff --git a/bump_release_version.sh b/bump_release_version.sh
index 92b5cac..3fc5346 100755
--- a/bump_release_version.sh
+++ b/bump_release_version.sh
@@ -24,6 +24,5 @@ get_versions_string
# Add everything
git add -A
git commit --allow-empty -m "New release v$versions_string"
-git tag -s "v$versions_string" -m "New release v$versions_string"
popd > /dev/null
diff --git a/bump_test_version.sh b/bump_test_version.sh
index bffb851..979ed48 100755
--- a/bump_test_version.sh
+++ b/bump_test_version.sh
@@ -24,6 +24,5 @@ get_versions_string
# Add everything
git add -A
git commit --allow-empty -m "New test release v$versions_string"
-git tag -s "v$versions_string" -m "New test release v$versions_string"
popd > /dev/null
diff --git a/configs/sc/config.json b/configs/sc/config.json
index 2916dee..dfc32f4 100644
--- a/configs/sc/config.json
+++ b/configs/sc/config.json
@@ -26,6 +26,5 @@
"url": "https://schildi.chat/desktop/privacy",
"text": "Privacy Policy"
}
- ],
- "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
+ ]
}
diff --git a/deploy/update-aur-bin.sh b/deploy/update-aur-bin.sh
index f5d2213..81b999d 100755
--- a/deploy/update-aur-bin.sh
+++ b/deploy/update-aur-bin.sh
@@ -21,7 +21,6 @@ git fetch
git reset --hard origin/master
sed -i "s|^_pkgver=.*$|_pkgver=$version|" PKGBUILD
-sed -i "s|^pkgrel=.*$|pkgrel=1|" PKGBUILD
sed -i "s|^sha256sums=('.*'$|sha256sums=('$sha256sum'|" PKGBUILD
makepkg --printsrcinfo > .SRCINFO
diff --git a/element-desktop b/element-desktop
index e8271ec..15cd24d 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit e8271ec368dea7b706f072b83171f8db1bc548c9
+Subproject commit 15cd24dfc336421f3f4ec1a1ac2d886732b302b8
diff --git a/element-web b/element-web
index f87ee44..661bfae 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit f87ee443e4be1d496a6034137660f53e6778d918
+Subproject commit 661bfae1a8c9b4c97e6e6f7ce68a3b3d6bf65d91
diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json
index f4e03bb..f9fa215 100644
--- a/i18n-overlays/matrix-react-sdk/cs.json
+++ b/i18n-overlays/matrix-react-sdk/cs.json
@@ -40,8 +40,5 @@
"Hide advanced theme settings": "Skrýt pokročilá nastavení motivu",
"Mark rooms as unread": "Povolit označování chatů jako nepřečtených",
"Mark as unread": "Označit jako nepřečtené",
- "Mark as read": "Označit jako přečtené",
- "Enable YouTube embed player": "Povolí vložený přehrávač YouTube",
- "Collapse additional buttons": "Sbalit další tlačítka",
- "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti."
+ "Mark as read": "Označit jako přečtené"
}
diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json
index 02c1ee5..e65cb3d 100644
--- a/i18n-overlays/matrix-react-sdk/de_DE.json
+++ b/i18n-overlays/matrix-react-sdk/de_DE.json
@@ -141,7 +141,5 @@
"Show advanced theme settings": "Erweiterte Designeinstellungen anzeigen",
"Mark rooms as unread": "Erlaube Chats als ungelesen zu markieren",
"Mark as read": "Als gelesen markieren",
- "Mark as unread": "Als ungelesen markieren",
- "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren",
- "Collapse additional buttons": "Zusätzliche Buttons einklappen"
+ "Mark as unread": "Als ungelesen markieren"
}
diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json
index 8d07295..4ec4a1e 100644
--- a/i18n-overlays/matrix-react-sdk/en_EN.json
+++ b/i18n-overlays/matrix-react-sdk/en_EN.json
@@ -39,8 +39,5 @@
"Font size and typeface": "Font size and typeface",
"Mark rooms as unread": "Allow marking chats as unread",
"Mark as unread": "Mark as unread",
- "Mark as read": "Mark as read",
- "Enable YouTube embed player": "Enable YouTube embed player",
- "Collapse additional buttons": "Collapse additional buttons",
- "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms."
+ "Mark as read": "Mark as read"
}
diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json
index a986a4d..1e42805 100644
--- a/i18n-overlays/matrix-react-sdk/id.json
+++ b/i18n-overlays/matrix-react-sdk/id.json
@@ -39,8 +39,5 @@
"Intermediate: medium sized avatar with single-line preview": "Sedang: avatar sedang dengan tampilan satu baris",
"Mark rooms as unread": "Perbolehkan menandai obrolan sebagai dibaca",
"Mark as unread": "Tandai sebagai belum dibaca",
- "Mark as read": "Tandai sebagai dibaca",
- "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat",
- "Collapse additional buttons": "Sembunyikan tombol tambahan",
- "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan."
+ "Mark as read": "Tandai sebagai dibaca"
}
diff --git a/i18n-overlays/matrix-react-sdk/pt_BR.json b/i18n-overlays/matrix-react-sdk/pt_BR.json
index 5bac536..c27b526 100644
--- a/i18n-overlays/matrix-react-sdk/pt_BR.json
+++ b/i18n-overlays/matrix-react-sdk/pt_BR.json
@@ -37,8 +37,5 @@
"Compact: tiny avatar together with name and preview in one line": "Compacto: avatar minúsculo junto com o nome e visualização em uma linha",
"Intermediate: medium sized avatar with single-line preview": "Intermédio: avatar de tamanho médio com visualização de uma linha",
"Roomy: big avatar with two-line preview": "Amplo: grande avatar com visualização em duas linhas",
- "Room list style": "Estilo da lista de salas",
- "Mark rooms as unread": "Permitir markar conversas como não lidos",
- "Mark as unread": "Markar como não lido",
- "Mark as read": "Markar como lido"
+ "Room list style": "Estilo da lista de salas"
}
diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json
index 7282f7f..8990c52 100644
--- a/i18n-overlays/matrix-react-sdk/sv.json
+++ b/i18n-overlays/matrix-react-sdk/sv.json
@@ -39,8 +39,5 @@
"Room list style": "Rumslista stil",
"Mark as unread": "markera som oläst",
"Mark as read": "markera som läst",
- "Mark rooms as unread": "Tillåt att chattar markeras som olästa",
- "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare",
- "Collapse additional buttons": "Dölj ytterligare knappar",
- "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum."
+ "Mark rooms as unread": "Tillåt att chattar markeras som olästa"
}
diff --git a/local-pkgbuild-template/PKGBUILD b/local-pkgbuild-template/PKGBUILD
index ff49e1f..df4c516 100644
--- a/local-pkgbuild-template/PKGBUILD
+++ b/local-pkgbuild-template/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="SchildiChat is a Matrix client based on Element with a more traditional
arch=('x86_64')
url="https://schildi.chat"
license=('Apache')
-depends=()
+depends=('sqlcipher')
provides=('---appName---')
conflicts=('---appName---')
source=("---debName---"
@@ -22,5 +22,4 @@ package() {
msg2 "Extracting the data.tar.xz..."
bsdtar -xf data.tar.xz -C "$pkgdir/"
install -Dm755 "${srcdir}"/---appName---.sh "${pkgdir}"/usr/bin/---appName---
- sed -i 's|^Exec=.*|Exec=/usr/bin/---appName--- %u|' "${pkgdir}"/usr/share/applications/---appName---.desktop
}
diff --git a/local-pkgbuild-template/schildichat-desktop.sh b/local-pkgbuild-template/schildichat-desktop.sh
index 99168a8..8e25e12 100644
--- a/local-pkgbuild-template/schildichat-desktop.sh
+++ b/local-pkgbuild-template/schildichat-desktop.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-exec "/opt/---productName---/---appName---" "$@"
+LD_PRELOAD=/usr/lib/libsqlcipher.so exec "/opt/---productName---/---appName---" "$@"
diff --git a/matrix-js-sdk b/matrix-js-sdk
index c696abf..a71dd32 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit c696abff7507dfce8e94a6db14a4b4693895b0e2
+Subproject commit a71dd32356c5fd11000f3344370a4e25594e7f6d
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 8245acd..7edaf5b 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 8245acd053cb8fcbe8789d43afe70204a15a1deb
+Subproject commit 7edaf5bc5204fbf658057fd272e17e2ebeb207f9
diff --git a/merge_helpers.sh b/merge_helpers.sh
index 3808eab..4b7aed3 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -162,8 +162,7 @@ get_current_versions() {
get_versions_string() {
versions_string="${versions[0]}-sc.${versions[1]}"
- # both zero means the initial version after a merge
- if [[ ${versions[1]} -eq 0 || ${versions[2]} -gt 0 ]]; then
+ if [[ ${versions[2]} -gt 0 ]]; then
versions_string+=".test.${versions[2]}"
fi
}
diff --git a/merge_upstream.sh b/merge_upstream.sh
index cfbea1f..c3fef9c 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -46,7 +46,7 @@ automatic_packagejson_adjustment
# Automatic theme update
pushd "matrix-react-sdk" > /dev/null
-./theme.sh y
+./theme.sh
popd > /dev/null
popd > /dev/null