feat(ui): Move the bubbles into their own directory

Fixes #192.

.github/FUNDING.yml

@@ -0,0 +1 @@
+ko_fi: papatutuwawa

.gitignore

@@ -52,7 +52,11 @@ app.*.map.json
 **/*.g.dart
 **/*.freezed.dart
 **/*.moxxy.dart
+lib/i18n/*.dart
 
 # Direnv
 .envrc
 .direnv/
+
+# Android artifacts
+.android

.gitlint

@@ -7,7 +7,7 @@ line-length=72
 [title-trailing-punctuation]
 [title-hard-tab]
 [title-match-regex]
-regex=^(ui,service|service,xmpp|feat|test|refactor|xmpp|service|redux|ui|lint|style|docs|build|misc|flake|shared|meta|android|ios|release):.*$
+regex=^(feat|fix|chore|refactor|docs|release|test)\((xmpp|service|ui|shared|meta|tests|i18n)+(,(xmpp|service|ui|shared|meta|tests|i18n))*\): .*$
 
 
 [body-trailing-whitespace]

README.md

@@ -4,11 +4,12 @@ An experimental XMPP client that tries to be as easy, modern and beautiful as po
 
 The code is also available on [codeberg](https://codeberg.org/moxxy/moxxyv2).
 
-[<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="80" />](https://apt.izzysoft.de/fdroid/index/apk/me.polynom.moxxyv2)
+[<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="80" />](https://apt.izzysoft.de/fdroid/index/apk/org.moxxy.moxxyv2)
 
 ## Screenshots
 
-![screenshots](./assets/repo/title.png)
+[<img src="https://codeberg.org/moxxy/moxxyv2/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="20%"></img>](./fastlane/metadata/android/en-US/images/phoneScreenshots/1.png)
+[<img src="https://codeberg.org/moxxy/moxxyv2/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="20%"></img>](./fastlane/metadata/android/en-US/images/phoneScreenshots/2.png)
 
 ## Developing and Building
 
@@ -16,7 +17,8 @@ Clone using `git clone --recursive https://github.com/Polynomdivision/moxxyv2.gi
 
 In order to build Moxxy, you need to have [Flutter](https://docs.flutter.dev/get-started/install) set
 up. If you are running NixOS or using Nix, you can also use the Flake at the root of the repository
-by running `nix develop` to get a development shell including everything that is needed.
+by running `nix develop` to get a development shell including everything that is needed. Note
+that if you decide to use the Flake, `ANDROID_HOME` and `ANDROID_AVD_HOME` must be set to the respective directories.
 
 Before building Moxxy, you need to generate all needed data classes. To do this, run
 `flutter pub get` to install all dependencies. Then run `flutter pub run build_runner build` to generate
@@ -44,3 +46,9 @@ See `./LICENSE`.
 ## Special Thanks
 
 - New logo designed by [Synoh](https://twitter.com/synoh_manda)
+
+## Support
+
+If you like what I do and you want to support me, feel free to donate to me on Ko-Fi.
+
+[<img src="https://codeberg.org/moxxy/moxxyv2/raw/branch/master/assets/repo/kofi.png" height="36" style="height: 36px; border: 0px;"></img>](https://ko-fi.com/papatutuwawa)

analysis_options.yaml

@@ -13,3 +13,6 @@ analyzer:
     - "**/*.freezed.dart"
     - "**/*.moxxy.dart"
     - "test/"
+    - "integration_test/"
+    - "lib/service/database/migrations/*.dart"
+    - "lib/i18n/*.dart"

android/app/proguard-rules.pro

@@ -0,0 +1 @@
+-keep class net.sqlcipher.** { *; }

android/app/src/main/AndroidManifest.xml

@@ -46,6 +46,9 @@
             android:value="2" />
    </application>
    <uses-permission android:name="android.permission.INTERNET" />
+   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+   <uses-permission android:name="android.permission.READ_CONTACTS" />
    <queries>
      <intent>
        <action android:name="android.intent.action.VIEW" />

assets/i18n/strings.i18n.json

@@ -0,0 +1,336 @@
+{
+    "@@name": "English",
+    "global": {
+	"title": "Moxxy",
+	"moxxySubtitle": "An experiment into building a modern, easy and beautiful XMPP client.",
+	"dialogAccept": "Okay",
+	"dialogCancel": "Cancel",
+	"yes": "Yes",
+	"no": "No"
+    },
+    "notifications": {
+	"permanent": {
+	    "idle": "Idle",
+	    "ready": "Ready to receive messages",
+	    "connecting": "Connecting...",
+	    "disconnect": "Disconnected",
+	    "error": "Error"
+	},
+	"message": {
+	    "reply": "Reply",
+	    "markAsRead": "Mark as read"
+	},
+	"channels": {
+	    "messagesChannelName": "Messages",
+	    "messagesChannelDescription": "The notification channel for received messages",
+	    "warningChannelName": "Warnings",
+	    "warningChannelDescription": "Warnings related to Moxxy"
+	}
+    },
+    "dateTime": {
+	"justNow": "Just now",
+	"nMinutesAgo": "${min}min ago",
+	"mondayAbbrev": "Mon",
+	"tuesdayAbbrev": "Tue",
+	"wednessdayAbbrev": "Wed",
+	"thursdayAbbrev": "Thu",
+	"fridayAbbrev": "Fri",
+	"saturdayAbbrev": "Sat",
+	"sundayAbbrev": "Sun",
+	"january": "January",
+	"february": "February",
+	"march": "March",
+	"april": "April",
+	"may": "May",
+	"june": "June",
+	"july": "July",
+	"august": "August",
+	"september": "September",
+	"october": "October",
+	"november": "November",
+	"december": "December",
+	"today": "Today",
+	"yesterday": "Yesterday"
+    },
+    "messages": {
+	"image": "Image",
+	"video": "Video",
+	"audio": "Audio",
+	"file": "File",
+	"sticker": "Sticker",
+	"retracted": "The message has been retracted",
+	"retractedFallback": "A previous message has been retracted but your client does not support it"
+    },
+    "errors": {
+	"omemo": {
+	    "couldNotPublish": "Could not publish the cryptographic identity to the server. This means that end-to-end encryption may not work.",
+	    "notEncryptedForDevice": "This message was not encrypted for this device",
+	    "invalidHmac": "Could not decrypt message",
+	    "noDecryptionKey": "No decryption key available",
+	    "messageInvalidAfixElement": "Invalid encrypted message",
+
+	    "verificationInvalidOmemoUrl": "Invalid OMEMO:2 fingerprint",
+	    "verificationWrongJid": "Wrong XMPP-address",
+	    "verificationWrongDevice": "Wrong OMEMO:2 device",
+	    "verificationNotInList": "Wrong OMEMO:2 device",
+	    "verificationWrongFingerprint": "Wrong OMEMO:2 fingerprint"
+	},
+	"connection": {
+	    "connectionTimeout": "Could not connect to server"
+	},
+	"login": {
+	    "saslFailed": "Invalid login credentials",
+	    "startTlsFailed": "Failed to establish a secure connection",
+	    "noConnection": "Failed to establish a connection",
+	    "unspecified": "Unspecified error"
+	},
+	"message": {
+	    "unspecified": "Unknown error",
+	    "fileUploadFailed": "The file upload failed",
+	    "contactDoesntSupportOmemo": "The contact does not support encryption using OMEMO:2",
+	    "fileDownloadFailed": "The file download failed",
+	    "serviceUnavailable": "The message could not be delivered to the contact",
+	    "remoteServerTimeout": "The message could not be delivered to the contact's server",
+	    "remoteServerNotFound": "The message could not be delivered to the contact's server as it cannot be found",
+	    "failedToEncrypt": "The message could not be encrypted",
+	    "failedToEncryptFile": "The file could not be encrypted",
+	    "failedToDecryptFile": "The file could not be decrypted",
+	    "fileNotEncrypted": "The chat is encrypted but the file is not encrypted"
+	},
+	"conversation": {
+	    "audioRecordingError": "Failed to finalize audio recording",
+	    "openFileNoAppError": "No app found to open this file",
+	    "openFileGenericError": "Failed to open file"
+	}
+    },
+    "warnings": {
+	"message": {
+	    "integrityCheckFailed": "Could not verify file integrity"
+	},
+	"conversation": {
+	    "holdForLonger": "Hold button longer to record a voice message"
+	}
+    },
+    "pages": {
+	"intro": {
+	    "noAccount": "Have no XMPP account? No worries, creating one is really easy.",
+	    "loginButton": "Login",
+	    "registerButton": "Register"
+	},
+	"login": {
+	    "title": "Login",
+	    "xmppAddress": "XMPP-Address",
+	    "password": "Password",
+	    "advancedOptions": "Advanced options",
+	    "createAccount": "Create account on server"
+	},
+	"conversations": {
+	    "speeddialNewChat": "New chat",
+	    "speeddialJoinGroupchat": "Join groupchat",
+	    "overlaySettings": "Settings",
+	    "noOpenChats": "You have no open chats",
+	    "startChat": "Start a chat",
+	    "closeChat": "Close chat",
+	    "closeChatBody": "Are you sure you want to close the chat with ${conversationTitle}?",
+	    "markAsRead": "Mark as read"
+	},
+	"conversation": {
+	    "unencrypted": "Unencrypted",
+	    "encrypted": "Encrypted",
+	    "closeChat": "Close chat",
+	    "closeChatConfirmTitle": "Close chat",
+	    "closeChatConfirmSubtext": "Are you sure you want to close this chat?",
+	    "blockShort": "Block",
+	    "blockUser": "Block user",
+	    "online": "Online",
+	    "retract": "Retract message",
+	    "retractBody": "Are you sure you want to retract the message? Keep in mind that this is only a request that the client does not have to honour.",
+	    "forward": "Forward",
+	    "edit": "Edit",
+	    "quote": "Quote",
+	    "copy": "Copy content",
+	    "addReaction": "Add reaction",
+	    "showError": "Show error",
+	    "showWarning": "Show warning",
+	    "addToContacts": "Add to contacts",
+	    "addToContactsTitle": "Add ${jid} to contacts",
+	    "addToContactsBody": "Are you sure you want to add ${jid} to your contacts?",
+	    "stickerPickerNoStickersLine1": "You have no sticker packs installed.",
+	    "stickerPickerNoStickersLine2": "They can be installed in the sticker settings.",
+	    "stickerSettings": "Sticker settings",
+	    "newDeviceMessage": "${title} added a new encryption device"
+	},
+	"addcontact": {
+	    "title": "Add new contact",
+	    "xmppAddress": "XMPP-Address",
+	    "subtitle": "You can add a contact either by typing in their XMPP address or by scanning their QR code",
+	    "buttonAddToContact": "Add to contacts"
+	},
+	"newconversation": {
+	    "title": "Start new chat",
+	    "addContact": "Add contact",
+	    "createGroupchat": "Create groupchat"
+	},
+	"crop": {
+	    "setProfilePicture": "Set as profile picture"
+	},
+	"shareselection": {
+	    "shareWith": "Share with...",
+	    "confirmTitle": "Send file",
+	    "confirmBody": "One or more chats are unencrypted. This means that the file will be leaked to the server. Do you still want to continue?"
+	},
+	"profile": {
+	    "general": {
+		"omemo": "Security"
+	    },
+	    "conversation": {
+		"notifications": "Notifications",
+		"notificationsMuted": "Muted",
+		"notificationsEnabled": "Enabled",
+		"sharedMedia": "Media"
+	    },
+	    "owndevices": {
+		"title": "Own Devices",
+		"thisDevice": "This device",
+		"otherDevices": "Other devices",
+		"deleteDeviceConfirmTitle": "Delete device",
+		"deleteDeviceConfirmBody": "This means that contacts will not be able to encrypt for that device. Continue?",
+		"recreateOwnSessions": "Rebuild sessions",
+		"recreateOwnSessionsConfirmTitle": "Recreate own sessions?",
+		"recreateOwnSessionsConfirmBody": "This will recreate the cryptographic sessions with your own devices. Use only if your own devices throw decryption errors.",
+		"recreateOwnDevice": "Recreate device",
+		"recreateOwnDeviceConfirmTitle": "Recreate own device?",
+		"recreateOwnDeviceConfirmBody": "This will recreate this device's cryptographic identity. It will take some time. If contacts verified your device, they will have to do it again. Continue?"
+	    },
+	    "devices": {
+		"title": "Devices",
+		"recreateSessions": "Rebuild sessions",
+		"recreateSessionsConfirmTitle": "Rebuild sessions?",
+		"recreateSessionsConfirmBody": "This will recreate the cryptographic sessions with your own devices. Use only if your own devices throw decryption errors."
+	    }
+	},
+	"blocklist": {
+	    "title": "Blocklist",
+	    "noUsersBlocked": "You have no users blocked",
+	    "unblockAll": "Unblock all",
+	    "unblockAllConfirmTitle": "Are you sure?",
+	    "unblockAllConfirmBody": "Are you sure you want to unblock all users?",
+	    "unblockJidConfirmTitle": "Unblock ${jid}?",
+	    "unblockJidConfirmBody": "Are you sure you want to unblock ${jid}? You will receive messages from this user again."
+	},
+	"cropbackground": {
+	    "blur": "Blur background",
+	    "setAsBackground": "Set as background image"
+	},
+	"stickerPack": {
+	    "removeConfirmTitle": "Remove sticker pack",
+	    "removeConfirmBody": "Are you sure you want to remove this sticker pack?",
+	    "installConfirmTitle": "Install sticker pack",
+	    "installConfirmBody": "Are you sure you want to install this sticker pack?",
+	    "restricted": "This sticker pack is restricted. That means that the stickers will be displayed but cannot be sent.",
+	    "fetchingFailure": "Could not find the sticker pack"
+	},
+	"settings": {
+	    "settings": {
+		"title": "Settings",
+		"conversationsSection": "Conversations",
+		"accountSection": "Account",
+		"signOut": "Sign out",
+		"signOutConfirmTitle": "Sign Out",
+		"signOutConfirmBody": "You are about to sign out. Proceed?",
+		"miscellaneousSection": "Miscellaneous",
+		"debuggingSection": "Debugging"
+	    },
+	    "about": {
+		"title": "About",
+		"licensed": "Licensed under GPL3",
+		"version": "Version ${version}",
+		"viewSourceCode": "View source code"
+	    },
+	    "appearance": {
+		"title": "Appearance",
+		"languageSection": "Language",
+		"language": "App language",
+		"languageSubtext": "Currently selected: $selectedLanguage",
+		"systemLanguage": "Default language"
+	    },
+	    "licenses": {
+		"title": "Open-Source Licenses",
+		"licensedUnder": "Licensed under $license"
+	    },
+	    "conversation": {
+		"title": "Chat",
+		"appearance": "Appearance",
+		"selectBackgroundImage": "Select background image",
+		"selectBackgroundImageDescription": "This image will be the background of all your chats",
+		"removeBackgroundImage": "Remove background image",
+		"removeBackgroundImageConfirmTitle": "Remove background image",
+		"removeBackgroundImageConfirmBody": "Are you sure you want to remove your conversation background image?",
+		"newChatsSection": "New Conversations",
+		"newChatsMuteByDefault": "Mute new chats by default",
+		"newChatsE2EE": "Enable end-to-end encryption by default. WARNING: Experimental",
+		"behaviourSection": "Behaviour",
+		"contactsIntegration": "Contacts integration",
+		"contactsIntegrationBody": "When enabled, data from the phonebook will be used to provide chat titles and profile pictures. No data will be sent to the server."
+	    },
+	    "debugging": {
+		"title": "Debugging options",
+		"generalSection": "General",
+		"generalEnableDebugging": "Enable debugging",
+		"generalEncryptionPassword": "Encryption password",
+		"generalEncryptionPasswordSubtext": "The logs may contain sensitive information so pick a strong passphrase",
+		"generalLoggingIp": "Logging IP",
+		"generalLoggingIpSubtext": "The IP the logs should be sent to",
+		"generalLoggingPort": "Logging Port",
+		"generalLoggingPortSubtext": "The IP the logs should be sent to"
+	    },
+	    "network": {
+		"title": "Network",
+		"automaticDownloadsSection": "Automatic Downloads",
+		"automaticDownloadsText": "Moxxy will automatically download files on...",
+		"automaticDownloadsMaximumSize": "Maximum Download Size",
+		"automaticDownloadsMaximumSizeSubtext": "The maximum file size for a file to be automatically downloaded",
+		"automaticDownloadAlways": "Always",
+		"wifi": "Wifi",
+		"mobileData": "Mobile data"
+	    },
+	    "privacy": {
+		"title": "Privacy",
+		"generalSection": "General",
+		"showContactRequests": "Show contact requests",
+		"showContactRequestsSubtext": "This will show people who added you to their contact list but sent no message yet",
+		"profilePictureVisibility": "Make profile picture public",
+		"profilePictureVisibilitSubtext": "If enabled, everyone can see your profile picture. If disabled, only users on your contact list can see your profile picture.",
+		"autoAcceptSubscriptionRequests": "Auto-accept subscription requests",
+		"autoAcceptSubscriptionRequestsSubtext": "If enabled, subscription requests will be automatically accepted if the user is in the contact list.",
+		"conversationsSection": "Conversation",
+		"sendChatMarkers": "Send chat markers",
+		"sendChatMarkersSubtext": "This will tell your conversation partner if you received or read a message",
+		"sendChatStates": "Send chat states",
+		"sendChatStatesSubtext": "This will show your conversation partner if you are typing or looking at the chat",
+		"redirectsSection": "Redirects",
+		"redirectText": "This will redirect $serviceName links that you tap to a proxy service, e.g. $exampleProxy",
+		"currentlySelected": "Currently selected: $proxy",
+		"redirectsTitle": "$serviceName Redirect",
+		"cannotEnableRedirect": "Cannot enable $serviceName redirects",
+		"cannotEnableRedirectSubtext": "You must first set a proxy service to redirect to. To do so, tap the field next to the switch.",
+		"urlEmpty": "URL cannot be empty",
+		"urlInvalid": "Invalid URL",
+		"redirectDialogTitle": "$serviceName Redirect",
+		"stickersPrivacy": "Keep sticker list public",
+		"stickersPrivacySubtext": "If enabled, everyone will be able to see your list of installed sticker packs."
+	    },
+	    "stickers": {
+		"title": "Stickers",
+		"stickerSection": "Sticker",
+		"displayStickers": "Display stickers in chat",
+		"autoDownload": "Automatically download stickers",
+		"autoDownloadBody": "If enabled, stickers are automatically downloaded when the sender is in your contact list.",
+		"stickerPacksSection": "Sticker packs",
+		"importStickerPack": "Import sticker pack",
+		"importSuccess": "Sticker pack successfully imported",
+		"importFailure": "Failed to import sticker pack"
+	    }
+	}
+    }
+}

