Merge branch 'trunk' into russian

Reviewed-on: cwtch.im/cwtch-ui#243

README.md

@@ -28,7 +28,7 @@ Cwtch processes the following environment variables:
 First you will need a valid [flutter sdk installation](https://flutter.dev/docs/get-started/install).
 You will probably want to disable Analytics on the Flutter Tool: `flutter config --no-analytics`
 
-This project uses the flutter `stable` channel
+This project uses the flutter `dev` channel, which you will need to switch to: `flutter channel dev; flutter upgrade`.
 
 Once flutter is set up, run `flutter pub get` from this project folder to fetch dependencies.
 
@@ -42,20 +42,17 @@ To build a release version and load normal profiles, use `build-release.sh X` in
 - set `LD_LIBRARY_PATH="$PWD/linux"`
 - copy a `tor` binary to `linux/` or run `fetch-tor.sh` to download one
 - run `flutter config --enable-linux-desktop` if you've never done so before
-- optional: launch cwtch-ui debug build by running `flutter run -d linux`
+- optional: launch cwtch-ui directly by running `flutter run -d linux`
 - to build cwtch-ui, run `flutter build linux`
-- optional: launch cwtch-ui release build with `env LD_LIBRARY_PATH=linux ./build/linux/x64/release/bundle/cwtch`
+- optional: launch cwtch-ui build with `env LD_LIBRARY_PATH=linux ./build/linux/x64/release/bundle/cwtch`
 - to package the build, run `linux/package-release.sh`
 
 ### Building on Windows (for Windows)
 
 - copy `libCwtch.dll` to `windows/`, or run `fetch-libcwtch-go.ps1` to download it
 - run `fetch-tor-win.ps1` to fetch Tor for windows
-- optional: launch cwtch-ui debug build by running `flutter run -d windows`
+- optional: launch cwtch-ui directly by running `flutter run -d windows`
 - to build cwtch-ui, run `flutter build windows`
-- optional: to run the release build:
-	- `cp windows/libCwtch.dll .`
-	- `./build/windows/runner/Release/cwtch.exe`
 
 ### Building on Linux/Windows (for Android)
 
@@ -68,8 +65,10 @@ To build a release version and load normal profiles, use `build-release.sh X` in
 - copy `libCwtch.dylib` into the root folder, or run `fetch-libcwtch-go-macos.sh` to download it
 - run `fetch-tor-macos.sh` to fetch Tor or Download and install Tor Browser and `cp -r /Applications/Tor\ Browser.app/Contents/MacOS/Tor ./macos/`
 - `flutter build macos`
-- optional: launch cwtch-ui release build with `./build/macos/Build/Products/Release/Cwtch.app/Contents/MacOS/Cwtch`
-- To package the UI: `./macos/package-release.sh`, which results in a Cwtch.dmg that has libCwtch.dylib and tor in it as well and can be installed into Applications
+- optional: launch cwtch-ui build with `./build/linux/x64/release/bundle/cwtch`
+- `./macos/package-release.sh`
+
+results in a Cwtch.dmg that has libCwtch.dylib and tor in it as well and can be installed into Applications
 
 ### Known Platform Issues
 

android/app/src/main/AndroidManifest.xml

@@ -48,11 +48,4 @@
 
     <!--Meeded to check if activity is foregrounded or if messages from the service should be queued-->
     <uses-permission android:name="android.permission.GET_TASKS" />
-
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="https" />
-        </intent>
-    </queries>
 </manifest>

lib/l10n/intl_ru.arb

@@ -142,7 +142,7 @@
     "addNewItem": "Добавить новый элемент в список",
     "todoPlaceholder": "Выполняю...",
     "newConnectionPaneTitle": "Новое соединение",
-    "networkStatusOnline": "Online",
+    "networkStatusOnline": "В сети",
     "networkStatusAttemptingTor": "Попытка подключиться к сети Tor",
     "networkStatusDisconnected": "Нет сети. Проверьте подключение к интернету",
     "viewGroupMembershipTooltip": "Просмотр членства в группе",
@@ -188,20 +188,20 @@
     "noPasswordWarning": "Отсутствие пароля в этой учетной записи означает, что все данные, хранящиеся локально, не будут зашифрованы",
     "radioNoPassword": "Незашифрованный (без пароля)",
     "radioUsePassword": "Пароль",
-    "copiedToClipboardNotification": "Copied to Clipboard",
-    "copyBtn": "Copy",
+    "copiedToClipboardNotification": "Скопировано в буфер обмена",
+    "copyBtn": "Копировать",
     "editProfile": "Изменить профиль",
     "newProfile": "Новый профиль",
-    "defaultProfileName": "Alice",
+    "defaultProfileName": "Алиса",
     "profileName": "Отображаемое имя",
     "editProfileTitle": "Изменить профиль",
     "addProfileTitle": "Добавить новый профиль",
-    "deleteBtn": "Delete",
-    "saveBtn": "Save",
+    "deleteBtn": "Удалить",
+    "saveBtn": "Сохранить",
     "displayNameLabel": "Отображаемое имя",
     "addressLabel": "Адрес",
     "puzzleGameBtn": "Puzzle Game",
-    "bulletinsBtn": "Bulletins",
+    "bulletinsBtn": "Бюллетень",
     "listsBtn": "Списки",
     "chatBtn": "Чат",
     "rejectGroupBtn": "Отклонить",
@@ -219,14 +219,14 @@
     "update": "Обновить",
     "inviteBtn": "Пригласить",
     "inviteToGroupLabel": "Пригласить в группу",
-    "groupNameLabel": "Group name",
+    "groupNameLabel": "Имя группы",
     "viewServerInfo": "Информация о сервере",
     "serverSynced": "Синхронизировано",
     "serverConnectivityDisconnected": "Сервер отключен",
     "serverConnectivityConnected": "Сервер подключен",
     "serverInfo": "Информация о сервере",
     "invitationLabel": "Приглашение",
-    "serverLabel": "Server",
+    "serverLabel": "Сервер",
     "search": "Поиск...",
     "cycleColoursDesktop": "Нажмите, чтобы переключать цвета.\nПравый клик чтобы сбросить.",
     "cycleColoursAndroid": "Нажмите, чтобы переключать цвета.\nНажмите и удерживайте, чтобы сбросить.",

lib/settings.dart

@@ -11,7 +11,6 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 const TapirGroupsExperiment = "tapir-groups-experiment";
 const ServerManagementExperiment = "servers-experiment";
 const FileSharingExperiment = "filesharing";
-const ClickableLinksExperiment = "clickable-links";
 
 enum DualpaneMode {
   Single,

lib/views/globalsettingsview.dart

@@ -227,22 +227,6 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                 inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
                                 secondary: Icon(Icons.attach_file, color: settings.current().mainTextColor()),
                               ),
-                              SwitchListTile(
-                                title: Text("Enable Clickable Links", style: TextStyle(color: settings.current().mainTextColor())),
-                                subtitle: Text("The clickable links experiment allows you to click on URLs shared in messages."),
-                                value: settings.isExperimentEnabled(ClickableLinksExperiment),
-                                onChanged: (bool value) {
-                                  if (value) {
-                                    settings.enableExperiment(ClickableLinksExperiment);
-                                  } else {
-                                    settings.disableExperiment(ClickableLinksExperiment);
-                                  }
-                                  saveSettings(context);
-                                },
-                                activeTrackColor: settings.theme.defaultButtonActiveColor(),
-                                inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
-                                secondary: Icon(Icons.link, color: settings.current().mainTextColor()),
-                              ),
                             ],
                           )),
                       AboutListTile(

lib/widgets/messagebubble.dart

@@ -3,13 +3,9 @@ import 'dart:io';
 import 'package:cwtch/models/message.dart';
 import 'package:cwtch/widgets/malformedbubble.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
 import '../model.dart';
 import 'package:intl/intl.dart';
-import 'package:flutter_linkify/flutter_linkify.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 import '../settings.dart';
 import 'messagebubbledecorations.dart';
@@ -32,7 +28,6 @@ class MessageBubbleState extends State<MessageBubble> {
     var prettyDate = "";
     var borderRadiousEh = 15.0;
     // var myKey = Provider.of<MessageState>(context).profileOnion + "::" + Provider.of<MessageState>(context).contactHandle + "::" + Provider.of<MessageState>(context).messageIndex.toString();
-    var showClickableLinks = Provider.of<Settings>(context).isExperimentEnabled(ClickableLinksExperiment);
 
     DateTime messageDate = Provider.of<MessageMetadata>(context).timestamp;
     prettyDate = DateFormat.yMd(Platform.localeName).add_jm().format(messageDate.toLocal());
@@ -50,40 +45,16 @@ class MessageBubbleState extends State<MessageBubble> {
     var wdgSender = SelectableText(senderDisplayStr,
         style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor()));
 
-    var wdgMessage;
-
-    if (!showClickableLinks) {   
-      wdgMessage = SelectableText(
-        widget.content + '\u202F',
-        //key: Key(myKey),
-        focusNode: _focus,
-        style: TextStyle(
-          color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
-        ),
-        textAlign: TextAlign.left,
-        textWidthBasis: TextWidthBasis.longestLine,
-      );
-    } else {
-      wdgMessage = SelectableLinkify(
-        text: widget.content + '\u202F',
-        // TODO: onOpen breaks the "selectable" functionality. Maybe something to do with gesture handler?
-        options: LinkifyOptions(humanize: false),
-        linkifiers: [UrlLinkifier()],
-        onOpen: (link) {
-          _modalOpenLink(context, link);
-        },
-        //key: Key(myKey),
-        focusNode: _focus,
-        style: TextStyle(
-          color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
-        ),
-        linkStyle: TextStyle(
-          color: Provider.of<Settings>(context).current().mainTextColor(),
-        ),
-        textAlign: TextAlign.left,
-        textWidthBasis: TextWidthBasis.longestLine,
-      );
-    }
+    var wdgMessage = SelectableText(
+      widget.content + '\u202F',
+      //key: Key(myKey),
+      focusNode: _focus,
+      style: TextStyle(
+        color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
+      ),
+      textAlign: TextAlign.left,
+      textWidthBasis: TextWidthBasis.longestLine,
+    );
 
     var wdgDecorations = MessageBubbleDecoration(ackd: Provider.of<MessageMetadata>(context).ackd, errored: Provider.of<MessageMetadata>(context).error, fromMe: fromMe, prettyDate: prettyDate);
 
@@ -119,57 +90,4 @@ class MessageBubbleState extends State<MessageBubble> {
                           children: fromMe ? [wdgMessage, wdgDecorations] : [wdgSender, wdgMessage, wdgDecorations])))));
     });
   }
