Version 1.0.6 - Log out function corrected/unpin issue corrected

Author: phillwiggins

example/lib/main.dart

@@ -143,12 +143,11 @@ class _MyAppState extends State<MyApp> {
 
     response = await user.login();
     if (response.success) user = response.result;
-    user = null;
 
+    user = null;
     // Best practice for starting the app. This will check for a valid user
     user = await ParseUser.currentUser();
-    user.logout();
-
+    await user.logout();
     user = await ParseUser.currentUser();
 
     response = await user.getCurrentUserFromServer();

lib/src/data/parse_core_data.dart

@@ -3,20 +3,22 @@ part of flutter_parse_sdk;
 /// Singleton class that defines all user keys and data
 class ParseCoreData {
   static ParseCoreData _instance;
+
   static ParseCoreData get instance => _instance;
 
   /// Creates an instance of Parse Server
   ///
   /// This class should not be user unless switching servers during the app,
   /// which is odd. Should only be user by Parse.init
-  static void init(appId, serverUrl, {debug, appName, liveQueryUrl, masterKey, sessionId}){
-      _instance = ParseCoreData._init(appId, serverUrl);
-
-      if (debug != null) _instance.debug = debug;
-      if (appName != null) _instance.appName = appName;
-      if (liveQueryUrl != null) _instance.liveQueryURL = liveQueryUrl;
-      if (masterKey != null) _instance.masterKey = masterKey;
-      if (sessionId != null) _instance.sessionId = sessionId;
+  static void init(appId, serverUrl,
+      {debug, appName, liveQueryUrl, masterKey, sessionId}) {
+    _instance = ParseCoreData._init(appId, serverUrl);
+
+    if (debug != null) _instance.debug = debug;
+    if (appName != null) _instance.appName = appName;
+    if (liveQueryUrl != null) _instance.liveQueryURL = liveQueryUrl;
+    if (masterKey != null) _instance.masterKey = masterKey;
+    if (sessionId != null) _instance.sessionId = sessionId;
   }
 
   String appName;
@@ -28,8 +30,7 @@ class ParseCoreData {
   bool debug;
   SharedPreferences storage;
 
-  ParseCoreData._init(
-      this.applicationId,
+  ParseCoreData._init(this.applicationId,
       this.serverUrl);
 
   factory ParseCoreData() => _instance;
@@ -38,15 +39,17 @@ class ParseCoreData {
   ///
   /// This is generated when a users logs in, or calls currentUser to update
   /// their keys
-  void setSessionId(String sessionId){
+  void setSessionId(String sessionId) {
     this.sessionId = sessionId;
   }
 
   void initStorage() async {
     storage = await SharedPreferences.getInstance();
   }
 
-  SharedPreferences getStore() => storage;
+  Future<SharedPreferences> getStore() async {
+    return storage != null ? storage : await SharedPreferences.getInstance();
+  }
 
   @override
   String toString() => "$applicationId $masterKey";

lib/src/objects/parse_base.dart

@@ -92,8 +92,10 @@ abstract class ParseBase {
 
   /// Saves in storage
   @protected
-  void saveInStorage(String key) async =>
-      await ParseCoreData().getStore().setString(key, toString());
+  void saveInStorage(String key) async {
+    await ParseCoreData().getStore()
+      ..setString(key, toString());
+  }
 
   /// Sets type [T] from objectData
   ///
@@ -132,11 +134,9 @@ abstract class ParseBase {
   /// Replicates Android SDK pin process and saves object to storage
   Future<bool> pin() async {
     if (objectId != null) {
+      await unpin();
       var objectToSave = json.encode(toJson());
-      ParseCoreData().getStore().remove(objectId);
-      await ParseCoreData()
-          .getStore()
-          .setString(objectId, objectToSave);
+      await ParseCoreData().getStore()..setString(objectId, objectToSave);
       return true;
     } else {
       return false;
@@ -148,8 +148,7 @@ abstract class ParseBase {
   /// Replicates Android SDK pin process and saves object to storage
   Future<bool> unpin() async {
     if (objectId != null) {
-      await ParseCoreData().getStore().setString(objectId, "");
-      await ParseCoreData().getStore().remove(objectId);
+      await SharedPreferences.getInstance()..remove(objectId);
       return true;
     }
 
@@ -159,9 +158,9 @@ abstract class ParseBase {
   /// Saves item to simple key pair value storage
   ///
   /// Replicates Android SDK pin process and saves object to storage
-  fromPin(String objectId) {
+  fromPin(String objectId) async {
     if (objectId != null) {
-      var itemFromStore = ParseCoreData().getStore().getString(objectId);
+      var itemFromStore = (await ParseCoreData().getStore()).getString(objectId);
 
       if (itemFromStore != null) {
         var map = json.decode(itemFromStore);

lib/src/objects/parse_user.dart

@@ -239,8 +239,8 @@ class ParseUser extends ParseObject implements ParseCloneable {
     }
   }
 
-  static ParseUser _getUserFromLocalStore() {
-    var userJson = ParseCoreData().getStore().getString(keyParseStoreUser);
+  static Future<ParseUser> _getUserFromLocalStore() async {
+    var userJson = (await ParseCoreData().getStore()).getString(keyParseStoreUser);
 
     if (userJson != null) {
       var userMap = JsonDecoder().convert(userJson);