2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'linux-seahorse-fix' into 'main'

Browse source 
fix: Seahorse does not properly work on many Linux devices

See merge request famedly/fluffychat!680
This commit is contained in:
Krille Fear 2022-01-22 10:23:44 +00:00
commit c7e80074ed
6 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/widgets/matrix.dart
View file

@ -14,6 +14,7 @@ import 'package:http/http.dart' as http;
import 'package:matrix/encryption.dart';
import 'package:matrix/matrix.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:universal_html/html.dart' as html;
import 'package:url_launcher/url_launcher.dart';
import 'package:vrouter/vrouter.dart';
@ -32,6 +33,8 @@ import '../utils/background_push.dart';
import '../utils/famedlysdk_store.dart';
import '../utils/platform_infos.dart';
// import 'package:flutter_secure_storage/flutter_secure_storage.dart';
class Matrix extends StatefulWidget {
static const String callNamespace = 'chat.fluffy.jitsi_call';
@ -407,8 +410,11 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
// Display the app lock
if (PlatformInfos.isMobile) {
WidgetsBinding.instance.addPostFrameCallback((_) {
const FlutterSecureStorage()
.read(key: SettingKeys.appLockKey)
([TargetPlatform.linux].contains(Theme.of(context).platform)
? SharedPreferences.getInstance()
.then((prefs) => prefs.getString(SettingKeys.appLockKey))
: const FlutterSecureStorage()
.read(key: SettingKeys.appLockKey))
.then((lock) {
if (lock?.isNotEmpty ?? false) {
AppLock.of(widget.context).enable();