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
@@ -43,7 +43,7 @@ CSC_NAME ?=
 -include release.mk
 
 setup:
-	./setup.sh
+	if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi
 
 element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset: $(wildcard element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset/*)
 
@@ -60,15 +60,19 @@ 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
 
 desktop-common: web
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
-	SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native
+	$(YARN) --cwd element-desktop run build:native
 
 macos-common: web icns
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''

README.md

@@ -3,10 +3,9 @@
 SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop).
 
 The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are:
-- Customizable room list style (compact single line, intermediate and roomy with two line preview)
+- A unified chat list for both direct and group chats
-- Option to show direct and group chats in a combined list
-- Improved theming options
 - Message bubbles
+- Bigger items in the room list
 - … and more!
 
 Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop)  
@@ -16,18 +15,6 @@ Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-we
 
 <img src="https://raw.githubusercontent.com/SchildiChat/schildichat-desktop/sc/screenshots/1.png"/>
 
-<details>
-<summary>Public key used to sign the Debian packages</summary>
-
-```
-pub   rsa4096 2020-12-08 [SC]
-      560BB70DA86A6633A39CEC6023358905FE294D01
-uid           Super apt repo key <apt@supercable.onl>
-sub   rsa4096 2020-12-08 [E]
-```
-
-</details>
-
 
 ## Building SchildiChat Web/Desktop
 
@@ -52,7 +39,7 @@ some dependencies might not be recent enough to build SchildiChat.
 The following are the dependencies required to build SchildiChat Web/Desktop on Debian 11 (bullseye):
 
 ```
-# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools openssl libssl-dev tcl
+# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools
 
 # curl -sL https://deb.nodesource.com/setup_14.x | bash -
 # apt update

bump_release_version.sh

@@ -17,13 +17,4 @@ forall_repos check_clean_git
 
 bump_release_version
 
-# Get version string
-get_current_versions
-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

bump_test_version.sh

@@ -17,13 +17,4 @@ forall_repos check_clean_git
 
 bump_test_version
 
-# Get version string
-get_current_versions
-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

configs/sc/config.json

@@ -27,5 +27,11 @@
             "text": "Privacy Policy"
         }
     ],
-    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
+    "sc_update_announcement_room": {
+        "room_id_or_alias": "!JwTYjASnrfLEJQGQvt:matrix.org",
+        "via_servers": [
+            "supercable.onl",
+            "spiritcroc.de"
+        ]
+    }
 }

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

element-desktop

@@ -1 +1 @@
-Subproject commit b0bfb5c2d37288edd7b814fc7ac97a96622a00fc
+Subproject commit a074ede0c13c09dca96a9be2c60d3c4e5c03a234

element-web

@@ -1 +1 @@
-Subproject commit d9f614624be0600c8c308b526577864087e95d97
+Subproject commit 94895dee0a29a517919b8ba7461982baf11139cc

i18n-overlays/element-desktop/fa.json

@@ -1,3 +1 @@
-{
+{}
-    "Show": "نشان دادن"
-}

i18n-overlays/element-desktop/tr.json

@@ -1,3 +0,0 @@
-{
-    "Show": "Göster"
-}

i18n-overlays/element-web/tr.json

@@ -1 +0,0 @@
-{}

i18n-overlays/matrix-react-sdk/cs.json

@@ -40,12 +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é",
+    "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.",
-    "Corners": "Rohy",
-    "Round": "Oblé",
-    "Extra round": "Kulaté",
-    "Mixed": "Smíšené"
 }

i18n-overlays/matrix-react-sdk/de_DE.json

@@ -141,12 +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",
+    "Mark as unread": "Als ungelesen markieren"
-    "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren",
-    "Collapse additional buttons": "Zusätzliche Buttons einklappen",
-    "Round": "Rund",
-    "Mixed": "Gemischt",
-    "Corners": "Ecken",
-    "Extra round": "Extra rund",
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Die Startseite hilft dir, einen Überblick über deine Chats zu bekommen. Bedenke, dass die Deaktivierung dazu führen kann, dass du bestimmte Räume nicht sehen kannst."
 }

i18n-overlays/matrix-react-sdk/en_EN.json

@@ -39,15 +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",
+    "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.",
-    "Corners": "Corners",
-    "Round": "Round",
-    "Extra round": "Extra round",
-    "Mixed": "Mixed",
-    "Sound pack": "Sound pack",
-    "Schildi: Softer sounds for reduced anxiety": "Schildi: Softer sounds for reduced anxiety",
-    "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element"
 }

i18n-overlays/matrix-react-sdk/id.json

@@ -39,12 +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",
+    "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.",
-    "Corners": "Sudut",
-    "Round": "Bulat",
-    "Extra round": "Ekstra bulat",
-    "Mixed": "Campur"
 }

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",
+    "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"
 }

i18n-overlays/matrix-react-sdk/sv.json

@@ -39,12 +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",
+    "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.",
-    "Round": "Runda",
-    "Extra round": "Extrarunda",
-    "Mixed": "Blandad",
-    "Corners": "Hörn"
 }

i18n-overlays/matrix-react-sdk/tr.json

@@ -1,48 +0,0 @@
-{
-    "Show message bubbles on one side only": "Mesaj baloncuklarını yalnızca bir tarafta göster",
-    "Show message bubbles depending on the width either on both sides or only on one side": "Genişliğe bağlı olarak mesaj baloncuklarını her iki tarafta veya sadece bir tarafta göster",
-    "Message bubbles": "Mesaj baloncukları",
-    "Normal priority": "Normal öncelik",
-    "Message layout": "Mesaj düzeni",
-    "Modern": "Modern",
-    "Update notifications": "Güncelleme bildirimleri",
-    "Don't ask again": "Bir daha sorma",
-    "System": "Sistem",
-    "Add custom theme": "Özel tema ekle",
-    "Theme in use": "Tema kullanımda",
-    "Light theme": "Açık tema",
-    "Dark theme": "Koyu tema",
-    "Uniform": "Düzenli",
-    "For people": "İnsanlar için",
-    "In group chats": "Grup sohbetlerinde",
-    "In public rooms": "Halka açık odalarda",
-    "Show people and rooms in a combined list": "Kişileri ve odaları birleşik bir listede göster",
-    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Yeni sürümler hakkında sizi bilgilendiren bir odaya katılmak ister misiniz? Bu oda özellikle platformunuz SchildiChat için otomatik güncellemeleri desteklemiyorsa (ör. Windows ve macOS) kullanışlıdır.",
-    "If disabled, the space overview will be shown when switching to another space.": "Devre dışı bırakılırsa, başka bir alana geçerken alana ilişkin genel görünüm gösterilir.",
-    "Mark as unread": "Okunmadı olarak işaretle",
-    "User name color mode": "Kullanıcı adı renk modu",
-    "Show people in spaces": "İnsanları alanlarda göster",
-    "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Devre dışı bırakılmışsa, kişisel alanlara direkt mesajlar eklemeye devam edebilirsiniz. Etkinleştirilirse, alana üye olan herkesi otomatik olarak görürsünüz.",
-    "Show notification badges for People in Spaces": "Alanlardaki Kişiler için bildirim rozetlerini göster",
-    "Return to the room previously opened in a space": "Bir alanda daha önce açılmış olan odaya geri dön",
-    "Compact: tiny avatar together with name and preview in one line": "Sıkıştırılmış: tek satırda isim ve önizleme ile birlikte küçük avatar",
-    "Intermediate: medium sized avatar with single-line preview": "Orta: tek satır önizlemeli orta boy avatar",
-    "Roomy: big avatar with two-line preview": "Ferah: iki satırlık önizleme ile büyük avatar",
-    "Room list style": "Oda listesi tarzı",
-    "Hide advanced theme settings": "Gelişmiş tema ayarlarını gizle",
-    "Show all rooms in Home": "Ana sayfadaki tüm odaları göster",
-    "All rooms you're in will appear in Home.": "Bulunduğunuz tüm odalar ana sayfada görünecektir.",
-    "Show advanced theme settings": "Gelişmiş tema ayarlarını göster",
-    "Theme": "Tema",
-    "Font size and typeface": "Yazı tipi boyutu ve yazı karakteri",
-    "Room list": "Oda sıralaması",
-    "Mark rooms as unread": "Sohbetleri okunmamış olarak işaretlemeye izin ver",
-    "Mark as read": "Okundu olarak işaretle",
-    "Enable YouTube embed player": "YouTube gömülü oynatıcıyı etkinleştir",
-    "Collapse additional buttons": "Ek düğmeleri daralt",
-    "Corners": "Köşeler",
-    "Round": "Yuvarlak",
-    "Extra round": "Fazladan yuvarlak",
-    "Mixed": "Karışık",
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Ana sayfa, her şeye genel bir bakış elde etmek için kullanışlıdır. Devre dışı bırakıldığında belirli odaları göremeyebileceğinizi unutmayın."
-}

i18n-overlays/matrix-react-sdk/zh_Hans.json

@@ -39,8 +39,5 @@
     "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "您想加入一个用来通知版本更新的房间吗？如果您的平台不支持自动更新 SchildiChat（例如 Windows 和 macOS），这将非常有用。",
     "Mark as read": "标记为已读",
     "Mark rooms as unread": "允许将聊天记录标记为未读",
-    "Mark as unread": "标记为未读",
+    "Mark as unread": "标记为未读"
-    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "主页对于概览所有消息来说非常有用。请注意：禁用主页可能会让您无法看到某些房间。",
-    "Enable YouTube embed player": "启用 YouTube 嵌入式播放器",
-    "Collapse additional buttons": "折叠额外的按钮"
 }

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
 }

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit dd3932fcb705f445e8368855b27db95eb1f173b6
+Subproject commit 09fc7b8ff4035e92821d264e807441f9d4e9da85

matrix-react-sdk

@@ -1 +1 @@
-Subproject commit 71fe48a9cea7b2c73e0b778aa8ed594e6755b4f8
+Subproject commit 2fd5a9616e11a138d859e0a30e81e5d9d185f77f

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[2]} -gt 0 ]]; then
-    if [[ ${versions[1]} -eq 0 || ${versions[2]} -gt 0 ]]; then
         versions_string+=".test.${versions[2]}"
     fi
 }
@@ -240,6 +239,9 @@ automatic_packagejson_adjustment() {
     local versions
     get_current_versions
     
+    # every build after a merge is a new test build
+    versions[2]=$((versions[2] + 1))
+
     forelement_repos apply_packagejson_overlay "package.json" "overlay-package.json"
     forelement_repos write_version "package.json"
 }

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