Skip to content

Commit 8d10589

Browse files
committed
TW-1699: app does start on linux
1 parent cb0bb96 commit 8d10589

File tree

9 files changed

+39
-19
lines changed

9 files changed

+39
-19
lines changed

lib/config/go_routes/go_router.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ abstract class AppRoutes {
7878
path: '/home',
7979
pageBuilder: (context, state) => defaultPageBuilder(
8080
context,
81-
PlatformInfos.isMobile
81+
PlatformInfos.isMobile || PlatformInfos.isLinux
8282
? const TwakeWelcome()
8383
: AutoHomeserverPicker(
8484
loggedOut: state.extra is bool ? state.extra as bool? : null,

lib/pages/bootstrap/bootstrap_dialog.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
6767
if (PlatformInfos.isAndroid) {
6868
return L10n.of(context)!.storeInAndroidKeystore;
6969
}
70-
if (PlatformInfos.isIOS || PlatformInfos.isMacOS) {
70+
if (PlatformInfos.isIOS || PlatformInfos.isMacOS || PlatformInfos.isLinux) {
7171
return L10n.of(context)!.storeInAppleKeyChain;
7272
}
7373
return L10n.of(context)!.storeSecurlyOnThisDevice;

lib/pages/chat/events/message_content.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ class MessageContent extends StatelessWidget
7575
if (PlatformInfos.isMobile ||
7676
PlatformInfos.isMacOS ||
7777
PlatformInfos.isWeb
78+
// TODO: test this
7879
// Disabled until https://github.com/bleonard252/just_audio_mpv/issues/3
7980
// is fixed
8081
// || PlatformInfos.isLinux

lib/pages/connect/connect_page_mixin.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,19 @@ mixin ConnectPageMixin {
3737
bool supportsSso(BuildContext context) =>
3838
(PlatformInfos.isMobile ||
3939
PlatformInfos.isWeb ||
40-
PlatformInfos.isMacOS) &&
40+
PlatformInfos.isMacOS ||
41+
PlatformInfos.isLinux) &&
4142
supportsFlow(context: context, flowType: 'm.login.sso');
4243

4344
bool supportsLogin(BuildContext context) =>
4445
supportsFlow(context: context, flowType: 'm.login.password');
4546

4647
String _getRedirectUrlScheme(String redirectUrl) {
48+
// Remove when package limitation will be fixed
49+
// https://pub.dev/packages/flutter_web_auth_2#windows-and-linux
50+
if (PlatformInfos.isLinux || PlatformInfos.isWindows) {
51+
return "http://localhost:60665";
52+
}
4753
return Uri.parse(redirectUrl).scheme;
4854
}
4955

@@ -92,6 +98,7 @@ mixin ConnectPageMixin {
9298
redirectUrl: redirectUrl,
9399
);
94100
final urlScheme = _getRedirectUrlScheme(redirectUrl);
101+
print("tez: urlScheme = $urlScheme");
95102
return await FlutterWebAuth2.authenticate(
96103
url: url,
97104
callbackUrlScheme: urlScheme,

lib/pages/dialer/dialer.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,10 @@ class MyCallingPage extends State<Calling> {
186186

187187
void _playCallSound() async {
188188
const path = 'assets/sounds/call.ogg';
189-
if (kIsWeb || PlatformInfos.isMobile || PlatformInfos.isMacOS) {
189+
if (kIsWeb ||
190+
PlatformInfos.isMobile ||
191+
PlatformInfos.isMacOS ||
192+
PlatformInfos.isLinux) {
190193
final player = AudioPlayer();
191194
await player.setAsset(path);
192195
player.play();

lib/utils/client_manager.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ abstract class ClientManager {
107107
AuthenticationTypes.password,
108108
if (PlatformInfos.isMobile ||
109109
PlatformInfos.isWeb ||
110-
PlatformInfos.isMacOS)
110+
PlatformInfos.isMacOS ||
111+
PlatformInfos.isLinux)
111112
AuthenticationTypes.sso,
112113
},
113114
nativeImplementations: nativeImplementations,

lib/utils/voip/user_media_manager.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class UserMediaManager {
1919
Future<void> startRingingTone() async {
2020
if (PlatformInfos.isMobile) {
2121
await FlutterRingtonePlayer.playRingtone(volume: 80);
22-
} else if ((kIsWeb || PlatformInfos.isMacOS) &&
22+
} else if ((kIsWeb || PlatformInfos.isMacOS || PlatformInfos.isLinux) &&
2323
_assetsAudioPlayer != null) {
2424
const path = 'assets/sounds/phone.ogg';
2525
final player = _assetsAudioPlayer = AudioPlayer();

pubspec.lock

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,26 +1022,27 @@ packages:
10221022
dependency: "direct main"
10231023
description:
10241024
name: flutter_secure_storage
1025-
sha256: f2afec1f1762c040a349ea2a588e32f442da5d0db3494a52a929a97c9e550bc5
1025+
sha256: ffdbb60130e4665d2af814a0267c481bcf522c41ae2e43caf69fa0146876d685
10261026
url: "https://pub.dev"
10271027
source: hosted
1028-
version: "7.0.1"
1028+
version: "9.0.0"
10291029
flutter_secure_storage_linux:
1030-
dependency: transitive
1030+
dependency: "direct overridden"
10311031
description:
1032-
name: flutter_secure_storage_linux
1033-
sha256: "3d5032e314774ee0e1a7d0a9f5e2793486f0dff2dd9ef5a23f4e3fb2a0ae6a9e"
1034-
url: "https://pub.dev"
1035-
source: hosted
1032+
path: flutter_secure_storage_linux
1033+
ref: develop
1034+
resolved-ref: "27d3e2e69123f0c712919ad392e15830741e4383"
1035+
url: "https://github.com/tomekit/flutter_secure_storage.git"
1036+
source: git
10361037
version: "1.2.0"
10371038
flutter_secure_storage_macos:
10381039
dependency: transitive
10391040
description:
10401041
name: flutter_secure_storage_macos
1041-
sha256: ff0768a6700ea1d9620e03518e2e25eac86a8bd07ca3556e9617bfa5ace4bd00
1042+
sha256: bd33935b4b628abd0b86c8ca20655c5b36275c3a3f5194769a7b3f37c905369c
10421043
url: "https://pub.dev"
10431044
source: hosted
1044-
version: "2.0.1"
1045+
version: "3.0.1"
10451046
flutter_secure_storage_platform_interface:
10461047
dependency: transitive
10471048
description:
@@ -3064,13 +3065,13 @@ packages:
30643065
source: hosted
30653066
version: "1.1.0"
30663067
web:
3067-
dependency: transitive
3068+
dependency: "direct overridden"
30683069
description:
30693070
name: web
3070-
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
3071+
sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
30713072
url: "https://pub.dev"
30723073
source: hosted
3073-
version: "0.3.0"
3074+
version: "0.5.1"
30743075
web_socket_channel:
30753076
dependency: transitive
30763077
description:

pubspec.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ dependencies:
8989
flutter_olm: ^1.2.0
9090
flutter_openssl_crypto: ^0.1.0
9191
flutter_ringtone_player: ^3.1.1
92-
flutter_secure_storage: ^7.0.1
92+
flutter_secure_storage: ^9.0.0
9393
flutter_svg: ^0.22.0
9494
flutter_typeahead: ^5.1.0
9595
flutter_web_auth_2: ^3.1.1
@@ -245,6 +245,12 @@ dependency_overrides:
245245
git:
246246
url: https://gitlab.com/TheOneWithTheBraid/flutter_secure_storage_windows.git
247247
ref: main
248+
# https://github.com/mogol/flutter_secure_storage/issues/616
249+
flutter_secure_storage_linux:
250+
git:
251+
url: https://github.com/tomekit/flutter_secure_storage.git
252+
ref: develop
253+
path: flutter_secure_storage_linux
248254
geolocator_android:
249255
hosted:
250256
name: geolocator_android
@@ -269,6 +275,7 @@ dependency_overrides:
269275
git:
270276
url: https://github.com/linagora/matrix_link_text.git
271277
ref: twake-supported
278+
web: ^0.5.0
272279

273280
cider:
274281
link_template:

0 commit comments

Comments
 (0)