assets/i18n/strings_de.i18n.json

@@ -0,0 +1,336 @@
+{
+    "@@name": "Deutsch",
+    "global": {
+	"title": "Moxxy",
+	"moxxySubtitle": "Ein Experiment im Entwickeln eines modernen, einfachen und schönen XMPP-Clients.",
+	"dialogAccept": "Okay",
+	"dialogCancel": "Abbrechen",
+	"yes": "Ja",
+	"no": "Nein"
+    },
+    "notifications": {
+	"permanent": {
+	    "idle": "Bereit",
+	    "ready": "Bereit zum Nachrichtenempfang",
+	    "connecting": "Verbinde...",
+	    "disconnect": "Keine Verbindung",
+	    "error": "Fehler"
+	},
+	"message": {
+	    "reply": "Antworten",
+	    "markAsRead": "Als gelesen markieren"
+	},
+	"channels": {
+	    "messagesChannelName": "Nachrichten",
+	    "messagesChannelDescription": "Empfangene Nachrichten",
+	    "warningChannelName": "Warnungen",
+	    "warningChannelDescription": "Warnungen im Bezug auf Moxxy"
+	}
+    },
+    "dateTime": {
+	"justNow": "Gerade",
+	"nMinutesAgo": "vor ${min}min",
+	"mondayAbbrev": "Mon",
+	"tuesdayAbbrev": "Die",
+	"wednessdayAbbrev": "Mit",
+	"thursdayAbbrev": "Don",
+	"fridayAbbrev": "Fre",
+	"saturdayAbbrev": "Sam",
+	"sundayAbbrev": "Son",
+	"january": "Januar",
+	"february": "Februar",
+	"march": "März",
+	"april": "April",
+	"may": "Mai",
+	"june": "Juni",
+	"july": "Juli",
+	"august": "August",
+	"september": "September",
+	"october": "Oktober",
+	"november": "November",
+	"december": "Dezember",
+	"today": "Heute",
+	"yesterday": "Gestern"
+    },
+    "messages": {
+	"image": "Bild",
+	"video": "Video",
+	"audio": "Audio",
+	"file": "Datei",
+	"sticker": "Sticker",
+	"retracted": "Die Nachricht wurde zurückgezogen",
+	"retractedFallback": "Eine vorherige Nachricht wurde zurückgezogen. Dein Client unterstüzt dies jedoch nicht"
+    },
+    "errors": {
+	"omemo": {
+	    "couldNotPublish": "Konnte die kryptographische Identität nicht auf dem Server veröffentlichen. Ende-zu-Ende-Verschlüsselung funktioniert eventuell nicht.",
+	    "notEncryptedForDevice": "Die Nachricht wurde nicht für dieses Gerät verschlüsselt",
+	    "invalidHmac": "Die Nachricht konnte nicht entschlüsselt werden",
+	    "noDecryptionKey": "Kein Schlüssel zum Entschlüsseln vorhanden",
+	    "messageInvalidAfixElement": "Ungültige verschlüsselte Nachricht",
+
+	    "verificationInvalidOmemoUrl": "Ungültiger OMEMO:2 Fingerabdruck",
+	    "verificationWrongJid": "Falsche XMPP-Addresse",
+	    "verificationWrongDevice": "Falsches OMEMO:2 Gerät",
+	    "verificationNotInList": "OMEMO:2 Gerät unbekannt",
+	    "verificationWrongFingerprint": "Falscher OMEMO:2 Fingerabdruck"
+	},
+	"connection": {
+	    "connectionTimeout": "Verbindung zum Server nicht möglich"
+	},
+	"login": {
+	    "saslFailed": "Ungültige Logindaten",
+	    "startTlsFailed": "Konnte keine sichere Verbindung zum Server aufbauen",
+	    "noConnection": "Konnte keine Verbindung zum Server aufbauen",
+	    "unspecified": "Unbestimmter Fehler"
+	},
+	"message": {
+	    "unspecified": "Unbekannter Fehler",
+	    "fileUploadFailed": "Das Hochladen der Datei ist fehlgeschlagen",
+	    "contactDoesntSupportOmemo": "Der Kontakt unterstützt Verschlüsselung mit OMEMO:2 nicht",
+	    "fileDownloadFailed": "Das Herunterladen der Datei ist fehlgeschlagen",
+	    "serviceUnavailable": "Die Nachricht konnte nicht gesendet werden",
+	    "remoteServerTimeout": "Die Nachricht konnte nicht zugestellt werden",
+	    "remoteServerNotFound": "Die Nachricht konnte nicht gesendet werden, da der Empfängerserver unbekannt ist",
+	    "failedToEncrypt": "Die Nachricht konnte nicht verschlüsselt werden",
+	    "failedToEncryptFile": "Die Datei konnte nicht verschlüsselt werden",
+	    "failedToDecryptFile": "Die Datei konnte nicht entschlüsselt werden",
+	    "fileNotEncrypted": "Der Chat ist verschlüsselt, aber die Datei wurde unverschlüsselt übertragen"
+	},
+	"conversation": {
+	    "audioRecordingError": "Fehler beim Fertigstellen der Audioaufnahme",
+	    "openFileNoAppError": "Keine App vorhanden, um die Datei zu öffnen",
+	    "openFileGenericError": "Fehler beim Öffnen der Datei"
+	}
+    },
+    "warnings": {
+	"message": {
+	    "integrityCheckFailed": "Konnte Integrität der Datei nicht überprüfen"
+	},
+	"conversation": {
+	    "holdForLonger": "Button länger gedrückt halten, um eine Sprachnachricht aufzunehmen"
+	}
+    },
+    "pages": {
+	"intro": {
+	    "noAccount": "Kein XMPP-Account vorhanden? Einen zu erstellen ist sehr einfach.",
+	    "loginButton": "Einloggen",
+	    "registerButton": "Registrieren"
+	},
+	"login": {
+	    "title": "Login",
+	    "xmppAddress": "XMPP-Adresse",
+	    "password": "Passwort",
+	    "advancedOptions": "Fortgeschrittene Optionen",
+	    "createAccount": "Account auf dem Server erstellen"
+	},
+	"conversations": {
+	    "speeddialNewChat": "Neuer chat",
+	    "speeddialJoinGroupchat": "Gruppenchat beitreten",
+	    "overlaySettings": "Einstellungen",
+	    "noOpenChats": "Du hast keine offenen chats",
+	    "startChat": "Einen chat anfangen",
+	    "closeChat": "Chat schließen",
+	    "closeChatBody": "Bist du dir sicher, dass du den Chat mit ${conversationTitle} schließen möchtest?",
+	    "markAsRead": "Als gelesen markieren"
+	},
+	"conversation": {
+	    "unencrypted": "Unverschlüsselt",
+	    "encrypted": "Verschlüsselt",
+	    "closeChat": "Chat schließen",
+	    "closeChatConfirmTitle": "Chat schließen",
+	    "closeChatConfirmSubtext": "Bist Du dir sicher, dass du den Chat schließen möchtest?",
+	    "blockShort": "Blockieren",
+	    "blockUser": "Nutzer blockieren",
+	    "online": "Online",
+	    "retract": "Nachricht löschen",
+	    "retractBody": "Bist du dir sicher, dass du die Nachricht löschen willst? Bedenke, dass dies nur eine Bitte ist, die dein gegenüber nicht beachten muss.",
+	    "forward": "Weiterleiten",
+	    "edit": "Bearbeiten",
+	    "quote": "Zitieren",
+	    "copy": "Inhalt kopieren",
+	    "addReaction": "Reaktion hinzufügen",
+	    "showError": "Fehler anzeigen",
+	    "showWarning": "Warnung anzeigen",
+	    "addToContacts": "Zu Kontaken hinzufügen",
+	    "addToContactsTitle": "${jid} zu Kontakten hinzufügen",
+	    "addToContactsBody": "Bist du dir sicher, dass du ${jid} zu deinen Kontakten hinzufügen möchtest?",
+	    "stickerPickerNoStickersLine1": "Du hast keine Stickerpacks installiert.",
+	    "stickerPickerNoStickersLine2": "Diese können in den Stickereinstellungen installiert werden.",
+	    "stickerSettings": "Stickereinstellungen",
+	    "newDeviceMessage": "${title} hat ein neues Verschlüsselungsgerät hinzugefügt"
+	},
+	"addcontact": {
+	    "title": "Neuen Kontakt hinzufügen",
+	    "xmppAddress": "XMPP-Adresse",
+	    "subtitle": "Du kannst einen Kontakt hinzufügen, indem Du entweder die XMPP-Adresse eingibst oder den QR-Code deines Kontaktes scannst",
+	    "buttonAddToContact": "Kontakt hinzufügen"
+	},
+	"newconversation": {
+	    "title": "Neuer chat",
+	    "addContact": "Kontakt hinzufügen",
+	    "createGroupchat": "Gruppenchat erstellen"
+	},
+	"crop": {
+	    "setProfilePicture": "Als Profilbild festlegen"
+	},
+	"shareselection": {
+	    "shareWith": "Teilen mit...",
+	    "confirmTitle": "Dateien senden?",
+	    "confirmBody": "Einer oder mehr Chats sind unverschlüsselt. Das bedeutet, dass die Dateien dem Server unverschlüsselt vorliegen. Dateien trotzdem senden?"
+	},
+	"profile": {
+	    "general": {
+		"omemo": "Sicherheit"
+	    },
+	    "conversation": {
+		"notifications": "Benachrichtigungen",
+		"notificationsMuted": "Stumm",
+		"notificationsEnabled": "Eingeschaltet",
+		"sharedMedia": "Medien"
+	    },
+	    "owndevices": {
+		"title": "Eigene Geräte",
+		"thisDevice": "Dieses Gerät",
+		"otherDevices": "Andere Geräte",
+		"deleteDeviceConfirmTitle": "Gerät löschen",
+		"deleteDeviceConfirmBody": "Das bedeutet, dass Kontakte für dieses Gerät nichtmehr verschlüsseln können. Fortfahren?",
+		"recreateOwnSessions": "Sessions neuerstellen",
+		"recreateOwnSessionsConfirmTitle": "Eigene Sessions neuerstellen?",
+		"recreateOwnSessionsConfirmBody": "Das wird alle kryptographischen Sessions mit den eigenen Geräten neuerstellen. Verwende dies nur, wenn deine eigenen Geräte Entschlüsselungsfehler erzeugen.",
+		"recreateOwnDevice": "Gerät neuerstellen",
+		"recreateOwnDeviceConfirmTitle": "Gerät neuerstellen?",
+		"recreateOwnDeviceConfirmBody": "Das wird die kryptographische Identität dieses Geräts neu erstellen. Wenn Kontakte die kryptographische Indentität verifiziert haben, dann müssen diese es erneut tun. Fortfahren?"
+	    },
+	    "devices": {
+		"title": "Geräte",
+		"recreateSessions": "Sessions zurücksetzen",
+		"recreateSessionsConfirmTitle": "Sessions zurücksetzen?",
+		"recreateSessionsConfirmBody": "Dies wird alle Sessions mit Deinen Geräten neu erstellen. Tue dies nur, wenn deine Geräte Fehler beim Entschlüsseln erzeugen."
+	    }
+	},
+	"blocklist": {
+	    "title": "Blockliste",
+	    "noUsersBlocked": "Du hast niemanden blockiert",
+	    "unblockAll": "Alle entblocken",
+	    "unblockAllConfirmTitle": "Alle entblocken",
+	    "unblockAllConfirmBody": "Bist Du dir sicher, dass du alle geblockten Personen entblocken möchtest?",
+	    "unblockJidConfirmTitle": "${jid} entblocken?",
+	    "unblockJidConfirmBody": "Bist du dir sicher, dass du ${jid} entblocken möchtest? Du wirst wieder Nachrichten von dieser Person erhalten können."
+	},
+	"cropbackground": {
+	    "blur": "Hintergrund weichzeichnen",
+	    "setAsBackground": "Als Hintergrundbild festlegen"
+	},
+	"stickerPack": {
+	    "removeConfirmTitle": "Stickerpack entfernen",
+	    "removeConfirmBody": "Bist Du Dir sicher, dass du das Stickerpack entfernen möchtest?",
+	    "installConfirmTitle": "Stickerpack installieren",
+	    "installConfirmBody": "Bist Du Dir sicher, dass Du das Stickerpack installieren möchtest?",
+	    "restricted": "Dieses Stickerpack ist eingeschränkt. Das bedeutet, dass es im Chat angezeigt wird, jedoch nicht versendet werden kann.",
+	    "fetchingFailure": "Konnte das Stickerpack nicht finden"
+	},
+	"settings": {
+	    "settings": {
+		"title": "Einstellungen",
+		"conversationsSection": "Unterhaltungen",
+		"accountSection": "Account",
+		"signOut": "Abmelden",
+		"signOutConfirmTitle": "Abmelden",
+		"signOutConfirmBody": "Du bist dabei dich abzumelden. Fortfahren?",
+		"miscellaneousSection": "Unterschiedlich",
+		"debuggingSection": "Debugging"
+	    },
+	    "about": {
+		"title": "Über",
+		"licensed": "Lizensiert unter GPL3",
+		"version": "Version ${version}",
+		"viewSourceCode": "Quellcode anschauen"
+	    },
+	    "appearance": {
+		"title": "Aussehen",
+		"languageSection": "Sprache",
+		"language": "Appsprache",
+		"languageSubtext": "Aktuell ausgewählt: $selectedLanguage",
+		"systemLanguage": "Systemsprache"
+	    },
+	    "licenses": {
+		"title": "Open-Source Lizenzen",
+		"licensedUnder": "Lizensiert unter $license"
+	    },
+	    "conversation": {
+		"title": "Chat",
+		"appearance": "Aussehen",
+		"selectBackgroundImage": "Hintergrundbild auswählen",
+		"selectBackgroundImageDescription": "Dieses Bild wird als Hintergrundbild in allen Chats verwendet",
+		"removeBackgroundImage": "Hintergrundbild entfernen",
+		"removeBackgroundImageConfirmTitle": "Hintergrundbild entfernen",
+		"removeBackgroundImageConfirmBody": "Bist Du dir sicher, dass Du das Hintergrundbild entfernen möchtest?",
+		"newChatsSection": "Neue Chats",
+		"newChatsMuteByDefault": "Neue Chats standardmäßig stummschalten",
+		"newChatsE2EE": "Ende-zu-Ende-Verschlüsselung standardmäßig aktivieren. WARNUNG: Experimentell",
+		"behaviourSection": "Verhalten",
+		"contactsIntegration": "Kontaktintegration",
+		"contactsIntegrationBody": "Wenn aktiviert, dann werden Kontakte aus dem Kontaktbuch verwendet, um Chatnamen und Profilbilder anzuzeigen. Dabei werden keine Daten an den Server gesendet."
+	    },
+	    "debugging": {
+		"title": "Debuggingoptionen",
+		"generalSection": "Generell",
+		"generalEnableDebugging": "Debugging einschalten",
+		"generalEncryptionPassword": "Verschlüsselungspasswort",
+		"generalEncryptionPasswordSubtext": "Die Logs enthalten eventuell sensible Daten. Wähle also daher eine starke Passphrase",
+		"generalLoggingIp": "Logging-IP",
+		"generalLoggingIpSubtext": "Die IP-Adresse an die die Logs gesendet werden",
+		"generalLoggingPort": "Logging-Port",
+		"generalLoggingPortSubtext": "Der Port an den die Logs gesendet werden"
+	    },
+	    "network": {
+		"title": "Netzwerk",
+		"automaticDownloadsSection": "Automatische Downloads",
+		"automaticDownloadsText": "Moxxy läd Dateien automatisch herunter, wenn verbunden mit...",
+		"automaticDownloadsMaximumSize": "Maximale Downloadgröße",
+		"automaticDownloadsMaximumSizeSubtext": "Die maximale Dateigröße, die automatisch heruntergeladen werden soll",
+		"automaticDownloadAlways": "Immer",
+		"wifi": "Wifi",
+		"mobileData": "Mobile Daten"
+	    },
+	    "privacy": {
+		"title": "Privatsphäre",
+		"generalSection": "Generell",
+		"showContactRequests": "Kontaktanfragen zeigen",
+		"showContactRequestsSubtext": "Dies zeigt Personen in der Chatübersicht an, die Dich zu ihrer Kontaktliste hinzugefügt haben, aber noch keine Nachricht gesendet haben",
+		"profilePictureVisibility": "Öffentliches Profilbild",
+		"profilePictureVisibilitSubtext": "Wenn aktiviert, dann kann jeder Dein Profilbild sehen. Wenn deaktiviert, dann können nur Personen aus deiner Kontaktliste kein Profilbild sehen",
+		"autoAcceptSubscriptionRequests": "Subscriptionanfragen automatisch annehmen",
+		"autoAcceptSubscriptionRequestsSubtext": "Wenn aktiviert, dann werden Subscriptionanfragen automatisch angenommen, wenn die Person in deiner Kontaktliste ist",
+		"conversationsSection": "Unterhaltungen",
+		"sendChatMarkers": "Chatmarker senden",
+		"sendChatMarkersSubtext": "Dies teilt Deinem Gesprächspartner mit, ob du Nachrichten empfangen oder gelesen hast",
+		"sendChatStates": "Chatstates senden",
+		"sendChatStatesSubtext": "Dies teilt Deinem Gesprächspartner mit, ob du gerade im Chat aktiv bist oder schreibst",
+		"redirectsSection": "Weiterleitungen",
+		"redirectText": "Dies leitet Links von $serviceName, die du öffnest, an einen Proxydienst weiter, wie zum Beispiel $exampleProxy",
+		"currentlySelected": "Aktuell ausgewählt: $proxy",
+		"redirectsTitle": "${serviceName}weiterleitung",
+		"cannotEnableRedirect": "Kann ${serviceName}weiterleitung nicht aktivieren",
+		"cannotEnableRedirectSubtext": "Du must zuerst einen Proxydienst auswählen. Dazu berühre das Feld neben dem Schalter.",
+		"urlEmpty": "URL kann nicht leer sein",
+		"urlInvalid": "Ungültige URL",
+		"redirectDialogTitle": "${serviceName}weiterleitung",
+		"stickersPrivacy": "Stickerliste öffentlich halten",
+		"stickersPrivacySubtext": "Wenn eingeschaltet, dann kann jeder die Liste Deiner installierten Stickerpacks sehen."
+	    },
+	    "stickers": {
+		"title": "Stickers",
+		"stickerSection": "Sticker",
+		"displayStickers": "Sticker im Chat anzeigen",
+		"autoDownload": "Sticker automatisch herunterladen",
+		"autoDownloadBody": "Wenn aktiviert, dann werden Sticker automatisch heruntergeladen, wenn der Sender in der Kontaktliste ist.",
+		"stickerPacksSection": "Stickerpacks",
+		"importStickerPack": "Stickerpack importieren",
+		"importSuccess": "Stickerpack erfolgreich importiert",
+		"importFailure": "Beim Import des Stickerpacks ist ein Fehler aufgetreten"
+	    }
+	}
+    }
+}