-
-  void _modalOpenLink(BuildContext ctx, LinkableElement link) {
-    showModalBottomSheet<void>(
-        context: ctx,
-        builder: (BuildContext bcontext) {
-          return Container(
-              height: 200, // bespoke value courtesy of the [TextField] docs
-              child: Center(
-                child: Padding(
-                    padding: EdgeInsets.all(30.0),
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      mainAxisSize: MainAxisSize.min,
-                      children: <Widget>[
-                        Text(
-                          "Opening this link will launch an application outside of Cwtch and may reveal metadata or otherwise compromise the security of Cwtch. Only open links from people you trust. Are you sure you want to continue?"
-                        ),
-                        Flex(direction: Axis.horizontal, mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
-                          Container(
-                            margin: EdgeInsets.symmetric(vertical: 20, horizontal: 10),
-                            child: ElevatedButton(
-                              child: Text("Copy link", semanticsLabel: "Copy link"),
-                              onPressed: () {
-                                Clipboard.setData(new ClipboardData(text: link.url));
-
-                                final snackBar = SnackBar(
-                                  content: Text(AppLocalizations.of(context)!.copiedClipboardNotification),
-                                );
-
-                                Navigator.pop(bcontext);
-                                ScaffoldMessenger.of(context).showSnackBar(snackBar);
-                              },
-                            ),
-                          ),
-                          Container(
-                            margin: EdgeInsets.symmetric(vertical: 20, horizontal: 10),
-                            child: ElevatedButton(
-                              child: Text("Open link", semanticsLabel: "Open link"),
-                              onPressed: () async {
-                                if (await canLaunch(link.url)) {
-                                  await launch(link.url);
-                                } else {
-                                  throw 'Could not launch $link';
-                                }
-                              },
-                            ),
-                          ),
-                        ]),
-                      ],
-                    )),
-              ));
-      });
-  }
 }

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -7,10 +7,8 @@ import Foundation
 
 import package_info_plus_macos
 import path_provider_macos
