Comunic/comunicmobile
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicmobile synced 2025-11-03 19:54:12 +00:00
Code Issues Projects Releases Wiki Activity

Updated application preferences logic

Browse Source
This commit is contained in:
Pierre HUBERT
2019-11-01 09:59:05 +01:00
parent 53f4240f05
commit a998ce13a3
4 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/helpers/account_credentials_helper.dart
View File

@@ -1,33 +0,0 @@
import 'dart:convert';
import 'package:comunic/models/login_tokens.dart';
import 'package:shared_preferences/shared_preferences.dart';
/// Accounts credentials helper
///
/// Stores current account tokens
///
/// @author Pierre HUBERT
class AccountCredentialsHelper {
/// Set new login tokens
Future<void> set(LoginTokens tokens) async {
SharedPreferences prefs = await SharedPreferences.getInstance();
await prefs.setString(
"login_tokens", tokens == null ? "null" : tokens.toString());
}
/// Get current [LoginTokens]. Returns null if none or in case of failure
Future<LoginTokens> get() async {
try {
SharedPreferences prefs = await SharedPreferences.getInstance();
final string = prefs.getString("login_tokens");
if (string == null || string == "null") return null;
return LoginTokens.fromJSON(jsonDecode(string));
} on Exception catch (e) {
print(e.toString());
return null;
}
}
}

11
lib/helpers/account_helper.dart
View File

@@ -1,5 +1,5 @@
import 'package:comunic/helpers/account_credentials_helper.dart';
import 'package:comunic/helpers/api_helper.dart';
import 'package:comunic/helpers/preferences_helper.dart';
import 'package:comunic/models/api_request.dart';
import 'package:comunic/models/authentication_details.dart';
import 'package:comunic/models/login_tokens.dart';
@@ -26,7 +26,8 @@ class AccountHelper {
///
/// Warning : This method MUST BE CALLED AT LEAST ONCE AFTER APP START !!!
Future<bool> signedIn() async {
bool signedIn = await AccountCredentialsHelper().get() != null;
bool signedIn =
(await PreferencesHelper.getInstance()).getLoginTokens() != null;
// Load current user ID for later use
if (signedIn && _currentUserID == -1) await _loadCurrentUserID();
@@ -51,8 +52,8 @@ class AccountHelper {
// Save login tokens
final tokensObj = response.getObject()["tokens"];
await AccountCredentialsHelper()
.set(LoginTokens(tokensObj["token1"], tokensObj["token2"]));
await (await PreferencesHelper.getInstance())
.setLoginTokens(LoginTokens(tokensObj["token1"], tokensObj["token2"]));
// Get current user ID
final userID = await _downloadCurrentUserID();
@@ -71,7 +72,7 @@ class AccountHelper {
/// Sign out user
Future<void> signOut() async {
await AccountCredentialsHelper().set(null);
await (await PreferencesHelper.getInstance()).setLoginTokens(null);
_currentUserID = 0;
}

6
lib/helpers/api_helper.dart
View File

@@ -1,6 +1,6 @@
import 'dart:io';
import 'package:comunic/helpers/account_credentials_helper.dart';
import 'package:comunic/helpers/preferences_helper.dart';
import 'package:comunic/models/api_request.dart';
import 'package:comunic/models/api_response.dart';
import 'package:comunic/models/config.dart';
@@ -23,7 +23,7 @@ class APIHelper {
//Add user tokens (if required)
if (request.needLogin) {
final tokens = await AccountCredentialsHelper().get();
final tokens = (await PreferencesHelper.getInstance()).getLoginTokens();
assert(tokens != null);
request.addString("userToken1", tokens.tokenOne);
request.addString("userToken2", tokens.tokenTwo);
@@ -59,7 +59,7 @@ class APIHelper {
return APIResponse(response.statusCode, null);
return APIResponse(response.statusCode, response.data);
} catch (e) {
} catch (e) {
print(e.toString());
print("Could not execute a request!");
return APIResponse(-1, null);

49
lib/helpers/preferences_helper.dart Normal file
View File

@@ -0,0 +1,49 @@
import 'dart:convert';
import 'package:comunic/models/login_tokens.dart';
import 'package:shared_preferences/shared_preferences.dart';
/// Preferences helper
///
/// Stores current account tokens
///
/// @author Pierre HUBERT
class PreferencesHelper {
static PreferencesHelper _instance;
static Future<PreferencesHelper> getInstance() async {
if (_instance == null) {
_instance = PreferencesHelper._();
await _init();
}
return _instance;
}
static SharedPreferences _sharedPreferences;
PreferencesHelper._();
static Future<void> _init() async {
_sharedPreferences = await SharedPreferences.getInstance();
}
/// Set new login tokens
Future<void> setLoginTokens(LoginTokens tokens) async {
await _sharedPreferences.setString(
"login_tokens", tokens == null ? "null" : tokens.toString());
}
/// Get current [LoginTokens]. Returns null if none or in case of failure
LoginTokens getLoginTokens() {
try {
final string = _sharedPreferences.getString("login_tokens");
if (string == null || string == "null") return null;
return LoginTokens.fromJSON(jsonDecode(string));
} on Exception catch (e) {
print(e.toString());
return null;
}
}
}