build.yaml

@@ -0,0 +1,7 @@
+targets:
+  $default:
+    builders:
+      slang_build_runner:
+        options:
+          input_directory: assets/i18n
+          output_directory: lib/i18n

docs/stickerpacks.md

@@ -0,0 +1,43 @@
+# Sticker Packs
+
+Moxxy supports sending and receiving sticker packs using XEP-0449 version 0.1.1. Sticker
+packs can also be imported using a Moxxy specific format.
+
+## File Format
+
+A Moxxy sticker pack is a flat tar archive that contains the following files:
+
+- `urn.xmpp.stickers.0.xml`
+- The sticker files
+
+### `urn.xmpp.stickers.0.xml`
+
+This file is the sticker pack's metadata file. It describes the sticker pack the same
+way as the examples in XEP-0449 do. There are, however, some differences:
+
+- Each `<file />` element must contain a `<name />` element that matches with a file in the tar archive
+- Each sticker MUST contain at least one HTTP(s) source
+- The `<hash />` of the `<pack />` element is ignored as Moxxy computes it itself, so it can be omitted
+
+An example for the metadata file is the following:
+
+```xml
+<pack xmlns='urn:xmpp:stickers:0'>
+    <name>Example</name>
+    <summary>Example sticker pack.</summary>
+    <item>
+        <file xmlns='urn:xmpp:file:metadata:0'>
+            <media-type>image/png</media-type>
+            <desc>:some-sticker:</desc>
+            <name>suprise.png</name>
+            <size>531910</size>
+            <dimensions>1030x1030</dimensions>
+            <hash xmlns='urn:xmpp:hashes:2' algo='sha-256'>1Ha4okUGNRAA04KibwWUmklqqBqdhg7+20dfsr/wLik=</hash>
+        </file>
+        <sources xmlns='urn:xmpp:sfs:0'>
+            <url-data xmlns='http://jabber.org/protocol/url-data' target='...' />
+        </sources>
+    </item>
+	<!-- ... -->
+</pack>
+```

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1649676176,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1660551188,
-        "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
+        "lastModified": 1669165918,
+        "narHash": "sha256-hIVruk2+0wmw/Kfzy11rG3q7ev3VTi/IKVODeHcVjFo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65",
+        "rev": "3b400a525d92e4085e46141ff48cbf89fd89739e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -44,9 +44,7 @@
 	      ripgrep # General utilities
       ];
 
-      ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
       JAVA_HOME = pinnedJDK;
-      ANDROID_AVD_HOME = (toString ./.) + "/.android/avd";
     };
   });
 }

integration_test/backoff_test.dart

@@ -0,0 +1,67 @@
+import 'package:get_it/get_it.dart';
+import 'package:logging/logging.dart';
+import 'package:moxxmpp/moxxmpp.dart';
+import 'package:moxxmpp_socket_tcp/moxxmpp_socket_tcp.dart';
+import 'package:moxxyv2/service/connectivity.dart';
+import 'package:moxxyv2/service/moxxmpp/reconnect.dart';
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:test/test.dart';
+
+class StubConnectivityService extends ConnectivityService {
+  StubConnectivityService() : super();
+
+  @override
+  ConnectivityResult get currentState => ConnectivityResult.wifi;
+}
+
+void main() {
+  Logger.root.level = Level.ALL;
+  Logger.root.onRecord.listen((record) {
+    print('${record.level.name}: ${record.time}: ${record.message}');
+  });
+  final log = Logger('FailureReconnectionTest');
+  GetIt.I.registerSingleton<ConnectivityService>(StubConnectivityService());
+
+  test('Failing an awaited connection with MoxxyReconnectionPolicy', () async {
+    var errors = 0;
+    final connection = XmppConnection(
+      MoxxyReconnectionPolicy(maxBackoffTime: 1),
+      TCPSocketWrapper(false),
+    );
+    connection.registerFeatureNegotiators([
+      StartTlsNegotiator(),
+    ]);
+    connection.registerManagers([
+      DiscoManager(),
+      RosterManager(),
+      PingManager(),
+      MessageManager(),
+      PresenceManager('http://moxxmpp.example'),
+    ]);
+    connection.asBroadcastStream().listen((event) {
+      if (event is ConnectionStateChangedEvent) {
+        if (event.state == XmppConnectionState.error) {
+          errors++;
+        }
+      }
+    });
+
+    connection.setConnectionSettings(
+      ConnectionSettings(
+        jid: JID.fromString('testuser@no-sasl.badxmpp.eu'),
+        password: 'abc123',
+        useDirectTLS: true,
+        allowPlainAuth: true,
+      ),
+    );
+
+    final result = await connection.connectAwaitable();
+    log.info('Connection failed as expected');
+    expect(result.success, false);
+    expect(errors, 1);
+
+    log.info('Waiting 20 seconds for unexpected reconnections');
+    await Future.delayed(const Duration(seconds: 20));
+    expect(errors, 1);
+  }, timeout: Timeout.factor(2));
+}

ios/.gitignore

@@ -1,34 +0,0 @@
-**/dgph
-*.mode1v3
-*.mode2v3
-*.moved-aside
-*.pbxuser
-*.perspectivev3
-**/*sync/
-.sconsign.dblite
-.tags*
-**/.vagrant/
-**/DerivedData/
-Icon?
-**/Pods/
-**/.symlinks/
-profile
-xcuserdata
-**/.generated/
-Flutter/App.framework
-Flutter/Flutter.framework
-Flutter/Flutter.podspec
-Flutter/Generated.xcconfig
-Flutter/ephemeral/
-Flutter/app.flx
-Flutter/app.zip
-Flutter/flutter_assets/
-Flutter/flutter_export_environment.sh
-ServiceDefinitions.json
-Runner/GeneratedPluginRegistrant.*
-
-# Exceptions to above rules.
-!default.mode1v3
-!default.mode2v3
-!default.pbxuser
-!default.perspectivev3

ios/Flutter/AppFrameworkInfo.plist

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>App</string>
-  <key>CFBundleIdentifier</key>
-  <string>io.flutter.flutter.app</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>App</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>9.0</string>
-</dict>
-</plist>

ios/Flutter/Debug.xcconfig

@@ -1 +0,0 @@
-#include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1 +0,0 @@
-#include "Generated.xcconfig"

ios/Runner.xcodeproj/project.pbxproj

@@ -1,481 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 50;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
-		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
-		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
-		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
-		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
-		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
-		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		97C146EB1CF9000F007C117D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		9740EEB11CF90186004384FC /* Flutter */ = {
-			isa = PBXGroup;
-			children = (
-				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				9740EEB21CF90195004384FC /* Debug.xcconfig */,
-				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
-				9740EEB31CF90195004384FC /* Generated.xcconfig */,
-			);
-			name = Flutter;
-			sourceTree = "<group>";
-		};
-		97C146E51CF9000F007C117D = {
-			isa = PBXGroup;
-			children = (
-				9740EEB11CF90186004384FC /* Flutter */,
-				97C146F01CF9000F007C117D /* Runner */,
-				97C146EF1CF9000F007C117D /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		97C146EF1CF9000F007C117D /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				97C146EE1CF9000F007C117D /* Runner.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		97C146F01CF9000F007C117D /* Runner */ = {
-			isa = PBXGroup;
-			children = (
-				97C146FA1CF9000F007C117D /* Main.storyboard */,
-				97C146FD1CF9000F007C117D /* Assets.xcassets */,
-				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
-				97C147021CF9000F007C117D /* Info.plist */,
-				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
-				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
-				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
-				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
-			);
-			path = Runner;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		97C146ED1CF9000F007C117D /* Runner */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
-			buildPhases = (
-				9740EEB61CF901F6004384FC /* Run Script */,
-				97C146EA1CF9000F007C117D /* Sources */,
-				97C146EB1CF9000F007C117D /* Frameworks */,
-				97C146EC1CF9000F007C117D /* Resources */,
-				9705A1C41CF9048500538489 /* Embed Frameworks */,
-				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Runner;
-			productName = Runner;
-			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		97C146E61CF9000F007C117D /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 1300;
-				ORGANIZATIONNAME = "";
-				TargetAttributes = {
-					97C146ED1CF9000F007C117D = {
-						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 1100;
-					};
-				};
-			};
-			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 9.3";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 97C146E51CF9000F007C117D;
-			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				97C146ED1CF9000F007C117D /* Runner */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		97C146EC1CF9000F007C117D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
-				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Thin Binary";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
-		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		97C146EA1CF9000F007C117D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
-				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C146FB1CF9000F007C117D /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-		97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C147001CF9000F007C117D /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		249021D3217E4FDB00AE95B9 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Profile;
-		};
-		249021D4217E4FDB00AE95B9 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = assets/images/icon_ios.png;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.moxxyv2;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Profile;
-		};
-		97C147031CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		97C147041CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		97C147061CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = assets/images/icon_ios.png;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.moxxyv2;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Debug;
-		};
-		97C147071CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = assets/images/icon_ios.png;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.moxxyv2;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147031CF9000F007C117D /* Debug */,
-				97C147041CF9000F007C117D /* Release */,
-				249021D3217E4FDB00AE95B9 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147061CF9000F007C117D /* Debug */,
-				97C147071CF9000F007C117D /* Release */,
-				249021D4217E4FDB00AE95B9 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}

ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1300"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-               BuildableName = "Runner.app"
-               BlueprintName = "Runner"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Profile"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:Runner.xcodeproj">
-   </FileRef>
-</Workspace>

ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>

ios/Runner/AppDelegate.swift

@@ -1,13 +0,0 @@
-import UIKit
-import Flutter
-
-@UIApplicationMain
-@objc class AppDelegate: FlutterAppDelegate {
-  override func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-  ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-  }
-}

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +0,0 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md

@@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.

ios/Runner/Assets.xcassets/assets/images/icon_ios.png.appiconset/Contents.json

