Merge branch 'main' of https://gitlab.com/ChristianPauly/fluffychat-flutter into yiffed

.gitlab-ci.yml

@@ -152,12 +152,10 @@ upload_to_fdroid_repo:
     - chmod 700 ~/.ssh
     - ssh-keyscan -t rsa fdroid.nordgedanken.dev >> ~/.ssh/known_hosts
   script:
-    - mkdir -p upload
-    - cp build/android/* upload/
     - cd build/android/
-    - export UPDATE_VERSION=$(pcregrep -o1 'version:\\s([0-9]*\\.[0-9]*\\.[0-9]*)\\+[0-9]*' pubspec.yaml) && mv app-release.apk "${UPDATE_VERSION}.apk"
+    - export UPDATE_VERSION=$(pcregrep -o1 'version:\\s([0-9]*\\.[0-9]*\\.[0-9]*)\\+[0-9]*' ../../pubspec.yaml) && mv app-release.apk "${UPDATE_VERSION}.apk"
     - rsync -rav -e ssh ./ fluffy@fdroid.nordgedanken.dev:/fdroid/repo
-    - ssh fluffy@fdroid.nordgedanken.dev "cd fdroid && mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc && fdroid update"
+    - ssh fluffy@fdroid.nordgedanken.dev "cd fdroid && fdroid update"
   needs: ["build_android_apk"]
   only:
     - tags
@@ -196,6 +194,29 @@ build_linux:
       - build/linux/release/bundle/
   only:
     - main
+
+snap:edge:
+  stage: publish
+  image: "cibuilds/snapcraft:core18"
+  only:
+    - main
+  script:
+    ## Manually install the flutter-dev snap, so we can use the flutter extension
+    - 'curl -L $(curl -H "X-Ubuntu-Series: 16" "https://api.snapcraft.io/api/v1/snaps/details/flutter?channel=latest/stable" | jq ".download_url" -r) --output flutter.snap'
+    - sudo mkdir -p /snap/flutter
+    - sudo unsquashfs -d /snap/flutter/current flutter.snap
+    - rm -f flutter.snap
+    - sudo ln -sf /snap/flutter/current/flutter.sh /snap/bin/flutter
+    - sudo ln -sf /snap/flutter/current/env.sh /snap/bin/env.sh
+    - snapcraft
+    - echo $SNAPCRAFT_LOGIN_FILE | base64 --decode --ignore-garbage > snapcraft.login
+    - snapcraft login --with snapcraft.login
+    - snapcraft push --release=edge *.snap
+    - snapcraft logout
+  artifacts:
+    paths:
+      - './*.snap'
+    when: on_success
   
 snap:publish:
   stage: publish

CHANGELOG.md

@@ -1,4 +1,16 @@
-# Version 0.20.0 - 2020-??-??
+# Version 0.21.0 - 2020-10-28
+### Features
+- New user viewer
+- Add code syntax highlighting in messages
+- Updated translations: Thanks to all helpers
+### Changes
+- Stories feature removed
+### Fixes
+- Fixes sentry
+- Fixes Android download
+- Minor fixes
+
+# Version 0.20.0 - 2020-10-23
 ### Features
 - Added translations: Arabic
 - Add ability to enable / disable emotes globally
@@ -18,6 +30,7 @@
 - Show device name in account information correctly
 - Fix tapping on aliases / room pills not always working
 - Link clicking in web not always working
+- Return message input field to previous state after editing message - Thanks @inexcode
 
 # Version 0.19.0 - 2020-09-21
 ### Features

README.md

@@ -54,11 +54,6 @@ cd FurryChat
 sudo apt install ninja-build
 ```
 
-* Outcomment the Google Services plugin at the end of the file `android/app/build.gradle`:
-```
-// apply plugin: "com.google.gms.google-services"
-```
-
 * Build with: `flutter build apk`
 
 ### iOS / iPadOS

android/app/build.gradle

@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -44,8 +44,8 @@ android {
 
     defaultConfig {
         applicationId "dev.inex.furrychat"
-        minSdkVersion 18
-        targetSdkVersion 28
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -87,4 +87,4 @@ dependencies {
     implementation "net.zetetic:android-database-sqlcipher:4.4.0" // needed for moor_ffi w/ sqlcipher
 }
 
-apply plugin: "com.google.gms.google-services"
+apply plugin: 'com.google.gms.google-services'

assets/logo.svg

@@ -1,48 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 181.4 181.9" style="enable-background:new 0 0 181.4 181.9;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:url(#SVGID_1_);}
-	.st1{fill:#F094BE;}
-	.st2{fill:#4D3F92;}
-	.st3{fill:#FFFFFF;}
-</style>
-<g id="Capa_1">
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="90.891" y1="0.2799" x2="90.891" y2="181.8763">
-		<stop  offset="0" style="stop-color:#F6BFD9"/>
-		<stop  offset="0.9951" style="stop-color:#F3A8CA"/>
-	</linearGradient>
-	<rect x="0.1" y="0.3" class="st0" width="181.6" height="181.6"/>
-	<path class="st1" d="M181.7,37.6v144.3H0.1v-37.3c0,0,2-1.4,5.5-3.8C36,119.6,181.7,19.2,181.7,37.6z"/>
-</g>
-<g id="Capa_2">
-	<g>
-		<path class="st2" d="M151.6,95.1c1.5-0.3,2.8-1,3.8-2c4-5.3,0.8-11.8-4.5-12.6c-0.8,0-1.5-0.8-1.5-1.5c0-0.3,0-0.5,0-0.5
-			c0.8-0.8,1.5-1.8,2.5-3.3c8.1-10.8,11.8-50.6,3.8-53.7c-9.8-3.3-29.7,6.3-38.3,17.4c-0.5-0.3-1-1-1-1.8c0.3-3-1.3-5.5-3.5-6.8
-			c-4.5-2.3-8.8,0-10.6,3.3c-0.5,0.8-1.3,1.3-2,1c-0.8,0-1.5-0.8-1.5-1.5c-0.5-2.5-2-4.5-4.3-5.5c-4.8-2-9.8,0.8-10.6,5.3
-			c-0.3,0.8-0.8,1.5-1.5,1.5c-0.8,0.3-1.5-0.3-2-1c-1.5-2.3-4-3.8-6.5-3.8c-4,0-7.6,3.3-7.8,7.3v0.3v0.3c0,0.8-0.5,1.5-1,1.8h-0.3
-			c-8.3-10.8-28.5-20.7-38.5-17.4c-8.1,2.8-4.3,42.6,4,53.4c1.5,2,2.8,3.5,3.8,4.5c-0.3,0.8-1,1.5-1.8,1.5c-1.3,0-2.5,0.5-3.5,1.3
-			c-5.3,5-2.3,12.1,3,13.4c0.8,0.3,1.5,1,1.5,1.8c0,0.8-0.5,1.8-1.3,2c-1,0.5-2,1-2.8,2c-4,5.8,0,12.3,5.5,12.3
-			c0.8,0,1.5,0.5,1.8,1.3c0.3,0.8,0.3,1.5-0.5,2c-1.5,1.5-2.3,3.5-2,5.5c0.3,2.8,2,5.3,4.8,6.5c1.5,0.8,3,0.8,4.5,0.5
-			c0.8-0.3,1.5,0,2,0.8c0.5,0.5,0.5,1.5,0.3,2c-0.8,1.5-1,3.3-0.5,5c0.8,2.8,2.8,4.8,5.5,5.5c2.5,0.5,4.3-0.3,5.5-0.8
-			c0.5-0.3-3.3,9.1-6,15.4c-0.8,2,1.3,4.3,3.5,3.3c8.3-3.8,22.2-10.3,22.2-9.8c0.5,5.3,6.5,9.1,12.3,5.3c1.3-0.8,2-2.3,2.3-3.5
-			c0.3-0.8,1-1.5,2-1.5c1,0,1.8,0.5,2,1.5c0.3,1.3,0.8,2.3,1.8,3c5.8,4.5,12.3,0.8,12.8-4.8c0-0.8,0.5-1.5,1.3-1.8
-			c0.8-0.3,1.5,0,2,0.5c1.5,1.5,3.3,2.5,5.3,2.5l0,0c2.5,0,5-1.3,6.5-3.8c1-1.5,1.3-3,1-5c0-0.8,0.3-1.5,0.8-2c0.5-0.5,1.5-0.5,2,0
-			c1.5,0.8,3.3,1.3,5,0.8c2.8-0.5,5-2.8,5.8-5.3c0.5-1.8,0.3-3.5-0.5-5.3c-0.3-0.8-0.3-1.5,0.3-2s1.3-0.8,2-0.8
-			c1.8,0.3,3.3,0.3,4.8-0.5c2.3-1,3.8-3,4.3-5.5c0.5-2.5-0.3-4.8-2-6.5c-0.5-0.5-0.8-1.3-0.5-2s1-1.3,1.8-1.3c1.8,0,3.8-0.5,5-2
-			c4.3-4.5,2.3-10.6-2.5-12.6c-0.8-0.3-1.3-1-1.3-2C150.1,95.8,150.8,95.1,151.6,95.1z"/>
-		<path class="st3" d="M131.4,42.2c0.5,1.5,0.5,3,0,4.5c-0.3,0.8,0,1.5,0.5,2s1.3,0.8,2,0.5c1-0.5,2-0.5,3-0.5c2.3,0,4.3,1,5.8,3
-			c1,1.3,1.8,3,1.5,4.8c0,1.5-0.5,2.8-1.3,4c-0.5,0.5-0.5,1.5,0,2c0.3,0.3,0.5,0.8,1,0.8c1-0.3,2-1,2.8-2c4.5-6.3,5.3-26.2,0.8-27.7
-			c-4.5-1.5-12.3,1.5-17.9,6C130.7,40.1,131.2,40.9,131.4,42.2z"/>
-		<path class="st3" d="M39,63.6c0.3-0.3,0.5-0.5,0.8-0.8c0.5-0.8,0.3-1.5,0-2C38.5,59,38.2,57,38.5,55c0.5-2.8,2.8-5,5.5-5.8
-			c1.5-0.5,3-0.3,4.5,0.3c0.8,0.3,1.5,0,2-0.5c0.5-0.5,0.8-1.3,0.5-2c-0.5-1.5-0.5-3,0-4.5c0.3-1,0.8-2,1.5-2.8
-			c-5.5-4.5-13.9-7.8-18.4-6.3S30.4,54.8,35,61.1C36,62.6,37.2,63.3,39,63.6z"/>
-		<g>
-			<circle class="st3" cx="60.9" cy="94.6" r="9.3"/>
-			<path class="st3" d="M100.7,94.6c0,5.3-4.3,9.3-9.3,9.3c-5.3,0-9.3-4.3-9.3-9.3S100.7,89.3,100.7,94.6z"/>
-			<circle class="st3" cx="121.6" cy="94.6" r="9.3"/>
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 181.4 181.9" style="enable-background:new 0 0 181.4 181.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:#F094BE;}
+	.st2{fill:#4D3F92;}
+	.st3{fill:#FFFFFF;}
+</style>
+<g id="Capa_1">
+	<rect x="0" y="0" style="color:#FFFFFF" width="181.4" height="181.9" class="st3"/>
+</g>
+<g id="Capa_2">
+	<g>
+		<path class="st2" d="M151.6,95.1c1.5-0.3,2.8-1,3.8-2c4-5.3,0.8-11.8-4.5-12.6c-0.8,0-1.5-0.8-1.5-1.5c0-0.3,0-0.5,0-0.5
+			c0.8-0.8,1.5-1.8,2.5-3.3c8.1-10.8,11.8-50.6,3.8-53.7c-9.8-3.3-29.7,6.3-38.3,17.4c-0.5-0.3-1-1-1-1.8c0.3-3-1.3-5.5-3.5-6.8
+			c-4.5-2.3-8.8,0-10.6,3.3c-0.5,0.8-1.3,1.3-2,1c-0.8,0-1.5-0.8-1.5-1.5c-0.5-2.5-2-4.5-4.3-5.5c-4.8-2-9.8,0.8-10.6,5.3
+			c-0.3,0.8-0.8,1.5-1.5,1.5c-0.8,0.3-1.5-0.3-2-1c-1.5-2.3-4-3.8-6.5-3.8c-4,0-7.6,3.3-7.8,7.3v0.3v0.3c0,0.8-0.5,1.5-1,1.8h-0.3
+			c-8.3-10.8-28.5-20.7-38.5-17.4c-8.1,2.8-4.3,42.6,4,53.4c1.5,2,2.8,3.5,3.8,4.5c-0.3,0.8-1,1.5-1.8,1.5c-1.3,0-2.5,0.5-3.5,1.3
+			c-5.3,5-2.3,12.1,3,13.4c0.8,0.3,1.5,1,1.5,1.8c0,0.8-0.5,1.8-1.3,2c-1,0.5-2,1-2.8,2c-4,5.8,0,12.3,5.5,12.3
+			c0.8,0,1.5,0.5,1.8,1.3c0.3,0.8,0.3,1.5-0.5,2c-1.5,1.5-2.3,3.5-2,5.5c0.3,2.8,2,5.3,4.8,6.5c1.5,0.8,3,0.8,4.5,0.5
+			c0.8-0.3,1.5,0,2,0.8c0.5,0.5,0.5,1.5,0.3,2c-0.8,1.5-1,3.3-0.5,5c0.8,2.8,2.8,4.8,5.5,5.5c2.5,0.5,4.3-0.3,5.5-0.8
+			c0.5-0.3-3.3,9.1-6,15.4c-0.8,2,1.3,4.3,3.5,3.3c8.3-3.8,22.2-10.3,22.2-9.8c0.5,5.3,6.5,9.1,12.3,5.3c1.3-0.8,2-2.3,2.3-3.5
+			c0.3-0.8,1-1.5,2-1.5c1,0,1.8,0.5,2,1.5c0.3,1.3,0.8,2.3,1.8,3c5.8,4.5,12.3,0.8,12.8-4.8c0-0.8,0.5-1.5,1.3-1.8
+			c0.8-0.3,1.5,0,2,0.5c1.5,1.5,3.3,2.5,5.3,2.5l0,0c2.5,0,5-1.3,6.5-3.8c1-1.5,1.3-3,1-5c0-0.8,0.3-1.5,0.8-2c0.5-0.5,1.5-0.5,2,0
+			c1.5,0.8,3.3,1.3,5,0.8c2.8-0.5,5-2.8,5.8-5.3c0.5-1.8,0.3-3.5-0.5-5.3c-0.3-0.8-0.3-1.5,0.3-2s1.3-0.8,2-0.8
+			c1.8,0.3,3.3,0.3,4.8-0.5c2.3-1,3.8-3,4.3-5.5c0.5-2.5-0.3-4.8-2-6.5c-0.5-0.5-0.8-1.3-0.5-2s1-1.3,1.8-1.3c1.8,0,3.8-0.5,5-2
+			c4.3-4.5,2.3-10.6-2.5-12.6c-0.8-0.3-1.3-1-1.3-2C150.1,95.8,150.8,95.1,151.6,95.1z"/>
+		<path class="st3" d="M131.4,42.2c0.5,1.5,0.5,3,0,4.5c-0.3,0.8,0,1.5,0.5,2s1.3,0.8,2,0.5c1-0.5,2-0.5,3-0.5c2.3,0,4.3,1,5.8,3
+			c1,1.3,1.8,3,1.5,4.8c0,1.5-0.5,2.8-1.3,4c-0.5,0.5-0.5,1.5,0,2c0.3,0.3,0.5,0.8,1,0.8c1-0.3,2-1,2.8-2c4.5-6.3,5.3-26.2,0.8-27.7
+			c-4.5-1.5-12.3,1.5-17.9,6C130.7,40.1,131.2,40.9,131.4,42.2z"/>
+		<path class="st3" d="M39,63.6c0.3-0.3,0.5-0.5,0.8-0.8c0.5-0.8,0.3-1.5,0-2C38.5,59,38.2,57,38.5,55c0.5-2.8,2.8-5,5.5-5.8
+			c1.5-0.5,3-0.3,4.5,0.3c0.8,0.3,1.5,0,2-0.5c0.5-0.5,0.8-1.3,0.5-2c-0.5-1.5-0.5-3,0-4.5c0.3-1,0.8-2,1.5-2.8
+			c-5.5-4.5-13.9-7.8-18.4-6.3S30.4,54.8,35,61.1C36,62.6,37.2,63.3,39,63.6z"/>
+		<g>
+			<circle class="st3" cx="60.9" cy="94.6" r="9.3"/>
+			<path class="st3" d="M100.7,94.6c0,5.3-4.3,9.3-9.3,9.3c-5.3,0-9.3-4.3-9.3-9.3S100.7,89.3,100.7,94.6z"/>
+			<circle class="st3" cx="121.6" cy="94.6" r="9.3"/>
+		</g>
+	</g>
+</g>
+</svg>

lib/components/avatar.dart

@@ -45,10 +45,12 @@ class Avatar extends StatelessWidget {
       ),
     );
     final noPic = mxContent == null || mxContent.toString().isEmpty;
+    final borderRadius = BorderRadius.circular(size / 2);
     return InkWell(
       onTap: onTap,
+      borderRadius: borderRadius,
       child: ClipRRect(
-        borderRadius: BorderRadius.circular(size / 2),
+        borderRadius: borderRadius,
         child: Container(
           width: size,
           height: size,
@@ -68,6 +70,11 @@ class Avatar extends StatelessWidget {
                       textWidget,
                     ],
                   ),
+                  errorWidget: (c, s, d) => Stack(
+                    children: [
+                      textWidget,
+                    ],
+                  ),
                 ),
         ),
       ),

lib/components/dialogs/send_file_dialog.dart

@@ -19,7 +19,7 @@ class SendFileDialog extends StatefulWidget {
 
 class _SendFileDialogState extends State<SendFileDialog> {
   bool origImage = false;
-
+  bool _isSending = false;
   Future<void> _send() async {
     var file = widget.file;
     if (file is MatrixImageFile && !origImage) {
@@ -82,10 +82,16 @@ class _SendFileDialogState extends State<SendFileDialog> {
         ),
         FlatButton(
           child: Text(L10n.of(context).send),
-          onPressed: () async {
-            await SimpleDialogs(context).tryRequestWithLoadingDialog(_send());
-            await Navigator.of(context).pop();
-          },
+          onPressed: _isSending
+              ? null
+              : () async {
+                  setState(() {
+                    _isSending = true;
+                  });
+                  await SimpleDialogs(context)
+                      .tryRequestWithLoadingDialog(_send());
+                  await Navigator.of(context).pop();
+                },
         ),
       ],
     );

lib/components/html_message.dart

@@ -33,6 +33,8 @@ class HtmlMessage extends StatelessWidget {
 
     // there is no need to pre-validate the html, as we validate it while rendering
 
+    final matrix = Matrix.of(context);
+
     final themeData = Theme.of(context);
     return Html(
       data: renderHtml,
@@ -50,12 +52,18 @@ class HtmlMessage extends StatelessWidget {
       getMxcUrl: (String mxc, double width, double height) {
         final ratio = MediaQuery.of(context).devicePixelRatio;
         return Uri.parse(mxc)?.getThumbnail(
-          Matrix.of(context).client,
+          matrix.client,
           width: (width ?? 800) * ratio,
           height: (height ?? 800) * ratio,
           method: ThumbnailMethod.scale,
         );
       },
+      setCodeLanguage: (String key, String value) async {
+        await matrix.store.setItem('code_language.$key', value);
+      },
+      getCodeLanguage: (String key) async {
+        return await matrix.store.getItem('code_language.$key');
+      },
       getPillInfo: (String identifier) async {
         if (room == null) {
           return null;

lib/components/list_items/participant_list_item.dart

@@ -7,60 +7,13 @@ import '../../views/chat.dart';
 import '../avatar.dart';
 import '../dialogs/simple_dialogs.dart';
 import '../matrix.dart';
+import '../user_bottom_sheet.dart';
 
 class ParticipantListItem extends StatelessWidget {
   final User user;
 
   const ParticipantListItem(this.user);
 
-  void participantAction(BuildContext context, String action) async {
-    switch (action) {
-      case 'ban':
-        if (await SimpleDialogs(context).askConfirmation()) {
-          await SimpleDialogs(context).tryRequestWithLoadingDialog(user.ban());
-        }
-        break;
-      case 'unban':
-        if (await SimpleDialogs(context).askConfirmation()) {
-          await SimpleDialogs(context)
-              .tryRequestWithLoadingDialog(user.unban());
-        }
-        break;
-      case 'kick':
-        if (await SimpleDialogs(context).askConfirmation()) {
-          await SimpleDialogs(context).tryRequestWithLoadingDialog(user.kick());
-        }
-        break;
-      case 'admin':
-        if (await SimpleDialogs(context).askConfirmation()) {
-          await SimpleDialogs(context)
-              .tryRequestWithLoadingDialog(user.setPower(100));
-        }
-        break;
-      case 'moderator':
-        if (await SimpleDialogs(context).askConfirmation()) {
-          await SimpleDialogs(context)
-              .tryRequestWithLoadingDialog(user.setPower(50));
-        }
-        break;
-      case 'user':
-        if (await SimpleDialogs(context).askConfirmation()) {
-          await SimpleDialogs(context)
-              .tryRequestWithLoadingDialog(user.setPower(0));
-        }
-        break;
-      case 'message':
-        final roomId = await user.startDirectChat();
-        await Navigator.of(context).pushAndRemoveUntil(
-            AppRoute.defaultRoute(
-              context,
-              ChatView(roomId),
-            ),
-            (Route r) => r.isFirst);
-        break;
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     var membershipBatch = <Membership, String>{
@@ -74,87 +27,43 @@ class ParticipantListItem extends StatelessWidget {
         : user.powerLevel >= 50
             ? L10n.of(context).moderator
             : '';
-    var items = <PopupMenuEntry<String>>[];
 
-    if (user.id != Matrix.of(context).client.userID) {
-      items.add(
-        PopupMenuItem(
-            child: Text(L10n.of(context).sendAMessage), value: 'message'),
-      );
-    }
-    if (user.canChangePowerLevel &&
-        user.room.ownPowerLevel == 100 &&
-        user.powerLevel != 100) {
-      items.add(
-        PopupMenuItem(
-            child: Text(L10n.of(context).makeAnAdmin), value: 'admin'),
-      );
-    }
-    if (user.canChangePowerLevel &&
-        user.room.ownPowerLevel >= 50 &&
-        user.powerLevel != 50) {
-      items.add(
-        PopupMenuItem(
-            child: Text(L10n.of(context).makeAModerator), value: 'moderator'),
-      );
-    }
-    if (user.canChangePowerLevel && user.powerLevel != 0) {
-      items.add(
-        PopupMenuItem(
-            child: Text(L10n.of(context).revokeAllPermissions), value: 'user'),
-      );
-    }
-    if (user.canKick) {
-      items.add(
-        PopupMenuItem(
-            child: Text(L10n.of(context).kickFromChat), value: 'kick'),
-      );
-    }
-    if (user.canBan && user.membership != Membership.ban) {
-      items.add(
-        PopupMenuItem(child: Text(L10n.of(context).banFromChat), value: 'ban'),
-      );
-    } else if (user.canBan && user.membership == Membership.ban) {
-      items.add(
-        PopupMenuItem(
-            child: Text(L10n.of(context).removeExile), value: 'unban'),
-      );
-    }
-    return PopupMenuButton(
-      onSelected: (action) => participantAction(context, action),
-      itemBuilder: (c) => items,
-      child: ListTile(
-        title: Row(
-          children: <Widget>[
-            Text(user.calcDisplayname()),
-            permissionBatch.isEmpty
-                ? Container()
-                : Container(
-                    padding: EdgeInsets.all(4),
-                    margin: EdgeInsets.symmetric(horizontal: 8),
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).secondaryHeaderColor,
-                      borderRadius: BorderRadius.circular(8),
-                    ),
-                    child: Center(child: Text(permissionBatch)),
+    return ListTile(
+      onTap: () => showModalBottomSheet(
+        context: context,
+        builder: (context) => UserBottomSheet(
+          user: user,
+        ),
+      ),
+      title: Row(
+        children: <Widget>[
+          Text(user.calcDisplayname()),
+          permissionBatch.isEmpty
+              ? Container()
+              : Container(
+                  padding: EdgeInsets.all(4),
+                  margin: EdgeInsets.symmetric(horizontal: 8),
+                  decoration: BoxDecoration(
+                    color: Theme.of(context).secondaryHeaderColor,
+                    borderRadius: BorderRadius.circular(8),
                   ),
-            membershipBatch[user.membership].isEmpty
-                ? Container()
-                : Container(
-                    padding: EdgeInsets.all(4),
-                    margin: EdgeInsets.symmetric(horizontal: 8),
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).secondaryHeaderColor,
-                      borderRadius: BorderRadius.circular(8),
-                    ),
-                    child:
-                        Center(child: Text(membershipBatch[user.membership])),
+                  child: Center(child: Text(permissionBatch)),
+                ),
+          membershipBatch[user.membership].isEmpty
+              ? Container()
+              : Container(
+                  padding: EdgeInsets.all(4),
+                  margin: EdgeInsets.symmetric(horizontal: 8),
+                  decoration: BoxDecoration(
+                    color: Theme.of(context).secondaryHeaderColor,
+                    borderRadius: BorderRadius.circular(8),
                   ),
-          ],
-        ),
-        subtitle: Text(user.id),
-        leading: Avatar(user.avatarUrl, user.calcDisplayname()),
+                  child: Center(child: Text(membershipBatch[user.membership])),
+                ),
+        ],
       ),
+      subtitle: Text(user.id),
+      leading: Avatar(user.avatarUrl, user.calcDisplayname()),
     );
   }
 }

lib/components/list_items/status_list_item.dart

@@ -1,84 +0,0 @@
-import 'package:famedlysdk/famedlysdk.dart';
-import 'package:flutter/material.dart';
-
-import '../../utils/user_status.dart';
-import '../../views/status_view.dart';
-import '../avatar.dart';
-import '../matrix.dart';
-
-class StatusListItem extends StatelessWidget {
-  final UserStatus status;
-
-  const StatusListItem(this.status, {Key key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final client = Matrix.of(context).client;
-    return FutureBuilder<Profile>(
-        future: client.getProfileFromUserId(status.userId),
-        builder: (context, snapshot) {
-          final profile =
-              snapshot.data ?? Profile(status.userId.localpart, null);
-          return InkWell(
-            borderRadius: BorderRadius.circular(8),
-            onTap: () => Navigator.of(context).push(
-              MaterialPageRoute(
-                builder: (_) => StatusView(
-                  status: status,
-                  avatarUrl: profile.avatarUrl,
-                  displayname: profile.displayname,
-                ),
-              ),
-            ),
-            child: Container(
-              width: 76,
-              child: Column(
-                children: <Widget>[
-                  SizedBox(height: 10),
-                  Container(
-                    child: Stack(
-                      children: [
-                        Avatar(profile.avatarUrl, profile.displayname),
-                        Positioned(
-                          bottom: 0,
-                          right: 0,
-                          child: Container(
-                            width: 10,
-                            height: 10,
-                            decoration: BoxDecoration(
-                              borderRadius: BorderRadius.circular(20),
-                              color: Colors.green,
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                    decoration: BoxDecoration(
-                      border: Border.all(
-                        width: 1,
-                        color: Theme.of(context).primaryColor,
-                      ),
-                      borderRadius: BorderRadius.circular(80),
-                    ),
-                    padding: EdgeInsets.all(2),
-                  ),
-                  Padding(
-                    padding:
-                        const EdgeInsets.only(left: 6.0, top: 0.0, right: 6.0),
-                    child: Text(
-                      profile.displayname.trim().split(' ').first,
-                      overflow: TextOverflow.clip,
-                      maxLines: 1,
-                      style: TextStyle(
-                        color: Theme.of(context).textTheme.bodyText2.color,
-                        fontSize: 13,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          );
-        });
-  }
-}

lib/components/matrix.dart

@@ -82,8 +82,7 @@ class MatrixState extends State<Matrix> {
   void clean() async {
     if (!kIsWeb) return;
 
-    final storage = await getLocalStorage();
-    await storage.deleteItem(widget.clientName);
+    await store.deleteItem(widget.clientName);
   }
 
   void _initWithStore() async {
@@ -93,7 +92,6 @@ class MatrixState extends State<Matrix> {
       await client.connect();
       final firstLoginState = await initLoginState;
       if (firstLoginState == LoginState.logged) {
-        _cleanUpUserStatus(userStatuses);
         if (PlatformInfos.isMobile) {
           await FirebaseController.setupFirebase(
             this,
@@ -124,7 +122,6 @@ class MatrixState extends State<Matrix> {
   StreamSubscription onNotification;
   StreamSubscription<html.Event> onFocusSub;
   StreamSubscription<html.Event> onBlurSub;
-  StreamSubscription onPresenceSub;
 
   void onJitsiCall(EventUpdate eventUpdate) {
     final event = Event.fromJson(
@@ -247,12 +244,9 @@ class MatrixState extends State<Matrix> {
           importantStateEvents: <String>{
             'im.ponies.room_emotes', // we want emotes to work properly
           });
-      onPresenceSub ??= client.onPresence.stream
-          .where((p) => p.isUserStatus)
-          .listen(_storeUserStatus);
       onJitsiCallSub ??= client.onEvent.stream
           .where((e) =>
-              e.type == 'timeline' &&
+              e.type == EventUpdateType.timeline &&
               e.eventType == 'm.room.message' &&
               e.content['content']['msgtype'] == Matrix.callNamespace &&
               e.content['sender'] != client.userID)
@@ -331,7 +325,7 @@ class MatrixState extends State<Matrix> {
         html.Notification.requestPermission();
         onNotification ??= client.onEvent.stream
             .where((e) =>
-                e.type == 'timeline' &&
+                e.type == EventUpdateType.timeline &&
                 [EventTypes.Message, EventTypes.Sticker, EventTypes.Encrypted]
                     .contains(e.eventType) &&
                 e.content['sender'] != client.userID)
@@ -341,64 +335,11 @@ class MatrixState extends State<Matrix> {
     super.initState();
   }
 
-  List<UserStatus> get userStatuses {
-    try {
-      return (client.accountData[userStatusesType].content['user_statuses']
-              as List)
-          .map((json) => UserStatus.fromJson(json))
-          .toList();
-    } catch (_) {}
-    return [];
-  }
-
-  void _storeUserStatus(Presence presence) {
-    final tmpUserStatuses = List<UserStatus>.from(userStatuses);
-    final currentStatusIndex =
-        userStatuses.indexWhere((u) => u.userId == presence.senderId);
-    final newUserStatus = UserStatus()
-      ..receivedAt = DateTime.now().millisecondsSinceEpoch
-      ..statusMsg = presence.presence.statusMsg
-      ..userId = presence.senderId;
-    if (currentStatusIndex == -1) {
-      tmpUserStatuses.add(newUserStatus);
-    } else if (tmpUserStatuses[currentStatusIndex].statusMsg !=
-        presence.presence.statusMsg) {
-      if (presence.presence.statusMsg.trim().isEmpty) {
-        tmpUserStatuses.removeAt(currentStatusIndex);
-      } else {
-        tmpUserStatuses[currentStatusIndex] = newUserStatus;
-      }
-    } else {
-      return;
-    }
-    _cleanUpUserStatus(tmpUserStatuses);
-  }
-
-  void _cleanUpUserStatus(List<UserStatus> tmpUserStatuses) {
-    final now = DateTime.now().millisecondsSinceEpoch;
-    tmpUserStatuses
-        .removeWhere((u) => (now - u.receivedAt) > (1000 * 60 * 60 * 24));
-    tmpUserStatuses.sort((a, b) => b.receivedAt.compareTo(a.receivedAt));
-    if (tmpUserStatuses.length > 40) {
-      tmpUserStatuses.removeRange(40, tmpUserStatuses.length);
-    }
-    if (tmpUserStatuses != userStatuses) {
-      client.setAccountData(
-        client.userID,
-        userStatusesType,
-        {
-          'user_statuses': tmpUserStatuses.map((i) => i.toJson()).toList(),
-        },
-      );
-    }
-  }
-
   @override
   void dispose() {
     onRoomKeyRequestSub?.cancel();
     onKeyVerificationRequestSub?.cancel();
     onJitsiCallSub?.cancel();
-    onPresenceSub?.cancel();
     onNotification?.cancel();
     onFocusSub?.cancel();
     onBlurSub?.cancel();

lib/components/theme_switcher.dart

@@ -175,7 +175,7 @@ class ThemeSwitcherWidgetState extends State<ThemeSwitcherWidget> {
   BuildContext context;
 
   Future loadSelection(MatrixState matrix) async {
-    String item = await matrix.store.getItem('theme') ?? 'system';
+    var item = await matrix.store.getItem('theme') ?? 'system';
     selectedTheme = Themes.values.firstWhere(
         (e) => e.toString() == 'Themes.' + item,
         orElse: () => Themes.system);

lib/components/user_bottom_sheet.dart

@@ -0,0 +1,188 @@
+import 'dart:math';
+
+import 'package:famedlysdk/famedlysdk.dart';
+import 'package:fluffychat/components/adaptive_page_layout.dart';
+import 'package:fluffychat/utils/app_route.dart';
+import 'package:fluffychat/utils/fluffy_share.dart';
+import 'package:fluffychat/views/chat.dart';
+import 'package:flutter/material.dart';
+import 'content_banner.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
+import '../utils/presence_extension.dart';
+import 'dialogs/simple_dialogs.dart';
+import 'matrix.dart';
+
+class UserBottomSheet extends StatelessWidget {
+  final User user;
+  final Function onMention;
+
+  const UserBottomSheet({Key key, @required this.user, this.onMention})
+      : super(key: key);
+
+  void participantAction(BuildContext context, String action) async {
+    switch (action) {
+      case 'mention':
+        Navigator.of(context).pop();
+        onMention();
+        break;
+      case 'ban':
+        if (await SimpleDialogs(context).askConfirmation()) {
+          await SimpleDialogs(context).tryRequestWithLoadingDialog(user.ban());
+        }
+        break;
+      case 'unban':
+        if (await SimpleDialogs(context).askConfirmation()) {
+          await SimpleDialogs(context)
+              .tryRequestWithLoadingDialog(user.unban());
+        }
+        break;
+      case 'kick':
+        if (await SimpleDialogs(context).askConfirmation()) {
+          await SimpleDialogs(context).tryRequestWithLoadingDialog(user.kick());
+        }
+        break;
+      case 'admin':
+        if (await SimpleDialogs(context).askConfirmation()) {
+          await SimpleDialogs(context)
+              .tryRequestWithLoadingDialog(user.setPower(100));
+        }
+        break;
+      case 'moderator':
+        if (await SimpleDialogs(context).askConfirmation()) {
+          await SimpleDialogs(context)
+              .tryRequestWithLoadingDialog(user.setPower(50));
+        }
+        break;
+      case 'user':
+        if (await SimpleDialogs(context).askConfirmation()) {
+          await SimpleDialogs(context)
+              .tryRequestWithLoadingDialog(user.setPower(0));
+        }
+        break;
+      case 'message':
+        final roomId = await user.startDirectChat();
+        await Navigator.of(context).pushAndRemoveUntil(
+            AppRoute.defaultRoute(
+              context,
+              ChatView(roomId),
+            ),
+            (Route r) => r.isFirst);
+        break;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final presence = Matrix.of(context).client.presences[user.id];
+    var items = <PopupMenuEntry<String>>[];
+
+    if (onMention != null) {
+      items.add(
+        PopupMenuItem(child: Text(L10n.of(context).mention), value: 'mention'),
+      );
+    }
+    if (user.id != Matrix.of(context).client.userID) {
+      items.add(
+        PopupMenuItem(
+            child: Text(L10n.of(context).sendAMessage), value: 'message'),
+      );
+    }
+    if (user.canChangePowerLevel &&
+        user.room.ownPowerLevel == 100 &&
+        user.powerLevel != 100) {
+      items.add(
+        PopupMenuItem(
+            child: Text(L10n.of(context).makeAnAdmin), value: 'admin'),
+      );
+    }
+    if (user.canChangePowerLevel &&
+        user.room.ownPowerLevel >= 50 &&
+        user.powerLevel != 50) {
+      items.add(
+        PopupMenuItem(
+            child: Text(L10n.of(context).makeAModerator), value: 'moderator'),
+      );
+    }
+    if (user.canChangePowerLevel && user.powerLevel != 0) {
+      items.add(
+        PopupMenuItem(
+            child: Text(L10n.of(context).revokeAllPermissions), value: 'user'),
+      );
+    }
+    if (user.canKick) {
+      items.add(
+        PopupMenuItem(
+            child: Text(L10n.of(context).kickFromChat), value: 'kick'),
+      );
+    }
+    if (user.canBan && user.membership != Membership.ban) {
+      items.add(
+        PopupMenuItem(child: Text(L10n.of(context).banFromChat), value: 'ban'),
+      );
+    } else if (user.canBan && user.membership == Membership.ban) {
+      items.add(
+        PopupMenuItem(
+            child: Text(L10n.of(context).removeExile), value: 'unban'),
+      );
+    }
+    return Center(
+      child: Container(
+        width: min(MediaQuery.of(context).size.width,
+            AdaptivePageLayout.defaultMinWidth * 1.5),
+        child: SafeArea(
+          child: Material(
+            elevation: 4,
+            child: Scaffold(
+              extendBodyBehindAppBar: true,
+              appBar: AppBar(
+                elevation: 0,
+                backgroundColor:
+                    Theme.of(context).scaffoldBackgroundColor.withOpacity(0.5),
+                leading: IconButton(
+                  icon: Icon(Icons.arrow_downward_outlined),
+                  onPressed: Navigator.of(context).pop,
+                ),
+                title: Text(user.calcDisplayname()),
+                actions: [
+                  if (user.id != Matrix.of(context).client.userID)
+                    PopupMenuButton(
+                      itemBuilder: (_) => items,
+                      onSelected: (action) =>
+                          participantAction(context, action),
+                    ),
+                ],
+              ),
+              body: Column(
+                children: [
+                  Expanded(
+                    child: ContentBanner(
+                      user.avatarUrl,
+                      defaultIcon: Icons.person_outline,
+                    ),
+                  ),
+                  ListTile(
+                    title: Text(L10n.of(context).username),
+                    subtitle: Text(user.id),
+                    trailing: Icon(Icons.share),
+                    onTap: () => FluffyShare.share(user.id, context),
+                  ),
+                  if (presence != null)
+                    ListTile(
+                      title: Text(presence.getLocalizedStatusMessage(context)),
+                      subtitle:
+                          Text(presence.getLocalizedLastActiveAgo(context)),
+                      trailing: Icon(Icons.circle,
+                          color: presence.presence.currentlyActive
+                              ? Colors.green
+                              : Colors.grey),
+                    ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/l10n/intl_en.arb

@@ -920,6 +920,11 @@
     "type": "text",
     "placeholders": {}
   },
+  "mention": "Mention",
+  "@mention": {
+    "type": "text",
+    "placeholders": {}
+  },
   "messageWillBeRemovedWarning": "Message will be removed for all participants",
   "@messageWillBeRemovedWarning": {
     "type": "text",
@@ -1017,6 +1022,21 @@
     "type": "text",
     "placeholders": {}
   },
+  "online": "Online",
+  "@online": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "offline": "Offline",
+  "@offline": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "unavailable": "Unavailable",
+  "@unavailable": {
+    "type": "text",
+    "placeholders": {}
+  },
   "onlineKeyBackupEnabled": "Online Key Backup is enabled",
   "@onlineKeyBackupEnabled": {
     "type": "text",

lib/l10n/intl_eo.arb

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

lib/l10n/intl_it.arb

@@ -461,5 +461,122 @@
   "@askSSSSCache": {
     "type": "text",
     "placeholders": {}
+  },
+  "enterAUsername": "Inserisci un username",
+  "@enterAUsername": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "enterAGroupName": "Inserisci un nome del gruppo",
+  "@enterAGroupName": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "endedTheCall": "{senderName} è entrato in chiamata",
+  "@endedTheCall": {
+    "type": "text",
+    "placeholders": {
+      "senderName": {}
+    }
+  },
+  "end2endEncryptionSettings": "Impostazioni crittografia end-to-end",
+  "@end2endEncryptionSettings": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "encryptionNotEnabled": "Crittografia non abilitata",
+  "@encryptionNotEnabled": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "encryptionAlgorithm": "Algoritmo crittografia",
+  "@encryptionAlgorithm": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "encryption": "Crittografia",
+  "@encryption": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "enableEncryptionWarning": "Non potrai disabilitare la crittografia in futuro. Sei sicuro?",
+  "@enableEncryptionWarning": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "enableEmotesGlobally": "Abilita i pacchetti emotes globalmente",
+  "@enableEmotesGlobally": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "emptyChat": "Chat vuota",
+  "@emptyChat": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "emotePacks": "Pacchetti emotes della stanza",
+  "@emotePacks": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "emoteInvalid": "Shortcode emote invalido!",
+  "@emoteInvalid": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "emoteExists": "L'emote già esiste!",
+  "@emoteExists": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "emoteWarnNeedToPick": "Devi scegliere uno shortcode emote e aggiungere un immagine!",
+  "@emoteWarnNeedToPick": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "emoteShortcode": "Shortcode Emotes",
+  "@emoteShortcode": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "emoteSettings": "Impostazioni Emotes",
+  "@emoteSettings": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "editDisplayname": "Modifica nominativo",
+  "@editDisplayname": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "downloadFile": "Scarica file",
+  "@downloadFile": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "displaynameHasBeenChanged": "Il nominativo è stato cambiato",
+  "@displaynameHasBeenChanged": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "discardPicture": "Rimuovi immagine",
+  "@discardPicture": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "devices": "Dispositivi",
+  "@devices": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "device": "Dispositivo",
+  "@device": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "deny": "Declina",
+  "@deny": {
+    "type": "text",
+    "placeholders": {}
   }
 }

lib/l10n/intl_ru.arb

@@ -1733,7 +1733,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "deactivateAccountWarning": "Это деактивирует вашу учётную запись пользователя. Это не может быть отменено! Вы уверены?",
+  "deactivateAccountWarning": "Это деактивирует вашу учётную запись пользователя. Данное действие не может быть отменено! Вы уверены?",
   "@deactivateAccountWarning": {
     "type": "text",
     "placeholders": {}
@@ -1743,12 +1743,12 @@
     "type": "text",
     "placeholders": {}
   },
-  "enableEmotesGlobally": "Включить набор эмоджи глобально",
+  "enableEmotesGlobally": "Включить набор эмодзи глобально",
   "@enableEmotesGlobally": {
     "type": "text",
     "placeholders": {}
   },
-  "emotePacks": "Наборы эмоджи для комнаты",
+  "emotePacks": "Наборы эмодзи для комнаты",
   "@emotePacks": {
     "type": "text",
     "placeholders": {}

lib/l10n/intl_tr.arb

@@ -137,7 +137,7 @@
       "targetName": {}
     }
   },
-  "blockDevice": "Cihazı Engelle",
+  "blockDevice": "Aygıtı Engelle",
   "@blockDevice": {
     "type": "text",
     "placeholders": {}
@@ -323,12 +323,12 @@
     "type": "text",
     "placeholders": {}
   },
-  "compareEmojiMatch": "Karşılaştırın ve aşağıdaki emojilerin diğer cihazdakilerle eşleştiğinden emin olun:",
+  "compareEmojiMatch": "Karşılaştırın ve aşağıdaki emojilerin diğer aygıttaki emojilerle eşleştiğinden emin olun:",
   "@compareEmojiMatch": {
     "type": "text",
     "placeholders": {}
   },
-  "compareNumbersMatch": "Karşılaştırın ve aşağıdaki numaraların diğer cihazdakilerle eşleştiğinden emin olun:",
+  "compareNumbersMatch": "Karşılaştırın ve aşağıdaki numaraların diğer aygıttaki numaralarla eşleştiğinden emin olun:",
   "@compareNumbersMatch": {
     "type": "text",
     "placeholders": {}
@@ -474,12 +474,12 @@
     "type": "text",
     "placeholders": {}
   },
-  "device": "Cihaz",
+  "device": "Aygıt",
   "@device": {
     "type": "text",
     "placeholders": {}
   },
-  "devices": "Cihazlar",
+  "devices": "Aygıtlar",
   "@devices": {
     "type": "text",
     "placeholders": {}
@@ -727,7 +727,7 @@
       "link": {}
     }
   },
-  "isDeviceKeyCorrect": "Aşağıdaki cihaz anahtarı doğru mu?",
+  "isDeviceKeyCorrect": "Aşağıdaki aygıt anahtarı doğru mu?",
   "@isDeviceKeyCorrect": {
     "type": "text",
     "placeholders": {}
@@ -983,7 +983,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "participatingUserDevices": "Katılan kullanıcı cihazları",
+  "participatingUserDevices": "Katılan kullanıcı aygıtları",
   "@participatingUserDevices": {
     "type": "text",
     "placeholders": {}
@@ -1069,7 +1069,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "removeAllOtherDevices": "Diğer tüm cihazları kaldır",
+  "removeAllOtherDevices": "Diğer tüm aygıtları kaldır",
   "@removeAllOtherDevices": {
     "type": "text",
     "placeholders": {}
@@ -1081,7 +1081,7 @@
       "username": {}
     }
   },
-  "removeDevice": "Cihazı kaldır",
+  "removeDevice": "Aygıtı kaldır",
   "@removeDevice": {
     "type": "text",
     "placeholders": {}
@@ -1355,12 +1355,12 @@
       "targetName": {}
     }
   },
-  "unblockDevice": "Cihazın Engellemesini Kaldır",
+  "unblockDevice": "Aygıtın Engellemesini Kaldır",
   "@unblockDevice": {
     "type": "text",
     "placeholders": {}
   },
-  "unknownDevice": "Bilinmeyen cihaz",
+  "unknownDevice": "Bilinmeyen aygıt",
   "@unknownDevice": {
     "type": "text",
     "placeholders": {}
@@ -1718,7 +1718,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "changeDeviceName": "Cihaz adını değiştir",
+  "changeDeviceName": "Aygıt adını değiştir",
   "@changeDeviceName": {
     "type": "text",
     "placeholders": {}

lib/l10n/intl_vi.arb

@@ -0,0 +1,98 @@
+{
+  "blockDevice": "Thiết bị bị chặn",
+  "@blockDevice": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "askSSSSCache": "Vui lòng nhập cụm mật khẩu hoặc khóa khôi phục để lưu khóa vào bộ nhớ cache.",
+  "@askSSSSCache": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "areYouSure": "Bạn chắc chứ?",
+  "@areYouSure": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "areGuestsAllowedToJoin": "Khách vãng lai có được tham gia không",
+  "@areGuestsAllowedToJoin": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "archivedRoom": "Phòng hội thảo đã lưu trữ",
+  "@archivedRoom": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "archive": "Lưu trữ",
+  "@archive": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "anyoneCanJoin": "Mọi người đều có thể gia nhập",
+  "@anyoneCanJoin": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "answeredTheCall": "{senderName} đã trả lời cuộc gọi",
+  "@answeredTheCall": {
+    "type": "text",
+    "placeholders": {
+      "senderName": {}
+    }
+  },
+  "alreadyHaveAnAccount": "Bạn đã có tài khoản?",
+  "@alreadyHaveAnAccount": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "alias": "bí danh",
+  "@alias": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "admin": "Quản trị viên",
+  "@admin": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "addGroupDescription": "Thêm mô tả cho nhóm",
+  "@addGroupDescription": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "activatedEndToEndEncryption": "{username} đã kích hoạt mã hóa đầu cuối 2 chiều",
+  "@activatedEndToEndEncryption": {
+    "type": "text",
+    "placeholders": {
+      "username": {}
+    }
+  },
+  "accountInformation": "Thông tin tài khoản",
+  "@accountInformation": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "account": "Tài khoản",
+  "@account": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "acceptedTheInvitation": "{username} đã đồng ý lời mời",
+  "@acceptedTheInvitation": {
+    "type": "text",
+    "placeholders": {
+      "username": {}
+    }
+  },
+  "accept": "Đồng ý",
+  "@accept": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "about": "Giới thiệu",
+  "@about": {
+    "type": "text",
+    "placeholders": {}
+  }
+}

lib/utils/famedlysdk_store.dart

@@ -1,27 +1,12 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:core';
-
-import 'package:famedlysdk/famedlysdk.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import '../famedlysdk.dart';
+import './platform_infos.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:localstorage/localstorage.dart';
-import 'package:olm/olm.dart' as olm; // needed for migration
 import 'package:path_provider/path_provider.dart';
-import 'package:random_string/random_string.dart';
-
+import 'dart:async';
+import 'dart:core';
 import './database/shared.dart';
-import 'platform_infos.dart';
-
-Future<LocalStorage> getLocalStorage() async {
-  final directory = PlatformInfos.isBetaDesktop
-      ? await getApplicationSupportDirectory()
-      : (PlatformInfos.isWeb ? null : await getApplicationDocumentsDirectory());
-  final localStorage = LocalStorage('LocalStorage', directory?.path);
-  await localStorage.ready;
-  return localStorage;
-}
+import 'package:random_string/random_string.dart';
 
 Future<Database> getDatabase(Client client) async {
   while (_generateDatabaseLock) {
@@ -32,9 +17,9 @@ Future<Database> getDatabase(Client client) async {
     if (_db != null) return _db;
     final store = Store();
     var password = await store.getItem('database-password');
-    var needMigration = false;
+    var newPassword = false;
     if (password == null || password.isEmpty) {
-      needMigration = true;
+      newPassword = true;
       password = randomString(255);
     }
     _db = await constructDb(
@@ -42,11 +27,7 @@ Future<Database> getDatabase(Client client) async {
       filename: 'moor.sqlite',
       password: password,
     );
-    // Check if database is open:
-    debugPrint((await _db.customSelect('SELECT 1').get()).toString());
-    if (needMigration) {
-      debugPrint('[Moor] Start migration');
-      await migrate(client.clientName, _db, store);
+    if (newPassword) {
       await store.setItem('database-password', password);
     }
     return _db;
@@ -58,239 +39,54 @@ Future<Database> getDatabase(Client client) async {
 Database _db;
 bool _generateDatabaseLock = false;
 
-Future<void> migrate(String clientName, Database db, Store store) async {
-  debugPrint('[Store] attempting old migration to moor...');
-  final oldKeys = await store.getAllItems();
-  if (oldKeys == null || oldKeys.isEmpty) {
-    debugPrint('[Store] empty store!');
-    return; // we are done!
-  }
-  final credentialsStr = oldKeys[clientName];
-  if (credentialsStr == null || credentialsStr.isEmpty) {
-    debugPrint('[Store] no credentials found!');
-    return; // no credentials
-  }
-  final Map<String, dynamic> credentials = json.decode(credentialsStr);
-  if (!credentials.containsKey('homeserver') ||
-      !credentials.containsKey('token') ||
-      !credentials.containsKey('userID')) {
-    debugPrint('[Store] invalid credentials!');
-    return; // invalid old store, we are done, too!
-  }
-  var clientId = 0;
-  final oldClient = await db.getClient(clientName);
-  if (oldClient == null) {
-    clientId = await db.insertClient(
-      clientName,
-      credentials['homeserver'],
-      credentials['token'],
-      credentials['userID'],
-      credentials['deviceID'],
-      credentials['deviceName'],
-      null,
-      credentials['olmAccount'],
-    );
-  } else {
-    clientId = oldClient.clientId;
-    await db.updateClient(
-      credentials['homeserver'],
-      credentials['token'],
-      credentials['userID'],
-      credentials['deviceID'],
-      credentials['deviceName'],
-      null,
-      credentials['olmAccount'],
-      clientId,
-    );
-  }
-  await db.clearCache(clientId);
-  debugPrint('[Store] Inserted/updated client, clientId = ${clientId}');
-  await db.transaction(() async {
-    // alright, we stored / updated the client and have the account ID, time to import everything else!
-    // user_device_keys and user_device_keys_key
-    debugPrint('[Store] Migrating user device keys...');
-    final deviceKeysListString = oldKeys['${clientName}.user_device_keys'];
-    if (deviceKeysListString != null && deviceKeysListString.isNotEmpty) {
-      Map<String, dynamic> rawUserDeviceKeys =
-          json.decode(deviceKeysListString);
-      for (final entry in rawUserDeviceKeys.entries) {
-        final map = entry.value;
-        await db.storeUserDeviceKeysInfo(
-            clientId, map['user_id'], map['outdated']);
-        for (final rawKey in map['device_keys'].entries) {
-          final jsonVaue = rawKey.value;
-          await db.storeUserDeviceKey(
-              clientId,
-              jsonVaue['user_id'],
-              jsonVaue['device_id'],
-              json.encode(jsonVaue),
-              jsonVaue['verified'],
-              jsonVaue['blocked']);
-        }
-      }
-    }
-    for (final entry in oldKeys.entries) {
-      final key = entry.key;
-      final value = entry.value;
-      if (value == null || value.isEmpty) {
-        continue;
-      }
-      // olm_sessions
-      final olmSessionsMatch =
-          RegExp(r'^\/clients\/([^\/]+)\/olm-sessions$').firstMatch(key);
-      if (olmSessionsMatch != null) {
-        if (olmSessionsMatch[1] != credentials['deviceID']) {
-          continue;
-        }
-        debugPrint('[Store] migrating olm sessions...');
-        final identityKey = json.decode(value);
-        for (final olmKey in identityKey.entries) {
-          final identKey = olmKey.key;
-          final sessions = olmKey.value;
-          for (final pickle in sessions) {
-            var sess = olm.Session();
-            sess.unpickle(credentials['userID'], pickle);
-            await db.storeOlmSession(
-                clientId, identKey, sess.session_id(), pickle, null);
-            sess?.free();
-          }
-        }
-      }
-      // outbound_group_sessions
-      final outboundGroupSessionsMatch = RegExp(
-              r'^\/clients\/([^\/]+)\/rooms\/([^\/]+)\/outbound_group_session$')
-          .firstMatch(key);
-      if (outboundGroupSessionsMatch != null) {
-        if (outboundGroupSessionsMatch[1] != credentials['deviceID']) {
-          continue;
-        }
-        final pickle = value;
-        final roomId = outboundGroupSessionsMatch[2];
-        debugPrint(
-            '[Store] Migrating outbound group sessions for room ${roomId}...');
-        final devicesString = oldKeys[
-            '/clients/${outboundGroupSessionsMatch[1]}/rooms/${roomId}/outbound_group_session_devices'];
-        var devices = <String>[];
-        if (devicesString != null) {
-          devices = List<String>.from(json.decode(devicesString));
-        }
-        await db.storeOutboundGroupSession(
-          clientId,
-          roomId,
-          pickle,
-          json.encode(devices),
-          DateTime.now().millisecondsSinceEpoch,
-          0,
-        );
-      }
-      // session_keys
-      final sessionKeysMatch =
-          RegExp(r'^\/clients\/([^\/]+)\/rooms\/([^\/]+)\/session_keys$')
-              .firstMatch(key);
-      if (sessionKeysMatch != null) {
-        if (sessionKeysMatch[1] != credentials['deviceID']) {
-          continue;
-        }
-        final roomId = sessionKeysMatch[2];
-        debugPrint('[Store] Migrating session keys for room ${roomId}...');
-        final map = json.decode(value);
-        for (final entry in map.entries) {
-          await db.storeInboundGroupSession(
-              clientId,
-              roomId,
-              entry.key,
-              entry.value['inboundGroupSession'],
-              json.encode(entry.value['content']),
-              json.encode(entry.value['indexes']),
-              null,
-              null);
-        }
-      }
-    }
-  });
-}
-
-// see https://github.com/mogol/flutter_secure_storage/issues/161#issuecomment-704578453
-class AsyncMutex {
-  Completer<void> _completer;
-
-  Future<void> lock() async {
-    while (_completer != null) {
-      await _completer.future;
-    }
-
-    _completer = Completer<void>();
-  }
-
-  void unlock() {
-    assert(_completer != null);
-    final completer = _completer;
-    _completer = null;
-    completer.complete();
-  }
-}
-
 class Store {
-  final LocalStorage storage;
+  LocalStorage storage;
   final FlutterSecureStorage secureStorage;
-  static final _mutex = AsyncMutex();
 
   Store()
-      : storage = LocalStorage('LocalStorage'),
-        secureStorage = PlatformInfos.isMobile ? FlutterSecureStorage() : null;
+      : secureStorage = PlatformInfos.isMobile ? FlutterSecureStorage() : null;
 
-  Future<dynamic> getItem(String key) async {
-    if (!PlatformInfos.isMobile) {
+  Future<void> _setupLocalStorage() async {
+    if (storage == null) {
+      final directory = PlatformInfos.isBetaDesktop
+          ? await getApplicationSupportDirectory()
+          : (PlatformInfos.isWeb
+              ? null
+              : await getApplicationDocumentsDirectory());
+      storage = LocalStorage('LocalStorage', directory?.path);
       await storage.ready;
+    }
+  }
+
+  Future<String> getItem(String key) async {
+    if (!PlatformInfos.isMobile) {
+      await _setupLocalStorage();
       try {
-        return await storage.getItem(key);
+        return await storage.getItem(key)?.toString();
       } catch (_) {
         return null;
       }
     }
     try {
-      await _mutex.lock();
       return await secureStorage.read(key: key);
     } catch (_) {
       return null;
-    } finally {
-      _mutex.unlock();
     }
   }
 
   Future<void> setItem(String key, String value) async {
     if (!PlatformInfos.isMobile) {
-      await storage.ready;
+      await _setupLocalStorage();
       return await storage.setItem(key, value);
     }
-    if (value == null) {
-      return await secureStorage.delete(key: key);
-    } else {