diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 0e6f6ef..a1618e5 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,7 +1,5 @@ PODS: - Flutter (1.0.0) - - flutter_secure_storage (6.0.0): - - Flutter - fluttertoast (0.0.2): - Flutter - Toast @@ -27,7 +25,6 @@ PODS: DEPENDENCIES: - Flutter (from `Flutter`) - - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - objectbox_flutter_libs (from `.symlinks/plugins/objectbox_flutter_libs/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) @@ -44,8 +41,6 @@ SPEC REPOS: EXTERNAL SOURCES: Flutter: :path: Flutter - flutter_secure_storage: - :path: ".symlinks/plugins/flutter_secure_storage/ios" fluttertoast: :path: ".symlinks/plugins/fluttertoast/ios" objectbox_flutter_libs: @@ -61,7 +56,6 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a ObjectBox: a7900d5335218cd437cbc080b7ccc38a5211f7b4 diff --git a/lib/service/local_storage.dart b/lib/service/local_storage.dart index 74f910d..3c5fe6a 100644 --- a/lib/service/local_storage.dart +++ b/lib/service/local_storage.dart @@ -1,38 +1,64 @@ import 'dart:convert'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:mobdr/model/login.dart'; import 'package:mobdr/model/user_profile.dart'; class LocalStorage { - static Future get prefs async => - await SharedPreferences.getInstance(); - - static FlutterSecureStorage get securePref => FlutterSecureStorage(); +// static Future get securePref async => +// await SharedPreferences.getInstance(); + //static FlutterSecureStorage get securePref => FlutterSecureStorage(); + /* static Future eraseProfileData() async { var loginData = (await getLoginData()); loginData?.guid = ''; //await saveLoginData(LoginModel: loginData); } + */ + /* static Future getLoginData() async { try { - var loginData = await securePref.read(key: 'loginData'); - return LoginModel.fromJson(json.decode(loginData!)); + //var loginData = await securePref.read(key: 'loginData'); + //return LoginModel.fromJson(json.decode(loginData!)); + return null; } catch (e) { return null; } } + */ + static Future getLoginData() async { + final SharedPreferences prefs = await SharedPreferences.getInstance(); + + Map loginMap = {}; + final String? loginStr = prefs.getString('loginData'); + if (loginStr != null) { + loginMap = jsonDecode(loginStr) as Map; + } + + final LoginModel login = LoginModel.fromJson(loginMap); + print(login); + return login; + } + + static Future saveLoginData(LoginModel loginModel) async { + final SharedPreferences prefs = await SharedPreferences.getInstance(); + bool result = await prefs.setString('loginData', jsonEncode(loginModel)); + print(result); + } + + /* static Future saveLoginData(LoginModel loginModel) async { return securePref.write( key: 'loginData', value: json.encode(loginModel.toJson())); } + */ + /* static Future getProfileData() async { try { var profileData = await securePref.read(key: 'profileData'); @@ -62,6 +88,7 @@ class LocalStorage { static Future keyExists(String key) async { return securePref.containsKey(key: key); } + */ /* static eraseAll() async { diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index b773214..c58ebc9 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -6,13 +6,9 @@ #include "generated_plugin_registrant.h" -#include #include void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); - flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); g_autoptr(FlPluginRegistrar) objectbox_flutter_libs_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "ObjectboxFlutterLibsPlugin"); objectbox_flutter_libs_plugin_register_with_registrar(objectbox_flutter_libs_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 6d5d836..94262e7 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - flutter_secure_storage_linux objectbox_flutter_libs ) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 9ca9b99..8bffdec 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,7 +5,6 @@ import FlutterMacOS import Foundation -import flutter_secure_storage_macos import objectbox_flutter_libs import package_info_plus import path_provider_foundation @@ -13,7 +12,6 @@ import shared_preferences_foundation import sqflite func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) ObjectboxFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "ObjectboxFlutterLibsPlugin")) FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) diff --git a/pubspec.lock b/pubspec.lock index e127f63..b269275 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -323,54 +323,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_secure_storage: - dependency: "direct main" - description: - name: flutter_secure_storage - sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5" - url: "https://pub.dev" - source: hosted - version: "8.0.0" - flutter_secure_storage_linux: - dependency: transitive - description: - name: flutter_secure_storage_linux - sha256: "0912ae29a572230ad52d8a4697e5518d7f0f429052fd51df7e5a7952c7efe2a3" - url: "https://pub.dev" - source: hosted - version: "1.1.3" - flutter_secure_storage_macos: - dependency: transitive - description: - name: flutter_secure_storage_macos - sha256: "083add01847fc1c80a07a08e1ed6927e9acd9618a35e330239d4422cd2a58c50" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - flutter_secure_storage_platform_interface: - dependency: transitive - description: - name: flutter_secure_storage_platform_interface - sha256: b3773190e385a3c8a382007893d678ae95462b3c2279e987b55d140d3b0cb81b - url: "https://pub.dev" - source: hosted - version: "1.0.1" - flutter_secure_storage_web: - dependency: transitive - description: - name: flutter_secure_storage_web - sha256: "42938e70d4b872e856e678c423cc0e9065d7d294f45bc41fc1981a4eb4beaffe" - url: "https://pub.dev" - source: hosted - version: "1.1.1" - flutter_secure_storage_windows: - dependency: transitive - description: - name: flutter_secure_storage_windows - sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee - url: "https://pub.dev" - source: hosted - version: "2.0.0" flutter_test: dependency: "direct dev" description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 685a2dd..6ef8dc6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,8 +46,7 @@ dependencies: package_info_plus: 3.0.3 flutter_bloc: 8.1.2 flutter_html: 3.0.0-alpha.6 - flutter_secure_storage: ^8.0.0 - + #https://pub.dev/packages/intl intl: 0.17.0 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 0ee502a..a84779d 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,12 +6,9 @@ #include "generated_plugin_registrant.h" -#include #include void RegisterPlugins(flutter::PluginRegistry* registry) { - FlutterSecureStorageWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); ObjectboxFlutterLibsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("ObjectboxFlutterLibsPlugin")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 8d486f6..9f0138e 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - flutter_secure_storage_windows objectbox_flutter_libs )