@@ -1 +0,0 @@
-{"images":[{"size":"20x20","idiom":"iphone","filename":"assets/images/icon_ios.png-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"assets/images/icon_ios.png-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"assets/images/icon_ios.png-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"assets/images/icon_ios.png-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"assets/images/icon_ios.png-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"assets/images/icon_ios.png-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"assets/images/icon_ios.png-40x40@3x.png","scale":"3x"},{"size":"60x60","idiom":"iphone","filename":"assets/images/icon_ios.png-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"assets/images/icon_ios.png-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"assets/images/icon_ios.png-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"assets/images/icon_ios.png-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"assets/images/icon_ios.png-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"assets/images/icon_ios.png-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"assets/images/icon_ios.png-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"assets/images/icon_ios.png-40x40@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"assets/images/icon_ios.png-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"assets/images/icon_ios.png-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"assets/images/icon_ios.png-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"assets/images/icon_ios.png-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}

ios/Runner/Assets.xcassets/assets/images/logo_ios.png.appiconset/Contents.json

@@ -1 +0,0 @@
-{"images":[{"size":"20x20","idiom":"iphone","filename":"assets/images/logo_ios.png-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"assets/images/logo_ios.png-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"assets/images/logo_ios.png-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"assets/images/logo_ios.png-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"assets/images/logo_ios.png-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"assets/images/logo_ios.png-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"assets/images/logo_ios.png-40x40@3x.png","scale":"3x"},{"size":"60x60","idiom":"iphone","filename":"assets/images/logo_ios.png-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"assets/images/logo_ios.png-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"assets/images/logo_ios.png-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"assets/images/logo_ios.png-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"assets/images/logo_ios.png-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"assets/images/logo_ios.png-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"assets/images/logo_ios.png-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"assets/images/logo_ios.png-40x40@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"assets/images/logo_ios.png-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"assets/images/logo_ios.png-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"assets/images/logo_ios.png-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"assets/images/logo_ios.png-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
-                        <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
-                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
-                        </constraints>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-    <resources>
-        <image name="LaunchImage" width="168" height="185"/>
-    </resources>
-</document>

ios/Runner/Base.lproj/Main.storyboard

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
-    </dependencies>
-    <scenes>
-        <!--Flutter View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="FlutterViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
-                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-</document>

ios/Runner/Info.plist

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Moxxy</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>moxxyv2</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
-	<key>LSApplicationQueriesScheme</key>
-	<array>
-	  <string>https</string>
-	</array>
-</dict>
-</plist>

ios/Runner/Runner-Bridging-Header.h

@@ -1 +0,0 @@
-#import "GeneratedPluginRegistrant.h"

lib/data_classes.yaml

@@ -7,13 +7,15 @@ files:
           - JsonImplementation
         attributes:
           jid: String
-          displayName: String
+          preStart:
+            type: PreStartDoneEvent
+            deserialise: true
       - name: LoginFailureEvent
         extends: BackgroundEvent
         implements:
           - JsonImplementation
         attributes:
-          reason: String
+          reason: String?
       - name: PreStartDoneEvent
         extends: BackgroundEvent
         implements:
@@ -34,6 +36,9 @@ files:
           roster:
             type: List<RosterItem>?
             deserialise: true
+          stickers:
+            type: List<StickerPack>?
+            deserialise: true
       # Returned by [GetMessagesForJidCommand]
       - name: MessagesResultEvent
         extends: BackgroundEvent
@@ -69,8 +74,7 @@ files:
         extends: BackgroundEvent
         implements:
           - JsonImplementation
-      # Send by the service if a message has been received or returned by
-      # [SendMessageCommand].
+      # Send by the service if a message has been received or returned by # [SendMessageCommand].
       - name: MessageAddedEvent
         extends: BackgroundEvent
         implements:
@@ -102,6 +106,13 @@ files:
         extends: BackgroundEvent
         implements:
           - JsonImplementation
+      # Triggered in response to a [GetBlocklistCommand]
+      - name: GetBlocklistResultEvent
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+          entries: List<String>
       # Triggered by DownloadService or UploadService.
       - name: ProgressEvent
         extends: BackgroundEvent
@@ -109,7 +120,7 @@ files:
           - JsonImplementation
         attributes:
           id: int
-          progress: double
+          progress: double?
       # Triggered by [RosterService] if we receive a roster push.
       - name: RosterDiffEvent
         extends: BackgroundEvent
@@ -162,6 +173,7 @@ files:
           supportsCsi: bool
           supportsUserBlocking: bool
           supportsHttpFileUpload: bool
+          supportsCarbons: bool
       # Returned by [SignOutCommand]
       - name: SignedOutEvent
         extends: BackgroundEvent
@@ -172,6 +184,87 @@ files:
         extends: BackgroundEvent
         implements:
           - JsonImplementation
+      - name: GetConversationOmemoFingerprintsResult
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+          fingerprints:
+            type: List<OmemoDevice>
+            deserialise: true
+      - name: GetOwnOmemoFingerprintsResult
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+          ownDeviceFingerprint: String
+          ownDeviceId: int
+          fingerprints:
+            type: List<OmemoDevice>
+            deserialise: true
+      - name: RegenerateOwnDeviceResult
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+          device:
+            type: OmemoDevice
+            deserialise: true
+      - name: MessageNotificationTappedEvent
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+          conversationJid: String
+          title: String
+          avatarUrl: String
+      - name: StickerPackImportSuccessEvent
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+          stickerPack:
+            type: StickerPack
+            deserialise: true
+      - name: StickerPackImportFailureEvent
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+      - name: FetchStickerPackSuccessResult
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+          stickerPack:
+            type: StickerPack
+            deserialise: true
+      - name: FetchStickerPackFailureResult
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+      - name: StickerPackInstallSuccessEvent
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+          stickerPack:
+            type: StickerPack
+            deserialise: true
+      - name: StickerPackInstallFailureEvent
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+      - name: StickerPackAddedEvent
+        extends: BackgroundEvent
+        implements:
+          - JsonImplementation
+        attributes:
+          stickerPack:
+            type: StickerPack
+            deserialise: true
     generate_builder: true
     builder_name: "Event"
     builder_baseclass: "BackgroundEvent"
@@ -190,6 +283,8 @@ files:
         extends: BackgroundCommand
         implements:
           - JsonImplementation
+        attributes:
+          systemLocaleCode: String
       - name: AddConversationCommand
         extends: BackgroundCommand
         implements:
@@ -222,6 +317,8 @@ files:
           quotedMessage:
             type: Message?
             deserialise: true
+          editSid: String?
+          editId: int?
       - name: SendFilesCommand
         extends: BackgroundCommand
         implements:
@@ -308,6 +405,140 @@ files:
         extends: BackgroundCommand
         implements:
           - JsonImplementation
+      - name: SetConversationMuteStatusCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          jid: String
+          muted: bool
+      - name: GetConversationOmemoFingerprintsCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          jid: String
+      - name: SetOmemoDeviceEnabledCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          jid: String
+          deviceId: int
+          enabled: bool
+      - name: RecreateSessionsCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          jid: String
+      - name: SetOmemoEnabledCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          jid: String
+          enabled: bool
+      - name: GetOwnOmemoFingerprintsCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+      - name: RemoveOwnDeviceCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          deviceId: int
+      - name: RegenerateOwnDeviceCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+      - name: RetractMessageCommentCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          originId: String
+          conversationJid: String
+      - name: MarkConversationAsReadCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          conversationId: int
+      - name: MarkMessageAsReadCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          conversationJid: String
+          sid: String
+          newUnreadCounter: int
+      - name: AddReactionToMessageCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          messageId: int
+          conversationJid: String
+          emoji: String
+      - name: RemoveReactionFromMessageCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          messageId: int
+          conversationJid: String
+          emoji: String
+      - name: MarkOmemoDeviceAsVerifiedCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          deviceId: int
+          jid: String
+      - name: ImportStickerPackCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          path: String
+      - name: RemoveStickerPackCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          stickerPackId: String
+      - name: SendStickerCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          stickerPackId: String
+          stickerHashKey: String
+          recipient: String
+      - name: FetchStickerPackCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          stickerPackId: String
+          jid: String
+      - name: InstallStickerPackCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
+          stickerPack:
+            type: StickerPack
+            deserialise: true
+      - name: GetBlocklistCommand
+        extends: BackgroundCommand
+        implements:
+          - JsonImplementation
+        attributes:
     generate_builder: true
     # get${builder_Name}FromJson
     builder_name: "Command"

lib/main.dart

@@ -1,26 +1,34 @@
 import 'dart:async';
-
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:get_it/get_it.dart';
 import 'package:logging/logging.dart';
 import 'package:moxplatform/moxplatform.dart';
+import 'package:moxxyv2/i18n/strings.g.dart';
 import 'package:moxxyv2/service/service.dart';
 import 'package:moxxyv2/shared/commands.dart';
+import 'package:moxxyv2/shared/synchronized_queue.dart';
 import 'package:moxxyv2/ui/bloc/addcontact_bloc.dart';
 import 'package:moxxyv2/ui/bloc/blocklist_bloc.dart';
 import 'package:moxxyv2/ui/bloc/conversation_bloc.dart';
 import 'package:moxxyv2/ui/bloc/conversations_bloc.dart';
 import 'package:moxxyv2/ui/bloc/crop_bloc.dart';
 import 'package:moxxyv2/ui/bloc/cropbackground_bloc.dart';
+import 'package:moxxyv2/ui/bloc/devices_bloc.dart';
 import 'package:moxxyv2/ui/bloc/login_bloc.dart';
 import 'package:moxxyv2/ui/bloc/navigation_bloc.dart';
 import 'package:moxxyv2/ui/bloc/newconversation_bloc.dart';
+import 'package:moxxyv2/ui/bloc/own_devices_bloc.dart';
 import 'package:moxxyv2/ui/bloc/preferences_bloc.dart';
 import 'package:moxxyv2/ui/bloc/profile_bloc.dart';
 import 'package:moxxyv2/ui/bloc/sendfiles_bloc.dart';
+import 'package:moxxyv2/ui/bloc/server_info_bloc.dart';
 import 'package:moxxyv2/ui/bloc/share_selection_bloc.dart';
 import 'package:moxxyv2/ui/bloc/sharedmedia_bloc.dart';
+import 'package:moxxyv2/ui/bloc/sticker_pack_bloc.dart';
+import 'package:moxxyv2/ui/bloc/stickers_bloc.dart';
 import 'package:moxxyv2/ui/constants.dart';
 import 'package:moxxyv2/ui/events.dart';
 /*
@@ -35,27 +43,34 @@ import 'package:moxxyv2/ui/pages/crop.dart';
 import 'package:moxxyv2/ui/pages/intro.dart';
 import 'package:moxxyv2/ui/pages/login.dart';
 import 'package:moxxyv2/ui/pages/newconversation.dart';
+import 'package:moxxyv2/ui/pages/profile/devices.dart';
+import 'package:moxxyv2/ui/pages/profile/own_devices.dart';
 import 'package:moxxyv2/ui/pages/profile/profile.dart';
 import 'package:moxxyv2/ui/pages/sendfiles.dart';
+import 'package:moxxyv2/ui/pages/server_info.dart';
 import 'package:moxxyv2/ui/pages/settings/about.dart';
 import 'package:moxxyv2/ui/pages/settings/appearance/appearance.dart';
 import 'package:moxxyv2/ui/pages/settings/appearance/cropbackground.dart';
+import 'package:moxxyv2/ui/pages/settings/conversation.dart';
 import 'package:moxxyv2/ui/pages/settings/debugging.dart';
 import 'package:moxxyv2/ui/pages/settings/licenses.dart';
 import 'package:moxxyv2/ui/pages/settings/network.dart';
 import 'package:moxxyv2/ui/pages/settings/privacy/privacy.dart';
 import 'package:moxxyv2/ui/pages/settings/settings.dart';
+import 'package:moxxyv2/ui/pages/settings/stickers.dart';
 import 'package:moxxyv2/ui/pages/share_selection.dart';
 import 'package:moxxyv2/ui/pages/sharedmedia.dart';
 import 'package:moxxyv2/ui/pages/splashscreen/splashscreen.dart';
+import 'package:moxxyv2/ui/pages/sticker_pack.dart';
+import 'package:moxxyv2/ui/pages/util/qrcode.dart';
 import 'package:moxxyv2/ui/service/data.dart';
 import 'package:moxxyv2/ui/service/progress.dart';
-import 'package:moxxyv2/ui/service/thumbnail.dart';
+import 'package:moxxyv2/ui/theme.dart';
 import 'package:page_transition/page_transition.dart';
 import 'package:share_handler/share_handler.dart';
 
 void setupLogging() {
-  Logger.root.level = Level.ALL;
+  Logger.root.level = kDebugMode ? Level.ALL : Level.INFO;
   Logger.root.onRecord.listen((record) {
     // ignore: avoid_print
     print('[${record.level.name}] (${record.loggerName}) ${record.time}: ${record.message}');
@@ -66,7 +81,6 @@ void setupLogging() {
 Future<void> setupUIServices() async {
   GetIt.I.registerSingleton<UIProgressService>(UIProgressService());
   GetIt.I.registerSingleton<UIDataService>(UIDataService());
-  GetIt.I.registerSingleton<ThumbnailCacheService>(ThumbnailCacheService());
 }
 
 void setupBlocs(GlobalKey<NavigatorState> navKey) {
@@ -74,8 +88,7 @@ void setupBlocs(GlobalKey<NavigatorState> navKey) {
   GetIt.I.registerSingleton<ConversationsBloc>(ConversationsBloc());
   GetIt.I.registerSingleton<NewConversationBloc>(NewConversationBloc());
   GetIt.I.registerSingleton<ConversationBloc>(ConversationBloc());
-  GetIt.I.registerSingleton<BlocklistBloc>(BlocklistBloc());
-  GetIt.I.registerSingleton<ProfileBloc>(ProfileBloc());
+  GetIt.I.registerSingleton<BlocklistBloc>(BlocklistBloc()); GetIt.I.registerSingleton<ProfileBloc>(ProfileBloc());
   GetIt.I.registerSingleton<PreferencesBloc>(PreferencesBloc());
   GetIt.I.registerSingleton<AddContactBloc>(AddContactBloc());
   GetIt.I.registerSingleton<SharedMediaBloc>(SharedMediaBloc());
@@ -83,14 +96,17 @@ void setupBlocs(GlobalKey<NavigatorState> navKey) {
   GetIt.I.registerSingleton<SendFilesBloc>(SendFilesBloc());
   GetIt.I.registerSingleton<CropBackgroundBloc>(CropBackgroundBloc());
   GetIt.I.registerSingleton<ShareSelectionBloc>(ShareSelectionBloc());
+  GetIt.I.registerSingleton<ServerInfoBloc>(ServerInfoBloc());
+  GetIt.I.registerSingleton<DevicesBloc>(DevicesBloc());
+  GetIt.I.registerSingleton<OwnDevicesBloc>(OwnDevicesBloc());
+  GetIt.I.registerSingleton<StickersBloc>(StickersBloc());
+  GetIt.I.registerSingleton<StickerPackBloc>(StickerPackBloc());
 }
 
 // TODO(Unknown): Replace all Column(children: [ Padding(), Padding, ...]) with a
 //                Padding(padding: ..., child: Column(children: [ ... ]))
 // TODO(Unknown): Theme the switches
 void main() async {
-  GetIt.I.registerSingleton<Completer<void>>(Completer());
-
   setupLogging();
   await setupUIServices();
 
@@ -100,7 +116,7 @@ void main() async {
   setupBlocs(navKey);
 
   await initializeServiceIfNeeded();
-    
+ 
   runApp(
     MultiBlocProvider(
       providers: [
@@ -146,15 +162,32 @@ void main() async {
         BlocProvider<ShareSelectionBloc>(
           create: (_) => GetIt.I.get<ShareSelectionBloc>(),
         ),
+        BlocProvider<ServerInfoBloc>(
+          create: (_) => GetIt.I.get<ServerInfoBloc>(),
+        ),
+        BlocProvider<DevicesBloc>(
+          create: (_) => GetIt.I.get<DevicesBloc>(),
+        ),
+        BlocProvider<OwnDevicesBloc>(
+          create: (_) => GetIt.I.get<OwnDevicesBloc>(),
+        ),
+        BlocProvider<StickersBloc>(
+          create: (_) => GetIt.I.get<StickersBloc>(),
+        ),
+        BlocProvider<StickerPackBloc>(
+          create: (_) => GetIt.I.get<StickerPackBloc>(),
+        ),
       ],
-      child: MyApp(navKey),
+      child: TranslationProvider(
+        child: MyApp(navKey),
+      ),
     ),
   );
 }
 
 class MyApp extends StatefulWidget {
 
-  const MyApp(this.navigationKey, { Key? key }) : super(key: key);
+  const MyApp(this.navigationKey, { super.key });
   final GlobalKey<NavigatorState> navigationKey;
 
   @override
@@ -169,10 +202,10 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
     super.initState();
     WidgetsBinding.instance.addObserver(this);
 
-    // Lift the UI block
-    GetIt.I.get<Completer<void>>().complete();
-
     _setupSharingHandler();
+    
+    // Lift the UI block
+    GetIt.I.get<SynchronizedQueue<Map<String, dynamic>?>>().removeQueueLock();
   }
 
   Future<void> _handleSharedMedia(SharedMedia media) async {
@@ -242,44 +275,12 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
+      locale: TranslationProvider.of(context).flutterLocale,
+      supportedLocales: LocaleSettings.supportedLocales,
+      localizationsDelegates: GlobalMaterialLocalizations.delegates,
       title: 'Moxxy',
-      theme: ThemeData(
-        elevatedButtonTheme: ElevatedButtonThemeData(
-          style: ElevatedButton.styleFrom(
-            primary: primaryColor,
-            onPrimary: Colors.white,
-          ),
-        ),
-        textButtonTheme: TextButtonThemeData(
-          style: TextButton.styleFrom(
-            primary: primaryColor,
-          ),
-        ),
-        // NOTE: Mainly for the SettingsSection
-        colorScheme: const ColorScheme.light(
-          secondary: primaryColor,
-        ),
-      ),
-      darkTheme: ThemeData(
-        brightness: Brightness.dark,
-        elevatedButtonTheme: ElevatedButtonThemeData(
-          style: ElevatedButton.styleFrom(
-            primary: primaryColor,
-            onPrimary: Colors.white,
-          ),
-        ),
-        textButtonTheme: TextButtonThemeData(
-          style: TextButton.styleFrom(
-            primary: primaryColor,
-          ),
-        ),
-        // NOTE: Mainly for the SettingsSection
-        colorScheme: const ColorScheme.dark(
-          secondary: primaryColor,
-        ),
-
-        backgroundColor: const Color(0xff303030),
-      ),
+      theme: getThemeData(context, Brightness.light),
+      darkTheme: getThemeData(context, Brightness.dark),
       navigatorKey: widget.navigationKey,
       onGenerateRoute: (settings) {
         switch (settings.name) {
@@ -298,7 +299,6 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
           case settingsRoute: return SettingsPage.route;
           case aboutRoute: return SettingsAboutPage.route;
           case licensesRoute: return SettingsLicensesPage.route;
-          case appearanceRoute: return AppearancePage.route;
           case networkRoute: return NetworkPage.route;
           case privacyRoute: return PrivacyPage.route;
           case debuggingRoute: return DebuggingPage.route;
@@ -307,6 +307,16 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
           case sendFilesRoute: return SendFilesPage.route;
           case backgroundCroppingRoute: return CropBackgroundPage.route;
           case shareSelectionRoute: return ShareSelectionPage.route;
+          case serverInfoRoute: return ServerInfoPage.route;
+          case conversationSettingsRoute: return ConversationSettingsPage.route;
+          case devicesRoute: return DevicesPage.route;
+          case ownDevicesRoute: return OwnDevicesPage.route;
+          case appearanceRoute: return AppearanceSettingsPage.route;
+          case qrCodeScannerRoute: return QrCodeScanningPage.getRoute(
+            settings.arguments! as QrCodeScanningArguments,
+          );
+          case stickersRoute: return StickersSettingsPage.route;
+          case stickerPackRoute: return StickerPackPage.route;
         }
 
         return null;

lib/service/avatars.dart

@@ -3,8 +3,8 @@ import 'dart:io';
 import 'package:cryptography/cryptography.dart';
 import 'package:get_it/get_it.dart';
 import 'package:hex/hex.dart';
-import 'package:image_size_getter/image_size_getter.dart';
 import 'package:logging/logging.dart';
+import 'package:moxxmpp/moxxmpp.dart';
 import 'package:moxxyv2/service/conversation.dart';
 import 'package:moxxyv2/service/preferences.dart';
 import 'package:moxxyv2/service/roster.dart';
@@ -13,13 +13,6 @@ import 'package:moxxyv2/service/xmpp.dart';
 import 'package:moxxyv2/shared/avatar.dart';
 import 'package:moxxyv2/shared/events.dart';
 import 'package:moxxyv2/shared/helpers.dart';
-import 'package:moxxyv2/xmpp/connection.dart';
-import 'package:moxxyv2/xmpp/managers/namespaces.dart';
-import 'package:moxxyv2/xmpp/namespaces.dart';
-import 'package:moxxyv2/xmpp/xeps/xep_0030/helpers.dart';
-import 'package:moxxyv2/xmpp/xeps/xep_0030/xep_0030.dart';
-import 'package:moxxyv2/xmpp/xeps/xep_0054.dart';
-import 'package:moxxyv2/xmpp/xeps/xep_0084.dart';
 
 /// Removes line breaks and spaces from [original]. This might happen when we request the
 /// avatar data. Returns the cleaned version.
@@ -32,56 +25,48 @@ String _cleanBase64String(String original) {
   return ret;
 }
 
+class _AvatarData {
+  const _AvatarData(this.data, this.id);
+  final List<int> data;
+  final String id;
+}
+
 class AvatarService {
-  
-  AvatarService() : _log = Logger('AvatarService');
-  final Logger _log;
+  final Logger _log = Logger('AvatarService');
 
-  UserAvatarManager _getUserAvatarManager() => GetIt.I.get<XmppConnection>().getManagerById<UserAvatarManager>(userAvatarManager)!;
-
-  DiscoManager _getDiscoManager() => GetIt.I.get<XmppConnection>().getManagerById<DiscoManager>(discoManager)!;
+  Future<void> handleAvatarUpdate(AvatarUpdatedEvent event) async {
+    await updateAvatarForJid(
+      event.jid,
+      event.hash,
+      base64Decode(_cleanBase64String(event.base64)),
+    );
+  }
   
-  Future<void> updateAvatarForJid(String jid, String hash, String base64) async {
+  Future<void> updateAvatarForJid(String jid, String hash, List<int> data) async {
     final cs = GetIt.I.get<ConversationService>();
     final rs = GetIt.I.get<RosterService>();
     final originalConversation = await cs.getConversationByJid(jid);
-    var saved = false;
+    final originalRoster = await rs.getRosterItemByJid(jid);
 
-    // Clean the raw data. Since this may arrive by chunks, those chunks may contain
-    // weird data pieces.
-    final base64Data = base64Decode(_cleanBase64String(base64));
+    if (originalConversation == null && originalRoster == null) return;
+    
+    final avatarPath = await saveAvatarInCache(
+      data,
+      hash,
+      jid,
+      (originalConversation?.avatarUrl ?? originalRoster?.avatarUrl)!,
+    );
+    
     if (originalConversation != null) {
-      final avatarPath = await saveAvatarInCache(
-        base64Data,
-        hash,
-        jid,
-        originalConversation.avatarUrl,
-      );
-      saved = true;
       final conv = await cs.updateConversation(
         originalConversation.id,
         avatarUrl: avatarPath,
       );
 
       sendEvent(ConversationUpdatedEvent(conversation: conv));
-    } else {
-      _log.warning('Failed to get conversation');
     }
-
-    final originalRoster = await rs.getRosterItemByJid(jid);
+ 
     if (originalRoster != null) {
-      var avatarPath = '';
-      if (saved) {
-        avatarPath = await getAvatarPath(jid, hash);
-      } else {
-        avatarPath = await saveAvatarInCache(
-          base64Data,
-          hash,
-          jid,
-          originalRoster.avatarUrl,
-        ); 
-      }
-
       final roster = await rs.updateRosterItem(
         originalRoster.id,
         avatarUrl: avatarPath,
@@ -91,63 +76,73 @@ class AvatarService {
       sendEvent(RosterDiffEvent(modified: [roster]));
     }
   }
+
+  Future<_AvatarData?> _handleUserAvatar(String jid, String oldHash) async {
+    final am = GetIt.I.get<XmppConnection>()
+      .getManagerById<UserAvatarManager>(userAvatarManager)!;
+    final idResult = await am.getAvatarId(jid);
+    if (idResult.isType<AvatarError>()) {
+      _log.warning('Failed to get avatar id via XEP-0084 for $jid');
+      return null;
+    }
+    final id = idResult.get<String>();
+    if (id == oldHash) return null;
+
+    final avatarResult = await am.getUserAvatar(jid);
+    if (avatarResult.isType<AvatarError>()) {
+      _log.warning('Failed to get avatar data via XEP-0084 for $jid');
+      return null;
+    }
+    final avatar = avatarResult.get<UserAvatar>();
+
+    return _AvatarData(
+      base64Decode(_cleanBase64String(avatar.base64)),
+      avatar.hash,
+    );
+  }
+
+  Future<_AvatarData?> _handleVcardAvatar(String jid, String oldHash) async {
+    // Query the vCard
+    final vm = GetIt.I.get<XmppConnection>()
+      .getManagerById<VCardManager>(vcardManager)!;
+    final vcardResult = await vm.requestVCard(jid);
+    if (vcardResult.isType<VCardError>()) return null;
+
+    final binval = vcardResult.get<VCard>().photo?.binval;
+    if (binval == null) return null;
+
+    final data = base64Decode(_cleanBase64String(binval));
+    final rawHash = await Sha1().hash(data);
+    final hash = HEX.encode(rawHash.bytes);
+
+    vm.setLastHash(jid, hash);
+
+    return _AvatarData(
+      data,
+      hash,
+    );
+  }
   
   Future<void> fetchAndUpdateAvatarForJid(String jid, String oldHash) async {
-    final items = (await _getDiscoManager().discoItemsQuery(jid)) ?? [];
-    final itemNodes = items.map((i) => i.node);
+    _AvatarData? data;
+    data ??= await _handleUserAvatar(jid, oldHash);
+    data ??= await _handleVcardAvatar(jid, oldHash);
 
-    _log.finest('Disco items for $jid:');
-    for (final item in itemNodes) {
-      _log.finest('- $item');
+    if (data != null) {
+      await updateAvatarForJid(jid, data.id, data.data);
     }
-    
-    var base64 = '';
-    var hash = '';
-    if (listContains<DiscoItem>(items, (item) => item.node == userAvatarDataXmlns)) {
-      final avatar = _getUserAvatarManager();
-      final pubsubHash = await avatar.getAvatarId(jid);
-
-      // Don't request if we already have the newest avatar
-      if (pubsubHash == oldHash) return;
-      
-      // Query via PubSub
-      final data = await avatar.getUserAvatar(jid);
-      if (data == null) return;
-      
-      base64 = data.base64;
-      hash = data.hash;
-    } else {
-      // Query the vCard
-      final vm = GetIt.I.get<XmppConnection>().getManagerById<VCardManager>(vcardManager)!;
-      final vcard = await vm.requestVCard(jid);
-      if (vcard != null) {
-        final binval = vcard.photo?.binval;
-        if (binval != null) {
-          // Clean the raw data. Since this may arrive by chunks, those chunks may contain
-          // weird data pieces.
-          base64 = _cleanBase64String(binval);
-
-          final rawHash = await Sha1().hash(base64Decode(base64));
-          hash = HEX.encode(rawHash.bytes);
-
-          vm.setLastHash(jid, hash);
-        } else {
-          return;
-        }
-      } else {
-        return;
-      }
-    }
-
-    await updateAvatarForJid(jid, hash, base64);
   }
   
   Future<bool> subscribeJid(String jid) async {
-    return _getUserAvatarManager().subscribe(jid);
+    return (await GetIt.I.get<XmppConnection>()
+      .getManagerById<UserAvatarManager>(userAvatarManager)!
+      .subscribe(jid)).isType<bool>();
   }
 
   Future<bool> unsubscribeJid(String jid) async {
-    return _getUserAvatarManager().unsubscribe(jid);
+    return (await GetIt.I.get<XmppConnection>()
+      .getManagerById<UserAvatarManager>(userAvatarManager)!
+      .unsubscribe(jid)).isType<bool>();
   }
 
   /// Publishes the data at [path] as an avatar with PubSub ID
@@ -161,21 +156,22 @@ class AvatarService {
     final public = prefs.isAvatarPublic;
 
     // Read the image metadata
-    final imageSize = ImageSizeGetter.getSize(MemoryInput(bytes));
+    final imageSize = (await getImageSizeFromData(bytes))!;
     
     // Publish data and metadata
-    final manager = _getUserAvatarManager();
-    await manager.publishUserAvatar(
+    final am = GetIt.I.get<XmppConnection>()
+      .getManagerById<UserAvatarManager>(userAvatarManager)!;
+    await am.publishUserAvatar(
       base64,
       hash,
       public,
     );
-    await manager.publishUserAvatarMetadata(
+    await am.publishUserAvatarMetadata(
       UserAvatarMetadata(
         hash,
         bytes.length,
-        imageSize.width,
-        imageSize.height,
+        imageSize.width.toInt(),
+        imageSize.height.toInt(),
         // TODO(PapaTutuWawa): Maybe do a check here
         'image/png',
       ),
@@ -186,34 +182,41 @@ class AvatarService {
   }
 
   Future<void> requestOwnAvatar() async {
-    final avatar = _getUserAvatarManager();
+    final am = GetIt.I.get<XmppConnection>()
+      .getManagerById<UserAvatarManager>(userAvatarManager)!;
     final xmpp = GetIt.I.get<XmppService>();
     final state = await xmpp.getXmppState();
     final jid = state.jid!;
-    final id = await avatar.getAvatarId(jid);
-
+    final idResult = await am.getAvatarId(jid);
+    if (idResult.isType<AvatarError>()) {
+      _log.info('Error while getting latest avatar id for own avatar');
+      return;
+    }
+    final id = idResult.get<String>();
+    
     if (id == state.avatarHash) return;
 
     _log.info('Mismatch between saved avatar data and server-side avatar data about ourself');
-    final data = await avatar.getUserAvatar(jid);
-    if (data == null) {
+    final avatarDataResult = await am.getUserAvatar(jid);
+    if (avatarDataResult.isType<AvatarError>()) {
       _log.severe('Failed to fetch our avatar');
       return;
     }
+    final avatarData = avatarDataResult.get<UserAvatar>();
 
     _log.info('Received data for our own avatar');
     
     final avatarPath = await saveAvatarInCache(
-      base64Decode(_cleanBase64String(data.base64)),
-      data.hash,
+      base64Decode(_cleanBase64String(avatarData.base64)),
+      avatarData.hash,
       jid,
       state.avatarUrl,
     );
     await xmpp.modifyXmppState((state) => state.copyWith(
       avatarUrl: avatarPath,
-      avatarHash: data.hash,
+      avatarHash: avatarData.hash,
     ),);
 
-    sendEvent(SelfAvatarChangedEvent(path: avatarPath, hash: data.hash));
+    sendEvent(SelfAvatarChangedEvent(path: avatarPath, hash: avatarData.hash));
   }
 }

lib/service/blocking.dart

@@ -1,9 +1,10 @@
+import 'dart:async';
 import 'package:get_it/get_it.dart';
+import 'package:logging/logging.dart';
+import 'package:moxxmpp/moxxmpp.dart';
+import 'package:moxxyv2/service/database/database.dart';
 import 'package:moxxyv2/service/service.dart';
 import 'package:moxxyv2/shared/events.dart';
-import 'package:moxxyv2/xmpp/connection.dart';
-import 'package:moxxyv2/xmpp/managers/namespaces.dart';
-import 'package:moxxyv2/xmpp/xeps/xep_0191.dart';
 
 enum BlockPushType {
   block,
@@ -11,35 +12,93 @@ enum BlockPushType {
 }
 
 class BlocklistService {
-  
-  BlocklistService() :
-    _blocklistCache = List.empty(growable: true),
-    _requestedBlocklist = false;
-  final List<String> _blocklistCache;
-  bool _requestedBlocklist;
+  BlocklistService();
+  List<String>? _blocklist;
+  bool _requested = false;
+  bool? _supported;
+  final Logger _log = Logger('BlocklistService');
 
-  Future<List<String>> _requestBlocklist() async {
-    final manager = GetIt.I.get<XmppConnection>().getManagerById<BlockingManager>(blockingManager)!;
-    _blocklistCache
-      ..clear()
-      ..addAll(await manager.getBlocklist());
-    _requestedBlocklist = true;
-    return _blocklistCache;
+  void onNewConnection() {
+    // Invalidate the caches
+    _blocklist = null;
+    _requested = false;
+    _supported = null;
+  }
+
+  Future<bool> _checkSupport() async {
+    return _supported ??= await GetIt.I.get<XmppConnection>()
+      .getManagerById<BlockingManager>(blockingManager)!
+      .isSupported();
+  }
+  
+  Future<void> _requestBlocklist() async {
+    assert(_blocklist != null, 'The blocklist must be loaded from the database before requesting');
+
+    // Check if blocking is supported
+    if (!(await _checkSupport())) {
+      _log.warning('Blocklist requested but server does not support it.');
+      return;
+    }
+    
+    final blocklist = await GetIt.I.get<XmppConnection>()
+      .getManagerById<BlockingManager>(blockingManager)!
+      .getBlocklist();
+
+    // Diff the received blocklist with the cache
+    final newItems = List<String>.empty(growable: true);
+    final removedItems = List<String>.empty(growable: true);
+    final db = GetIt.I.get<DatabaseService>();
+    for (final item in blocklist) {
+      if (!_blocklist!.contains(item)) {
+        await db.addBlocklistEntry(item);
+        _blocklist!.add(item);
+        newItems.add(item);
+      }
+    }
+
+    // Diff the cache with the received blocklist
+    for (final item in _blocklist!) {
+      if (!blocklist.contains(item)) {
+        await db.removeBlocklistEntry(item);
+        _blocklist!.remove(item);
+        removedItems.add(item);
+      }
+    }
+      
+    _requested = true;
+
+    // Trigger an UI event if we have anything to tell the UI
+    if (newItems.isNotEmpty || removedItems.isNotEmpty) {
+      sendEvent(
+        BlocklistPushEvent(
+          added: newItems,
+          removed: removedItems,
+        ),
+      );
+    }
   }
     
   /// Returns the blocklist from the database
   Future<List<String>> getBlocklist() async {
-    if (!_requestedBlocklist) {
-      _blocklistCache
-        ..clear()
-        ..addAll(await _requestBlocklist());
+    if (_blocklist == null) {
+      _blocklist = await GetIt.I.get<DatabaseService>().getBlocklistEntries();
+
+      if (!_requested) {
+        unawaited(_requestBlocklist());
+      }
+
+      return _blocklist!;
     }
-   
-    return _blocklistCache;
+
+    if (!_requested) {
+      unawaited(_requestBlocklist());
+    }
+
+    return _blocklist!;
   }
 
   void onUnblockAllPush() {
-    _blocklistCache.clear();
+    _blocklist = List<String>.empty(growable: true);
     sendEvent(
       BlocklistUnblockAllEvent(),
     );
@@ -47,21 +106,25 @@ class BlocklistService {
   
   Future<void> onBlocklistPush(BlockPushType type, List<String> items) async {
     // We will fetch it later when getBlocklist is called
-    if (!_requestedBlocklist) return;
+    if (!_requested) return;
 
     final newBlocks = List<String>.empty(growable: true);
     final removedBlocks = List<String>.empty(growable: true);
     for (final item in items) {
       switch (type) {
         case BlockPushType.block: {
-          if (_blocklistCache.contains(item)) continue;
-          _blocklistCache.add(item);
+          if (_blocklist!.contains(item)) continue;
+          _blocklist!.add(item);
           newBlocks.add(item);
+
+          await GetIt.I.get<DatabaseService>().addBlocklistEntry(item);
         }
         break;
         case BlockPushType.unblock: {
-          _blocklistCache.removeWhere((i) => i == item);
+          _blocklist!.removeWhere((i) => i == item);
           removedBlocks.add(item);
+
+          await GetIt.I.get<DatabaseService>().removeBlocklistEntry(item);
         }
         break;
       }
@@ -76,17 +139,47 @@ class BlocklistService {
   }
 
   Future<bool> blockJid(String jid) async {
-    final manager = GetIt.I.get<XmppConnection>().getManagerById<BlockingManager>(blockingManager)!;
-    return manager.block([ jid ]);
+    // Check if blocking is supported
+    if (!(await _checkSupport())) {
+      _log.warning('Blocking $jid requested but server does not support it.');
+      return false;
+    }
+
+    _blocklist!.add(jid);
+    await GetIt.I.get<DatabaseService>()
+      .addBlocklistEntry(jid);
+    return GetIt.I.get<XmppConnection>()
+      .getManagerById<BlockingManager>(blockingManager)!
+      .block([jid]);
   }
 
   Future<bool> unblockJid(String jid) async {
-    final manager = GetIt.I.get<XmppConnection>().getManagerById<BlockingManager>(blockingManager)!;
-    return manager.unblock([ jid ]);
+    // Check if blocking is supported
+    if (!(await _checkSupport())) {
+      _log.warning('Unblocking $jid requested but server does not support it.');
+      return false;
+    }
+
+    _blocklist!.remove(jid);
+    await GetIt.I.get<DatabaseService>()
+      .removeBlocklistEntry(jid);
+    return GetIt.I.get<XmppConnection>()
+      .getManagerById<BlockingManager>(blockingManager)!
+      .unblock([jid]);
   }
 
   Future<bool> unblockAll() async {
-    final manager = GetIt.I.get<XmppConnection>().getManagerById<BlockingManager>(blockingManager)!;
-    return manager.unblockAll();
+    // Check if blocking is supported
+    if (!(await _checkSupport())) {
+      _log.warning('Unblocking all JIDs requested but server does not support it.');
+      return false;
+    }
+
+    _blocklist!.clear();
+    await GetIt.I.get<DatabaseService>()
+      .removeAllBlocklistEntries();
+    return GetIt.I.get<XmppConnection>()
+      .getManagerById<BlockingManager>(blockingManager)!
+      .unblockAll();
   }
 }

lib/service/connectivity.dart

@@ -1,15 +1,13 @@
 import 'dart:io' show Platform;
-
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:get_it/get_it.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
+import 'package:moxxmpp/moxxmpp.dart';
 import 'package:moxxyv2/service/httpfiletransfer/httpfiletransfer.dart';
 import 'package:moxxyv2/service/moxxmpp/reconnect.dart';
-import 'package:moxxyv2/xmpp/connection.dart';
 
 class ConnectivityService {
-
   ConnectivityService() : _log = Logger('ConnectivityService');
   final Logger _log;
 

lib/service/connectivity_watcher.dart

@@ -2,9 +2,10 @@ import 'dart:async';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:get_it/get_it.dart';
 import 'package:logging/logging.dart';
+import 'package:moxxmpp/moxxmpp.dart';
+import 'package:moxxyv2/i18n/strings.g.dart';
 import 'package:moxxyv2/service/connectivity.dart';
 import 'package:moxxyv2/service/notifications.dart';
-import 'package:moxxyv2/xmpp/connection.dart';
 
 class ConnectivityWatcherService {
 
@@ -17,7 +18,7 @@ class ConnectivityWatcherService {
   Future<void> _onTimerElapsed() async {
     await GetIt.I.get<NotificationsService>().showWarningNotification(
       'Moxxy',
-      'Could not connect to server',
+      t.errors.connection.connectionTimeout,
     );
     _stopTimer();
   }

lib/service/contacts.dart

@@ -0,0 +1,300 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:typed_data';
+import 'package:flutter_contacts/flutter_contacts.dart';
+import 'package:get_it/get_it.dart';
+import 'package:logging/logging.dart';
+import 'package:moxxyv2/service/conversation.dart';
+import 'package:moxxyv2/service/database/database.dart';
+import 'package:moxxyv2/service/preferences.dart';
+import 'package:moxxyv2/service/roster.dart';
+import 'package:moxxyv2/service/service.dart';
+import 'package:moxxyv2/shared/events.dart';
+import 'package:moxxyv2/shared/helpers.dart';
+import 'package:moxxyv2/shared/models/roster.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+class ContactWrapper {
+  const ContactWrapper(this.id, this.jid, this.displayName, this.thumbnail);
+  final String id;
+  final String jid;
+  final String displayName;
+  final Uint8List? thumbnail;
+}
+
+class ContactsService {
+  ContactsService() {
+    // NOTE: Apparently, this means that if false, contacts that are in 0 groups
+    //       are not returned.
+    FlutterContacts.config.includeNonVisibleOnAndroid = true;
+  }
+  final Logger _log = Logger('ContactsService');
+  
+  /// JID -> Id
+  Map<String, String>? _contactIds;
+  /// Contact ID -> Display name from the contact or null if we cached that there is
+  /// none
+  final Map<String, String?> _contactDisplayNames = {};
+
+  Future<void> init() async {
+    if (await _canUseContactIntegration()) {
+      enableDatabaseListener();
+    }
+  }
+
+  /// Enable listening to contact database events
+  void enableDatabaseListener() {
+    FlutterContacts.addListener(_onContactsDatabaseUpdate);
+  }
+
+  /// Disable listening to contact database events
+  void disableDatabaseListener() {
+    FlutterContacts.removeListener(_onContactsDatabaseUpdate);
+  }
+
+  Future<void> _onContactsDatabaseUpdate() async {
+    _log.finest('Got contacts database update');
+    await scanContacts();
+  }
+
+  /// Queries the contact list for contacts that include a XMPP URI.
+  Future<List<ContactWrapper>> _fetchContactsWithJabber() async {
+    final contacts = await FlutterContacts.getContacts(
+      withProperties: true,
+      withThumbnail: true,
+    );
+    _log.finest('Got ${contacts.length} contacts');
+
+    final jabberContacts = List<ContactWrapper>.empty(growable: true);
+    for (final c in contacts) {
+      final index = c.socialMedias
+        .indexWhere((s) => s.label == SocialMediaLabel.jabber);
+      if (index == -1) continue;
+
+      jabberContacts.add(
+        ContactWrapper(
+          c.id,
+          c.socialMedias[index].userName,
+          c.displayName,
+          c.thumbnail,
+        ),
+      );
+    }
+    _log.finest('${jabberContacts.length} contacts have an XMPP address');
+
+    return jabberContacts;
+  }
+
+  /// Checks whether the contact integration is enabled by the user in the preferences.
+  /// Returns true if that is the case. If not, returns false.
+  Future<bool> isContactIntegrationEnabled() async {
+    final prefs = await GetIt.I.get<PreferencesService>().getPreferences();
+    return prefs.enableContactIntegration;
+  }
+  
+  /// Checks if we a) have the permission to access the contact list and b) if the
+  /// user wants to use this integration.
+  /// Returns true if we can proceed with accessing the contact list. False, if not.
+  Future<bool> _canUseContactIntegration() async {
+    if (!(await isContactIntegrationEnabled())) {
+      _log.finest('_canUseContactIntegration: Returning false since enableContactIntegration is false');
+      return false;
+    }
+
+    final permission = await Permission.contacts.status;
+    if (permission == PermissionStatus.denied) {
+      _log.finest("_canUseContactIntegration: Returning false since we don't have the contacts permission");
+      return false;
+    }
+
+    return true;
+  }
+
+  /// Queries the database for the mapping of JID -> Contact ID. The result is
+  /// cached after the first call.
+  Future<Map<String, String>> _getContactIds() async {
+    if (_contactIds != null) return _contactIds!;
+
+    _contactIds = await GetIt.I.get<DatabaseService>().getContactIds();
+    return _contactIds!;
+  }
+
+  /// Queries the contact list, if enabled and allowed, and returns the contact's
+  /// display name.
+  ///
+  /// [id] is the id of the contact. A null value indicates that there is no
+  /// contact and null will be returned immediately.
+  Future<String?> getContactDisplayName(String? id) async {
+    if (id == null ||
+        !(await _canUseContactIntegration())) return null;
+    if (_contactDisplayNames.containsKey(id)) return _contactDisplayNames[id];
+
+    final result = await FlutterContacts.getContact(
+      id,
+      withThumbnail: false,
+    );
+    _contactDisplayNames[id] = result?.displayName;
+    return result?.displayName;
+  }
+
+  /// Returns the contact Id for the JID [jid]. If either the contact integration is
+  /// disabled, not possible (due to missing permissions) or there is no contact with
+  /// [jid] as their Jabber attribute, returns null.
+  Future<String?> getContactIdForJid(String jid) async {
+    if (!(await _canUseContactIntegration())) return null;
+
+    return (await _getContactIds())[jid];
+  }
+
+  /// Returns the path to the avatar file for the contact with JID [jid] as their
+  /// Jabber attribute. If either the contact integration is disabled, not possible
+  /// (due to missing permissions) or there is no contact with [jid] as their Jabber
+  /// attribute, returns null.
+  Future<String?> getProfilePicturePathForJid(String jid) async {
+    final id = await getContactIdForJid(jid);
+    if (id == null) return null;
+
+    final avatarPath = await getContactProfilePicturePath(id);
+    return File(avatarPath).existsSync() ?
+      avatarPath :
+      null;
+  }
+
+  Future<void> scanContacts() async {
+    final db = GetIt.I.get<DatabaseService>();
+    final cs = GetIt.I.get<ConversationService>();
+    final rs = GetIt.I.get<RosterService>();
+    final contacts = await _fetchContactsWithJabber();
+    // JID -> Id
+    final knownContactIds = await _getContactIds();
+    // Id -> JID
+    final knownContactIdsReverse = knownContactIds
+      .map((key, value) => MapEntry(value, key));
+    final modifiedRosterItems = List<RosterItem>.empty(growable: true);
+    final addedRosterItems = List<RosterItem>.empty(growable: true);
+    final removedRosterItems = List<String>.empty(growable: true);
+
+    for (final id in List<String>.from(knownContactIds.values)) {
+      final index = contacts.indexWhere((c) => c.id == id);
+      if (index != -1) continue;
+
+      final jid = knownContactIdsReverse[id]!;
+      await db.removeContactId(id);
+      _contactIds!.remove(knownContactIdsReverse[id]);
+
+      // Remove the avatar file, if it existed
+      final avatarPath = await getContactProfilePicturePath(id);
+      final avatarFile = File(avatarPath);
+      if (avatarFile.existsSync()) {
+        unawaited(avatarFile.delete());
+      }
+
+      // Remove the contact attributes from the conversation, if it existed
+      final c = await cs.getConversationByJid(jid);
+      if (c != null) {
+        final newConv = await cs.updateConversation(
+          c.id,
+          contactId: null,
+          contactAvatarPath: null,
+          contactDisplayName: null,
+        );
+        sendEvent(
+          ConversationUpdatedEvent(
+            conversation: newConv,
+          ),
+        );
+      }
+
+      // Remove the contact attributes from the roster item, if it existed
+      final r = await rs.getRosterItemByJid(jid);
+      if (r != null) {
+        if (r.pseudoRosterItem) {
+          _log.finest('Removing pseudo roster item $jid');
+          await rs.removeRosterItem(r.id);
+          removedRosterItems.add(jid);
+        } else {
+          final newRosterItem = await rs.updateRosterItem(
+            r.id,
+            contactId: null,
+            contactAvatarPath: null,
+            contactDisplayName: null,
+          );
+          modifiedRosterItems.add(newRosterItem);
+        }
+      }
+    }
+
+    for (final contact in contacts) {
+      // Add the ID to the cache and the database if it does not already exist
+      if (!knownContactIds.containsKey(contact.jid)) {
+        await db.addContactId(contact.id, contact.jid);
+        _contactIds![contact.jid] = contact.id;
+      }
+
+      // Store the avatar image
+      // NOTE: We do not check if the file already exists since this function may also
+      //       be triggered by the contact database listener. That listener fires when
+      //       a change happened, without telling us exactly what happened. So, we
+      //       just overwrite it.
+      final contactAvatarPath = await getContactProfilePicturePath(contact.id);
+      if (contact.thumbnail != null) {
+        final file = File(contactAvatarPath);
+        await file.writeAsBytes(contact.thumbnail!);
+      }
+
+      // Update a possibly existing conversation
+      final c = await cs.getConversationByJid(contact.jid);
+      if (c != null) {
+        final newConv = await cs.updateConversation(
+          c.id,
+          contactId: contact.id,
+          contactAvatarPath: contactAvatarPath,
+          contactDisplayName: contact.displayName,
+        );
+        sendEvent(
+          ConversationUpdatedEvent(
+            conversation: newConv,
+          ),
+        );
+      }
+
+      // Update a possibly existing roster item
+      final r = await rs.getRosterItemByJid(contact.jid);
+      if (r != null) {
+        final newRosterItem = await rs.updateRosterItem(
+          r.id,
+          contactId: contact.id,
+          contactAvatarPath: contactAvatarPath,
+          contactDisplayName: contact.displayName,
+        );
+        modifiedRosterItems.add(newRosterItem);
+      } else {
+        final newRosterItem = await rs.addRosterItemFromData(
+          '',
+          '',
+          contact.jid,
+          contact.jid.split('@').first,
+          'none',
+          'none',
+          true,
+          contact.id,
+          contactAvatarPath,
+          contact.displayName,
+        );
+        addedRosterItems.add(newRosterItem);
+      }
+    }
+
+    if (addedRosterItems.isNotEmpty ||
+        modifiedRosterItems.isNotEmpty ||
+        removedRosterItems.isNotEmpty) {
+      sendEvent(
+        RosterDiffEvent(
+          added: addedRosterItems,
+          modified: modifiedRosterItems,
+          removed: removedRosterItems,
+        ),
+      );
+    }
+  }
+}

lib/service/conversation.dart

@@ -1,13 +1,14 @@
 import 'package:get_it/get_it.dart';
-import 'package:moxxyv2/service/database.dart';
-import 'package:moxxyv2/service/db/media.dart';
+import 'package:moxlib/moxlib.dart';
+import 'package:moxxmpp/moxxmpp.dart';
+import 'package:moxxyv2/service/database/database.dart';
+import 'package:moxxyv2/service/not_specified.dart';
+import 'package:moxxyv2/service/preferences.dart';
 import 'package:moxxyv2/shared/cache.dart';
-import 'package:moxxyv2/shared/helpers.dart';
 import 'package:moxxyv2/shared/models/conversation.dart';
-import 'package:moxxyv2/xmpp/xeps/xep_0085.dart';
+import 'package:moxxyv2/shared/models/message.dart';
 
 class ConversationService {
-
   ConversationService()
     : _conversationCache = LRUCache(100),
       _loadedConversations = false;
@@ -56,27 +57,39 @@ class ConversationService {
   
   /// Wrapper around [DatabaseService]'s [updateConversation] that modifies the cache.
   Future<Conversation> updateConversation(int id, {
-      String? lastMessageBody,
-      int? lastChangeTimestamp,
-      bool? open,
-      int? unreadCounter,
-      String? avatarUrl,
-      List<DBSharedMedium>? sharedMedia,
-      ChatState? chatState,
-    }
-  ) async {
-    final conversation = await _getConversationById(id);
-    final newConversation = await GetIt.I.get<DatabaseService>().updateConversation(
+    int? lastChangeTimestamp,
+    Message? lastMessage,
+    bool? open,
+    int? unreadCounter,
+    String? avatarUrl,
+    ChatState? chatState,
+    bool? muted,
+    bool? encrypted,
+    Object? contactId = notSpecified,
+    Object? contactAvatarPath = notSpecified,
+    Object? contactDisplayName = notSpecified,
+  }) async {
+    final conversation = (await _getConversationById(id))!;
+    var newConversation = await GetIt.I.get<DatabaseService>().updateConversation(
       id,
-      lastMessageBody: lastMessageBody,
+      lastMessage: lastMessage,
       lastChangeTimestamp: lastChangeTimestamp,
       open: open,
       unreadCounter: unreadCounter,
       avatarUrl: avatarUrl,
-      sharedMedia: sharedMedia,
-      chatState: conversation?.chatState ?? ChatState.gone,
+      chatState: conversation.chatState,
+      muted: muted,
+      encrypted: encrypted,
+      contactId: contactId,
+      contactAvatarPath: contactAvatarPath,
+      contactDisplayName: contactDisplayName,
     );
 
+    // Copy over the old lastMessage if a new one was not set
+    if (conversation.lastMessage != null && lastMessage == null) {
+      newConversation = newConversation.copyWith(lastMessage: conversation.lastMessage);
+    }
+    
     _conversationCache.cache(id, newConversation);
     return newConversation;
   }
@@ -84,26 +97,45 @@ class ConversationService {
   /// Wrapper around [DatabaseService]'s [addConversationFromData] that updates the cache.
   Future<Conversation> addConversationFromData(
     String title,
-    String lastMessageBody,
+    Message? lastMessage,
     String avatarUrl,
     String jid,
     int unreadCounter,
     int lastChangeTimestamp,
-    List<DBSharedMedium> sharedMedia,
     bool open,
+    bool muted,
+    bool encrypted,
+    String? contactId,
+    String? contactAvatarPath,
+    String? contactDisplayName,
   ) async {
     final newConversation = await GetIt.I.get<DatabaseService>().addConversationFromData(
       title,
-      lastMessageBody,
+      lastMessage,
       avatarUrl,
       jid,
       unreadCounter,
       lastChangeTimestamp,
-      sharedMedia,
       open,
+      muted,
+      encrypted,
+      contactId,
+      contactAvatarPath,
+      contactDisplayName,
     );
 
     _conversationCache.cache(newConversation.id, newConversation);
     return newConversation;
   }
+
+  /// Returns true if the stanzas to the conversation with [jid] should be encrypted.
+  /// If not, returns false.
+  ///
+  /// If the conversation does not exist, then the value of the preference for
+  /// enableOmemoByDefault is used.
+  Future<bool> shouldEncryptForConversation(JID jid) async {
+    final prefs = await GetIt.I.get<PreferencesService>().getPreferences();
+    final conversation = await getConversationByJid(jid.toString());
+    return conversation?.encrypted ?? prefs.enableOmemoByDefault;
+  }
 }

lib/service/cryptography/cryptography.dart

@@ -0,0 +1,138 @@
+import 'dart:convert';
+import 'dart:math';
+import 'dart:typed_data';
+import 'package:logging/logging.dart';
+import 'package:moxplatform/moxplatform.dart';
+import 'package:moxplatform_platform_interface/moxplatform_platform_interface.dart';
+import 'package:moxxmpp/moxxmpp.dart';
+import 'package:moxxyv2/service/cryptography/types.dart';
+
+List<int> _randomBuffer(int length) {
+  final buf = List<int>.empty(growable: true);
+
+  final random = Random.secure();
+  for (var i = 0; i < length; i++) {
+    buf.add(random.nextInt(256));
+  }
+
+  return buf;
+}
+
+CipherAlgorithm _sfsToCipher(SFSEncryptionType type) {
+  switch (type) {
+    case SFSEncryptionType.aes128GcmNoPadding: return CipherAlgorithm.aes128GcmNoPadding;
+    case SFSEncryptionType.aes256GcmNoPadding: return CipherAlgorithm.aes256GcmNoPadding;
+    case SFSEncryptionType.aes256CbcPkcs7: return CipherAlgorithm.aes256CbcPkcs7;
+  }
+}
+
+class CryptographyService {
+
+  CryptographyService() : _log = Logger('CryptographyService');
+  final Logger _log;
+
+  /// Encrypt the file at path [source] and write the encrypted data to [dest]. For the
+  /// encryption, use the algorithm indicated by [encryption].
+  Future<EncryptionResult> encryptFile(String source, String dest, SFSEncryptionType encryption) async {
+    _log.finest('Beginning encryption routine for $source');
+    final key = encryption == SFSEncryptionType.aes128GcmNoPadding ?
+      _randomBuffer(16) :
+      _randomBuffer(32);
+    final iv = _randomBuffer(12);
+    final result = (await MoxplatformPlugin.crypto.encryptFile(
+      source,
+      dest,
+      Uint8List.fromList(key),
+      Uint8List.fromList(iv),
+      _sfsToCipher(encryption),
+      'SHA-256',
+    ))!;
+    _log.finest('Encryption done for $source ($result)');
+
+    return EncryptionResult(
+      key,
+      iv,
+      <String, String>{
+        hashSha256: base64Encode(result.plaintextHash),
+      },
+      <String, String>{
+        hashSha256: base64Encode(result.ciphertextHash),
+      },
+    );
+  }
+
+  /// Decrypt the file at [source] and write the decrypted version to [dest]. For the
+  /// decryption, use the algorithm indicated by [encryption] with the key [key] and the
+  /// IV or nonce [iv].
+  Future<DecryptionResult> decryptFile(
+    String source,
+    String dest,
+    SFSEncryptionType encryption,
+    List<int> key,
+    List<int> iv,
+    Map<String, String> plaintextHashes,
+    Map<String, String> ciphertextHashes,
+  ) async {
+    _log.finest('Beginning decryption for $source');
+    final result = await MoxplatformPlugin.crypto.encryptFile(
+      source,
+      dest,
+      Uint8List.fromList(key),
+      Uint8List.fromList(iv),
+      _sfsToCipher(encryption),
+      // TODO(Unknown): How to we get hash agility here?
+      'SHA-256',
+    );
+    _log.finest('Decryption done for $source (${result != null})');
+
+    var passedPlaintextIntegrityCheck = true;
+    var passedCiphertextIntegrityCheck = true;
+    for (final entry in plaintextHashes.entries) {
+      if (entry.key == hashSha256) {
+        if (base64Encode(result!.plaintextHash) != entry.value) {
+          passedPlaintextIntegrityCheck = false;
+        } else {
+          passedPlaintextIntegrityCheck = true;
+        }
+
+        break;
+      }
+    }
+     for (final entry in ciphertextHashes.entries) {
+      if (entry.key == hashSha256) {
+        if (base64Encode(result!.ciphertextHash) != entry.value) {
+          passedCiphertextIntegrityCheck = false;
+        } else {
+          passedCiphertextIntegrityCheck = true;
+        }
+
+        break;
+      }
+    }
+
+    return DecryptionResult(
+      result != null,
+      passedPlaintextIntegrityCheck,
+      passedCiphertextIntegrityCheck,
+    );
+  }
+
+  /// Read the file at [path] and calculate the base64-encoded hash using the algorithm
+  /// indicated by [hash].
+  Future<String> hashFile(String path, HashFunction hash) async {
+    String hashSpec;
+    if (hash == HashFunction.sha256) {
+      hashSpec = 'SHA-256';
+    } else if (hash == HashFunction.sha512) {
+      hashSpec = 'SHA-512';
+    } else {
+      // Android itself does not provide more
+      throw Exception();
+    }
+    
+    _log.finest('Beginning hash generation of $path');
+    final data = await MoxplatformPlugin.crypto.hashFile(path, hashSpec);
+    _log.finest('Hash generation done for $path');
+    return base64Encode(data!);
+  }
+}

lib/service/cryptography/implementations.dart

@@ -0,0 +1,150 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:cryptography/cryptography.dart';
+import 'package:moxxmpp/moxxmpp.dart';
+import 'package:moxxyv2/service/cryptography/types.dart';
+
+Future<List<int>> hashFileImpl(HashRequest request) async {
+  final data = await File(request.path).readAsBytes();
+
+  return CryptographicHashManager.hashFromData(data, request.hash);
+}
+
+Future<EncryptionResult> encryptFileImpl(EncryptionRequest request) async { 
+  Cipher algorithm;
+  switch (request.encryption) {
+    case SFSEncryptionType.aes128GcmNoPadding:
+      algorithm = AesGcm.with128bits();
+      break;
+    case SFSEncryptionType.aes256GcmNoPadding:
+      algorithm = AesGcm.with256bits();
+      break;
+    case SFSEncryptionType.aes256CbcPkcs7:
+      // TODO(Unknown): Implement
+      throw Exception();
+      // ignore: dead_code
+      break;
+  }
+
+  // Generate a key and an IV for the file
+  final key = await algorithm.newSecretKey();
+  final iv = algorithm.newNonce();
+  final plaintext = await File(request.source).readAsBytes();
+  final secretBox = await algorithm.encrypt(
+    plaintext,
+    secretKey: key,
+    nonce: iv,
+  );
+  final ciphertext = [
+    ...secretBox.cipherText,
+    ...secretBox.mac.bytes,
+  ];
+
+  // Write the file
+  await File(request.dest).writeAsBytes(ciphertext);
+
+  return EncryptionResult(
+    await key.extractBytes(),
+    iv,
+    {
+      hashSha256: base64Encode(
+        await CryptographicHashManager.hashFromData(plaintext, HashFunction.sha256),
+      ),
+    },
+    {
+      hashSha256: base64Encode(
+        await CryptographicHashManager.hashFromData(ciphertext, HashFunction.sha256),
+      ),
+    },
+  );
+}
+
+// TODO(PapaTutuWawa): Somehow fail when the ciphertext hash is not matching the provided data
+Future<DecryptionResult> decryptFileImpl(DecryptionRequest request) async {
+  Cipher algorithm;
+  switch (request.encryption) {
+    case SFSEncryptionType.aes128GcmNoPadding:
+      algorithm = AesGcm.with128bits();
+      break;
+    case SFSEncryptionType.aes256GcmNoPadding:
+      algorithm = AesGcm.with256bits();
+      break;
+    case SFSEncryptionType.aes256CbcPkcs7:
+      // TODO(Unknown): Implement
+      throw Exception();
+      // ignore: dead_code
+      break;
+  }
+  
+  final ciphertextRaw = await File(request.source).readAsBytes();
+  final mac = List<int>.empty(growable: true);
+  final ciphertext = List<int>.empty(growable: true);
+  // TODO(PapaTutuWawa): Somehow handle aes256CbcPkcs7
+  if (request.encryption == SFSEncryptionType.aes128GcmNoPadding ||
+      request.encryption == SFSEncryptionType.aes256GcmNoPadding) {
+    mac.addAll(ciphertextRaw.sublist(ciphertextRaw.length - 16));
+    ciphertext.addAll(ciphertextRaw.sublist(0, ciphertextRaw.length - 16));
+  }
+
+  var passedCiphertextIntegrityCheck = true;
+  var passedPlaintextIntegrityCheck = true;
+  // Try to find one hash we can verify
+  for (final entry in request.ciphertextHashes.entries) {
+    if ([hashSha256, hashSha512, hashBlake2b512].contains(entry.key)) {
+      final hash = await CryptographicHashManager.hashFromData(
+        ciphertext,
+        hashFunctionFromName(entry.key),
+      );
+
+      if (base64Encode(hash) == entry.value) {
+        passedCiphertextIntegrityCheck = true;
+      } else {
+        passedCiphertextIntegrityCheck = false;
+      }
+      break;
+    }
+  }
+  
+  final secretBox = SecretBox(
+    ciphertext,
+    nonce: request.iv,
+    mac: Mac(mac),
+  );
+
+  try {
+    final data = await algorithm.decrypt(
+      secretBox,
+      secretKey: SecretKey(request.key),
+    );
+
+    for (final entry in request.plaintextHashes.entries) {
+      if ([hashSha256, hashSha512, hashBlake2b512].contains(entry.key)) {
+        final hash = await CryptographicHashManager.hashFromData(
+          data,
+          hashFunctionFromName(entry.key),
+        );
+
+        if (base64Encode(hash) == entry.value) {
+          passedPlaintextIntegrityCheck = true;
+        } else {
+          passedPlaintextIntegrityCheck = false;
+        }
+        break;
+      }
+    }
+
+    await File(request.dest).writeAsBytes(data);
+  } catch (_) {
+    return DecryptionResult(
+      false,
+      passedPlaintextIntegrityCheck,
+      passedCiphertextIntegrityCheck,
+    );
+  }
+
+  return DecryptionResult(
+    true,
+    passedPlaintextIntegrityCheck,
+    passedCiphertextIntegrityCheck,
+  );
+}

lib/service/cryptography/types.dart

@@ -0,0 +1,64 @@
+import 'package:meta/meta.dart';
+import 'package:moxxmpp/moxxmpp.dart';
+
+@immutable
+class EncryptionResult {
+
+  const EncryptionResult(this.key, this.iv, this.plaintextHashes, this.ciphertextHashes);
+  final List<int> key;
+  final List<int> iv;
+
+  final Map<String, String> plaintextHashes;
+  final Map<String, String> ciphertextHashes;
+}
+
+@immutable
+class EncryptionRequest {
+
+  const EncryptionRequest(this.source, this.dest, this.encryption);
+  final String source;
+  final String dest;
+  final SFSEncryptionType encryption;
+}
+
+@immutable
+class DecryptionResult {
+
+  const DecryptionResult(
+    this.decryptionOkay,
+    this.plaintextOkay,
+    this.ciphertextOkay,
+  );
+  final bool decryptionOkay;
+  final bool plaintextOkay;
+  final bool ciphertextOkay;
+}
+
+@immutable
+class DecryptionRequest {
+
+  const DecryptionRequest(
+    this.source,
+    this.dest,
+    this.encryption,
+    this.key,
+    this.iv,
+    this.plaintextHashes,
+    this.ciphertextHashes,
+  );
+  final String source;
+  final String dest;
+  final SFSEncryptionType encryption;
+  final List<int> key;
+  final List<int> iv;
+  final Map<String, String> plaintextHashes;
+  final Map<String, String> ciphertextHashes;
+}
+
+@immutable
+class HashRequest {
+
+  const HashRequest(this.path, this.hash);
+  final String path;
+  final HashFunction hash;
+}

lib/service/database.dart

@@ -1,427 +0,0 @@
-import 'dart:async';
-
-import 'package:get_it/get_it.dart';
-import 'package:isar/isar.dart';
-import 'package:logging/logging.dart';
-import 'package:moxxyv2/service/db/conversation.dart';
-import 'package:moxxyv2/service/db/media.dart';
-import 'package:moxxyv2/service/db/message.dart';
-import 'package:moxxyv2/service/db/roster.dart';
-import 'package:moxxyv2/service/roster.dart';
-import 'package:moxxyv2/shared/error_types.dart';
-import 'package:moxxyv2/shared/models/conversation.dart';
-import 'package:moxxyv2/shared/models/media.dart';
-import 'package:moxxyv2/shared/models/message.dart';
-import 'package:moxxyv2/shared/models/roster.dart';
-import 'package:moxxyv2/xmpp/xeps/xep_0085.dart';
-import 'package:path_provider/path_provider.dart';
-
-SharedMedium sharedMediumDbToModel(DBSharedMedium s) {
-  return SharedMedium(
-    s.id!,
-    s.path,
-    s.timestamp,
-    mime: s.mime,
-  );
-}
-
-Conversation conversationDbToModel(DBConversation c, bool inRoster, String subscription, ChatState chatState) {
-  final media = c.sharedMedia
-    .map(sharedMediumDbToModel)
-    .toList();
-  // ignore: cascade_invocations
-  media.sort((a, b) => a.timestamp.compareTo(b.timestamp));
-
-  return Conversation(
-    c.title,
-    c.lastMessageBody,
-    c.avatarUrl,
-    c.jid,
-    c.unreadCounter,
-    c.lastChangeTimestamp,
-    media,
-    c.id!,
-    c.open,
-    inRoster,
-    subscription,
-    chatState,
-  );
-}
-
-RosterItem rosterDbToModel(DBRosterItem i) {
-  return RosterItem(
-    i.id!,
-    i.avatarUrl,
-    i.avatarHash,
-    i.jid,
-    i.title,
-    i.subscription,
-    i.ask,
-    i.groups,
-  );
-}
-
-Message messageDbToModel(DBMessage m) {
-  return Message(
-    m.sender,
-    m.body,
-    m.timestamp,
-    m.sid,
-    m.id!,
-    m.conversationJid,
-    m.isMedia,
-    m.isFileUploadNotification,
-    originId: m.originId,
-    received: m.received,
-    displayed: m.displayed,
-    acked: m.acked,
-    mediaUrl: m.mediaUrl,
-    mediaType: m.mediaType,
-    thumbnailData: m.thumbnailData,
-    thumbnailDimensions: m.thumbnailDimensions,
-    srcUrl: m.srcUrl,
-    quotes: m.quotes.value != null ? messageDbToModel(m.quotes.value!) : null,
-    errorType: m.errorType,
-    filename: m.filename,
-  );
-}
-
-class DatabaseService {
-  
-  DatabaseService() : _log = Logger('DatabaseService');
-  late Isar _isar;
-  
-  final Logger _log;
-
-  Future<void> initialize() async {
-    final dir = await getApplicationSupportDirectory();
-    _isar = await Isar.open(
-      schemas: [
-        DBConversationSchema,
-        DBRosterItemSchema,
-        DBMessageSchema,
-        DBSharedMediumSchema
-      ],
-      directory: dir.path,
-    );
-
-    _log.finest('Database setup done');
-  }
-  
-  /// Loads all conversations from the database and adds them to the state and cache.
-  Future<List<Conversation>> loadConversations() async {
-    final conversationsRaw = await _isar.dBConversations.where().findAll();
-
-    final tmp = List<Conversation>.empty(growable: true);
-    for (final c in conversationsRaw) {
-      await c.sharedMedia.load();
-      final rosterItem = await GetIt.I.get<RosterService>().getRosterItemByJid(c.jid);
-      final conv = conversationDbToModel(
-        c,
-        rosterItem != null,
-        rosterItem?.subscription ?? 'none',
-        ChatState.gone,
-      );
-      tmp.add(conv);
-    }
-
-    return tmp;
-  }
-
-  /// Load messages for [jid] from the database.
-  Future<List<Message>> loadMessagesForJid(String jid) async {
-    final rawMessages = await _isar.dBMessages.where().conversationJidEqualTo(jid).findAll();
-    final messages = List<Message>.empty(growable: true);
-    for (final m in rawMessages) {
-      await m.quotes.load();
-
-      final msg = messageDbToModel(m);
-      messages.add(msg);
-    }
-
-    return messages;
-  }
-
-  /// Updates the conversation with id [id] inside the database.
-  Future<Conversation> updateConversation(int id, {
-      String? lastMessageBody,
-      int? lastChangeTimestamp,
-      bool? open,
-      int? unreadCounter,
-      String? avatarUrl,
-      List<DBSharedMedium>? sharedMedia,
-      ChatState? chatState,
-    }
-  ) async {
-    final c = (await _isar.dBConversations.get(id))!;
-    await c.sharedMedia.load();
-    if (lastMessageBody != null) {
-      c.lastMessageBody = lastMessageBody;
-    }
-    if (lastChangeTimestamp != null) {
-      c.lastChangeTimestamp = lastChangeTimestamp;
-    }
-    if (open != null) {
-      c.open = open;
-    }
-    if (unreadCounter != null) {
-      c.unreadCounter = unreadCounter;
-    }
-    if (avatarUrl != null) {
-      c.avatarUrl = avatarUrl;
-    }
-    if (sharedMedia != null) {
-      c.sharedMedia.addAll(sharedMedia);
-    }
-
-    await _isar.writeTxn(() async {
-        await _isar.dBConversations.put(c);
-        await c.sharedMedia.save();
-    });
-
-    final rosterItem = await GetIt.I.get<RosterService>().getRosterItemByJid(c.jid);
-    final conversation = conversationDbToModel(c, rosterItem != null, rosterItem?.subscription ?? 'none', chatState ?? ChatState.gone);
-    return conversation;
-  }
-
-  /// Creates a [Conversation] inside the database given the data. This is so that the
-  /// [Conversation] object can carry its database id.
-  Future<Conversation> addConversationFromData(
-    String title,
-    String lastMessageBody,
-    String avatarUrl,
-    String jid,
-    int unreadCounter,
-    int lastChangeTimestamp,
-    List<DBSharedMedium> sharedMedia,
-    bool open,
-  ) async {
-    final c = DBConversation()
-      ..jid = jid
-      ..title = title
-      ..avatarUrl = avatarUrl
-      ..lastChangeTimestamp = lastChangeTimestamp
-      ..unreadCounter = unreadCounter
-      ..lastMessageBody = lastMessageBody
-      ..open = open;
-
-    c.sharedMedia.addAll(sharedMedia);
-
-    await _isar.writeTxn(() async {
-        await _isar.dBConversations.put(c);
-    }); 
-
-    final rosterItem = await GetIt.I.get<RosterService>().getRosterItemByJid(c.jid);
-    final conversation = conversationDbToModel(c, rosterItem != null, rosterItem?.subscription ?? 'none', ChatState.gone); 
-    return conversation;
-  }
-
-  /// Like [addConversationFromData] but for [SharedMedium].
-  Future<DBSharedMedium> addSharedMediumFromData(String path, int timestamp, { String? mime }) async {
-    final s = DBSharedMedium()
-      ..path = path
-      ..mime = mime
-      ..timestamp = timestamp;
-
-    await _isar.writeTxn(() async {
-        await _isar.dBSharedMediums.put(s);
-    });
-
-    return s;
-  }
-  
-  /// Same as [addConversationFromData] but for a [Message].
-  Future<Message> addMessageFromData(
-    String body,
-    int timestamp,
-    String sender,
-    String conversationJid,
-    bool isMedia,
-    String sid,
-    bool isFileUploadNotification,
-    {
-      String? srcUrl,
-      String? mediaUrl,
-      String? mediaType,
-      String? thumbnailData,
-      String? thumbnailDimensions,
-      String? originId,
-      String? quoteId,
-      String? filename,
-    }
-  ) async {
-    final m = DBMessage()
-      ..conversationJid = conversationJid
-      ..timestamp = timestamp
-      ..body = body
-      ..sender = sender
-      ..isMedia = isMedia
-      ..mediaType = mediaType
-      ..mediaUrl = mediaUrl
-      ..srcUrl = srcUrl
-      ..sid = sid
-      ..thumbnailData = thumbnailData
-      ..thumbnailDimensions = thumbnailDimensions
-      ..received = false
-      ..displayed = false
-      ..acked = false
-      ..originId = originId
-      ..errorType = noError
-      ..isFileUploadNotification = isFileUploadNotification
-      ..filename = filename;
-
-    if (quoteId != null) {
-      final quotes = await getMessageByXmppId(quoteId, conversationJid);
-      if (quotes != null) {
-        m.quotes.value = quotes;
-      } else {
-        _log.warning('Failed to add quote for message with id $quoteId');
-      }
-    }
-
-    await _isar.writeTxn(() async {
-      await _isar.dBMessages.put(m);
-    });
-
-    final msg = messageDbToModel(m);
-    return msg;
-  }
-
-  Future<DBMessage?> getMessageByXmppId(String id, String conversationJid) async {
-    return _isar.dBMessages.filter()
-      .conversationJidEqualTo(conversationJid)
-      .and()
-      .group((q) => q
-        .sidEqualTo(id)
-        .or()
-        .originIdEqualTo(id),
-      ).findFirst();
-  }
-  
-  /// Updates the message item with id [id] inside the database.
-  Future<Message> updateMessage(int id, {
-    String? mediaUrl,
-    String? mediaType,
-    bool? received,
-    bool? displayed,
-    bool? acked,
-    int? errorType,
-    bool? isFileUploadNotification,
-    String? srcUrl,
-  }) async {
-    final i = (await _isar.dBMessages.get(id))!;
-    if (mediaUrl != null) {
-      i.mediaUrl = mediaUrl;
-    }
-    if (mediaType != null) {
-      i.mediaType = mediaType;
-    }
-    if (received != null) {
-      i.received = received;
-    }
-    if (displayed != null) {
-      i.displayed = displayed;
-    }
-    if (acked != null) {
-      i.acked = acked;
-    }
-    if (errorType != null) {
-      i.errorType = errorType;
-    }
-    if (isFileUploadNotification != null) {
-      i.isFileUploadNotification = isFileUploadNotification;
-    }
-    if (srcUrl != null) {
-      i.srcUrl = srcUrl;
-    }
-
-    await _isar.writeTxn(() async {
-      await _isar.dBMessages.put(i);
-    });
-    await i.quotes.load();
-    
-    final msg = messageDbToModel(i);
-    return msg;
-  }
-  
-  /// Loads roster items from the database
-  Future<List<RosterItem>> loadRosterItems() async {
-    final roster = await _isar.dBRosterItems.where().findAll();
-    return roster.map(rosterDbToModel).toList();
-  }
-
-  /// Removes a roster item from the database and cache
-  Future<void> removeRosterItem(int id) async {
-    await _isar.writeTxn(() async {
-        await _isar.dBRosterItems.delete(id);
-    });
-  }
-
-  /// Create a roster item from data
-  Future<RosterItem> addRosterItemFromData(
-    String avatarUrl,
-    String avatarHash,
-    String jid,
-    String title,
-    String subscription,
-    String ask,
-    {
-      List<String> groups = const [],
-    }
-  ) async {
-    final rosterItem = DBRosterItem()
-      ..jid = jid
-      ..title = title
-      ..avatarUrl = avatarUrl
-      ..avatarHash = avatarHash
-      ..subscription = subscription
-      ..ask = ask
-      ..groups = groups;
-
-    await _isar.writeTxn(() async {
-        await _isar.dBRosterItems.put(rosterItem);
-    });
-
-    final item = rosterDbToModel(rosterItem);
-    return item;
-  }
-
-  /// Updates the roster item with id [id] inside the database.
-  Future<RosterItem> updateRosterItem(
-    int id, {
-      String? avatarUrl,
-      String? avatarHash,
-      String? title,
-      String? subscription,
-      String? ask,
-      List<String>? groups,
-    }
-  ) async {
-    final i = (await _isar.dBRosterItems.get(id))!;
-    if (avatarUrl != null) {
-      i.avatarUrl = avatarUrl;
-    }
-    if (avatarHash != null) {
-      i.avatarHash = avatarHash;
-    }
-    if (title != null) {
-      i.title = title;
-    }
-    if (groups != null) {
-      i.groups = groups;
-    }
-    if (subscription != null) {
-      i.subscription = subscription;
-    }
-    if (ask != null) {
-      i.ask = ask;
-    }
-
-    await _isar.writeTxn(() async {
-        await _isar.dBRosterItems.put(i);
-    });
-
-    final item = rosterDbToModel(i);
-    return item;
-  }
-}

lib/service/database/constants.dart

@@ -0,0 +1,21 @@
+const conversationsTable = 'Conversations';
+const messagesTable = 'Messages';
+const rosterTable = 'RosterItems';
+const mediaTable = 'SharedMedia';
+const preferenceTable = 'Preferences';
+const omemoDeviceTable = 'OmemoDevices';
+const omemoDeviceListTable = 'OmemoDeviceList';
+const omemoRatchetsTable = 'OmemoSessions';
+const omemoTrustCacheTable = 'OmemoTrustCacheList';
+const omemoTrustDeviceListTable = 'OmemoTrustDeviceList';
+const omemoTrustEnableListTable = 'OmemoTrustEnableList';
+const omemoFingerprintCache = 'OmemoFingerprintCache';
+const xmppStateTable = 'XmppState';
+const contactsTable = 'Contacts';
+const stickersTable = 'Stickers';
+const stickerPacksTable = 'StickerPacks';
+const blocklistTable = 'Blocklist';
+
+const typeString = 0;
+const typeInt = 1;
+const typeBool = 2;

lib/service/database/creation.dart

@@ -0,0 +1,430 @@
+import 'package:moxxyv2/service/database/constants.dart';
+import 'package:moxxyv2/shared/models/preference.dart';
+import 'package:sqflite_sqlcipher/sqflite.dart';
+
+Future<void> configureDatabase(Database db) async {
+  await db.execute('PRAGMA foreign_keys = OFF');
+}
+
+Future<void> createDatabase(Database db, int version) async {
+  // XMPP state
+  await db.execute(
+    '''
+    CREATE TABLE $xmppStateTable (
+      key   TEXT PRIMARY KEY,
+      value TEXT
+    )''',
+  );
+
+  // Messages
+  await db.execute(
+    '''
+    CREATE TABLE $messagesTable (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      sender TEXT NOT NULL,
+      body TEXT,
+      timestamp INTEGER NOT NULL,
+      sid TEXT NOT NULL,
+      conversationJid TEXT NOT NULL,
+      isMedia INTEGER NOT NULL,
+      isFileUploadNotification INTEGER NOT NULL,
+      encrypted INTEGER NOT NULL,
+      errorType INTEGER,
+      warningType INTEGER,
+      mediaUrl TEXT,
+      mediaType TEXT,
+      thumbnailData TEXT,
+      mediaWidth INTEGER,
+      mediaHeight INTEGER,
+      srcUrl TEXT,
+      key TEXT,
+      iv TEXT,
+      encryptionScheme TEXT,
+      received INTEGER,
+      displayed INTEGER,
+      acked INTEGER,
+      originId TEXT,
+      quote_id INTEGER,
+      filename TEXT,
+      plaintextHashes TEXT,
+      ciphertextHashes TEXT,
+      isDownloading INTEGER NOT NULL,
+      isUploading INTEGER NOT NULL,
+      mediaSize INTEGER,
+      isRetracted INTEGER,
+      isEdited INTEGER NOT NULL,
+      reactions TEXT NOT NULL,
+      containsNoStore INTEGER NOT NULL,
+      stickerPackId   TEXT,
+      stickerHashKey  TEXT,
+      pseudoMessageType INTEGER,
+      pseudoMessageData TEXT,
+      CONSTRAINT fk_quote FOREIGN KEY (quote_id) REFERENCES $messagesTable (id),
+    )''',
+  );
+
+  // Conversations
+  await db.execute(
+    '''
+    CREATE TABLE $conversationsTable (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      jid TEXT NOT NULL,
+      title TEXT NOT NULL,
+      avatarUrl TEXT NOT NULL,
+      lastChangeTimestamp INTEGER NOT NULL,
+      unreadCounter INTEGER NOT NULL,
+      open INTEGER NOT NULL,
+      muted INTEGER NOT NULL,
+      encrypted INTEGER NOT NULL,
+      lastMessageId INTEGER,
+      contactId TEXT,
+      contactAvatarPath TEXT,
+      contactDisplayName TEXT,
+      CONSTRAINT fk_last_message FOREIGN KEY (lastMessageId) REFERENCES $messagesTable (id),
+      CONSTRAINT fk_contact_id FOREIGN KEY (contactId) REFERENCES $contactsTable (id)
+        ON DELETE SET NULL
+    )''',
+  );
+
+  // Contacts
+  await db.execute(
+    '''
+    CREATE TABLE $contactsTable (
+      id TEXT PRIMARY KEY,
+      jid TEXT NOT NULL
+    )'''
+  );
+  
+  // Shared media
+  await db.execute(
+    '''
+    CREATE TABLE $mediaTable (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      path TEXT NOT NULL,
+      mime TEXT,
+      timestamp INTEGER NOT NULL,
+      conversation_id INTEGER NOT NULL,
+      message_id INTEGER,
+      FOREIGN KEY (conversation_id) REFERENCES $conversationsTable (id),
+      FOREIGN KEY (message_id) REFERENCES $messagesTable (id)
+    )''',
+  );
+
+  // Roster
+  await db.execute(
+    '''
+    CREATE TABLE $rosterTable (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      jid TEXT NOT NULL,
+      title TEXT NOT NULL,
+      avatarUrl TEXT NOT NULL,
+      avatarHash TEXT NOT NULL,
+      subscription TEXT NOT NULL,
+      ask TEXT NOT NULL,
+      contactId TEXT,
+      contactAvatarPath TEXT,
+      contactDisplayName TEXT,
+      pseudoRosterItem INTEGER NOT NULL,
+      CONSTRAINT fk_contact_id FOREIGN KEY (contactId) REFERENCES $contactsTable (id)
+        ON DELETE SET NULL
+    )''',
+  );
+
+  // Stickers
+  await db.execute(
+    '''
+    CREATE TABLE $stickersTable (
+      hashKey       TEXT PRIMARY KEY,
+      mediaType     TEXT NOT NULL,
+      desc          TEXT NOT NULL,
+      size          INTEGER NOT NULL,
+      width         INTEGER,
+      height        INTEGER,
+      hashes        TEXT NOT NULL,
+      urlSources    TEXT NOT NULL,
+      path          TEXT NOT NULL,
+      stickerPackId TEXT NOT NULL,
+      suggests      TEXT NOT NULL,
+      CONSTRAINT fk_sticker_pack FOREIGN KEY (stickerPackId) REFERENCES $stickerPacksTable (id)
+        ON DELETE CASCADE
+    )''',
+  );
+  await db.execute(
+    '''
+    CREATE TABLE $stickerPacksTable (
+      id             TEXT PRIMARY KEY,
+      name           TEXT NOT NULL,
+      description    TEXT NOT NULL,
+      hashAlgorithm  TEXT NOT NULL,
+      hashValue      TEXT NOT NULL,
+      restricted     INTEGER NOT NULL
+    )''',
+  );
+
+  // Blocklist
+  await db.execute(
+    '''
+    CREATE TABLE $blocklistTable (
+      jid TEXT PRIMARY KEY
+    );
+    ''',
+  );
+  
+  // OMEMO
+  await db.execute(
+    '''
+    CREATE TABLE $omemoRatchetsTable (
+      id         INTEGER NOT NULL,
+      jid        TEXT NOT NULL,
+      dhs        TEXT NOT NULL,
+      dhs_pub    TEXT NOT NULL,
+      dhr        TEXT,
+      rk         TEXT NOT NULL,
+      cks        TEXT,
+      ckr        TEXT,
+      ns         INTEGER NOT NULL,
+      nr         INTEGER NOT NULL,
+      pn         INTEGER NOT NULL,
+      ik_pub     TEXT NOT NULL,
+      session_ad TEXT NOT NULL,
+      acknowledged INTEGER NOT NULL,
+      mkskipped  TEXT NOT NULL,
+      kex_timestamp INTEGER NOT NULL,
+      kex        TEXT,
+      PRIMARY KEY (jid, id)
+    )''',
+  );
+  await db.execute(
+    '''
+    CREATE TABLE $omemoTrustCacheTable (
+      key   TEXT PRIMARY KEY NOT NULL,
+      trust INTEGER NOT NULL
+    )''',
+  );
+  await db.execute(
+    '''
+    CREATE TABLE $omemoTrustDeviceListTable (
+      jid    TEXT NOT NULL,
+      device INTEGER NOT NULL
+    )''',
+  );
+  await db.execute(
+    '''
+    CREATE TABLE $omemoTrustEnableListTable (
+      key     TEXT PRIMARY KEY NOT NULL,
+      enabled INTEGER NOT NULL
+    )''',
+  );
+  await db.execute(
+    '''
+    CREATE TABLE $omemoDeviceTable (
+      jid  TEXT NOT NULL,
+      id   INTEGER NOT NULL,
+      data TEXT NOT NULL,
+      PRIMARY KEY (jid, id)
+    )''',
+  );
+  await db.execute(
+    '''
+    CREATE TABLE $omemoDeviceListTable (
+      jid  TEXT NOT NULL,
+      id   INTEGER NOT NULL,
+      PRIMARY KEY (jid, id)
+    )''',
+  );
+  await db.execute(
+    '''
+    CREATE TABLE $omemoFingerprintCache (
+      jid  TEXT NOT NULL,
+      id   INTEGER NOT NULL,
+      fingerprint TEXT NOT NULL,
+      PRIMARY KEY (jid, id)
+    )''',
+  );
+
+  // Settings
+  await db.execute(
+    '''
+    CREATE TABLE $preferenceTable (
+      key TEXT NOT NULL PRIMARY KEY,
+      type INTEGER NOT NULL,
+      value TEXT NOT NULL
+    )''',
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'sendChatMarkers',
+      typeBool,
+      'true',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'sendChatStates',
+      typeBool,
+      'true',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'showSubscriptionRequests',
+      typeBool,
+      'true',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'autoDownloadWifi',
+      typeBool,
+      'true',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'autoDownloadMobile',
+      typeBool,
+      'false',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'maximumAutoDownloadSize',
+      typeInt,
+      '15',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'backgroundPath',
+      typeString,
+      '',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'isAvatarPublic',
+      typeBool,
+      'true',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'autoAcceptSubscriptionRequests',
+      typeBool,
+      'false',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'debugEnabled',
+      typeBool,
+      'false',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'debugPassphrase',
+      typeString,
+      '',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'debugIp',
+      typeString,
+      '',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'debugPort',
+      typeInt,
+      '-1',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'twitterRedirect',
+      typeString,
+      '',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'youtubeRedirect',
+      typeString,
+      '',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'enableTwitterRedirect',
+      typeBool,
+      'false',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'enableYoutubeRedirect',
+      typeBool,
+      'false',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'defaultMuteState',
+      typeBool,
+      'false',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'enableOmemoByDefault',
+      typeBool,
+      'false',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'languageLocaleCode',
+      typeString,
+      'default',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'enableContactIntegration',
+      typeBool,
+      'false',
+    ).toDatabaseJson(),
+  );
+  await db.insert(
+    preferenceTable,
+    Preference(
+      'isStickersNodePublic',
+      typeBool,
+      'true',
+    ).toDatabaseJson(),
+  );
+}