-import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
-  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
 }

macos/Podfile.lock

@@ -4,14 +4,11 @@ PODS:
     - FlutterMacOS
   - path_provider_macos (0.0.1):
     - FlutterMacOS
-  - url_launcher_macos (0.0.1):
-    - FlutterMacOS
 
 DEPENDENCIES:
   - FlutterMacOS (from `Flutter/ephemeral`)
   - package_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos`)
   - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`)
-  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
 
 EXTERNAL SOURCES:
   FlutterMacOS:
@@ -20,15 +17,12 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos
   path_provider_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos
-  url_launcher_macos:
-    :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
 
 SPEC CHECKSUMS:
   FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
   package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c
   path_provider_macos: a0a3fd666cb7cd0448e936fb4abad4052961002b
-  url_launcher_macos: 45af3d61de06997666568a7149c1be98b41c95d4
 
 PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.9.3

pubspec.lock

@@ -35,7 +35,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
@@ -125,13 +125,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_linkify:
-    dependency: "direct main"
-    description:
-      name: flutter_linkify
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.0.2"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -196,13 +189,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.6.3"
-  linkify:
-    dependency: transitive
-    description:
-      name: linkify
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.1.0"
   matcher:
     dependency: transitive
     description:
@@ -425,48 +411,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
-  url_launcher:
-    dependency: "direct main"
-    description:
-      name: url_launcher
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "6.0.12"
-  url_launcher_linux:
-    dependency: transitive
-    description:
-      name: url_launcher_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.2"
-  url_launcher_macos:
-    dependency: transitive
-    description:
-      name: url_launcher_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.2"
-  url_launcher_platform_interface:
-    dependency: transitive
-    description:
-      name: url_launcher_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.4"
-  url_launcher_web:
-    dependency: transitive
-    description:
-      name: url_launcher_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.4"
-  url_launcher_windows:
-    dependency: transitive
-    description:
-      name: url_launcher_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.2"
   vector_math:
     dependency: transitive
     description:
@@ -503,5 +447,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.14.0 <3.0.0"
-  flutter: ">=2.5.0"
+  dart: ">=2.13.0 <3.0.0"
+  flutter: ">=2.0.0"

pubspec.yaml

@@ -43,8 +43,6 @@ dependencies:
   scrollable_positioned_list: ^0.2.0-nullsafety.0
   file_picker: ^4.0.1
   file_picker_desktop: ^1.1.0
-  flutter_linkify: ^5.0.2
-  url_launcher: ^6.0.12
 
 dev_dependencies:
   msix: ^2.1.3