Merged all changes from current parse-community#434

Author: fischerscode

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.28
+
+
 ## 1.0.27
 User login / signUp / loginAnonymous delete SessionId stored in device before calling server
 

README.md

@@ -5,7 +5,7 @@
 This is a Dart package that allows communication with a Parse Server, (https://parseplatform.org) either hosted on your own server or another, like (http://Back4App.com).
 
 This project is based on the [Parse SDK for Flutter](https://github.com/parse-community/Parse-SDK-Flutter) (version 1.0.27) and tries to provide a way of accessing the Parse Server in a Dart project,
-while keeping the as similar to the original repository as possible.   
+while keeping the as similar to the original repository as possible.
 
 This project is absolutely work in progress. Please let us know if you think anything needs changing/adding, and more than ever, please do join in on this project. (Even if it is just to improve our documentation)
 

lib/parse_server_sdk_dart.dart

@@ -9,16 +9,15 @@ import 'dart:typed_data';
 import 'package:http/http.dart';
 import 'package:http/io_client.dart';
 import 'package:meta/meta.dart';
+import 'package:parse_server_sdk/src/network/parse_websocket.dart'
+    as parse_web_socket;
 import 'package:path/path.dart' as path;
 import 'package:sembast/sembast.dart';
 import 'package:sembast/sembast_io.dart';
 import 'package:uuid/uuid.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
 import 'package:xxtea/xxtea.dart';
 
-export 'src/network/parse_live_query.dart'
-    if (dart.library.js) 'src/network/parse_live_query_web.dart';
-export 'src/utils/parse_live_list.dart';
-
 part 'package:parse_server_sdk/src/data/core_store.dart';
 part 'package:parse_server_sdk/src/data/parse_subclass_handler.dart';
 part 'package:parse_server_sdk/src/objects/response/parse_error_response.dart';
@@ -27,12 +26,13 @@ part 'package:parse_server_sdk/src/objects/response/parse_response_builder.dart'
 part 'package:parse_server_sdk/src/objects/response/parse_response_utils.dart';
 part 'package:parse_server_sdk/src/objects/response/parse_success_no_results.dart';
 part 'package:parse_server_sdk/src/storage/core_store_sem_impl.dart';
-part 'package:parse_server_sdk/src/storage/core_store_sp_impl.dart';
 part 'package:parse_server_sdk/src/storage/xxtea_codec.dart';
 part 'src/base/parse_constants.dart';
 part 'src/data/parse_core_data.dart';
 part 'src/enums/parse_enum_api_rq.dart';
+part 'src/network/parse_connectivity.dart';
 part 'src/network/parse_http_client.dart';
+part 'src/network/parse_live_query.dart';
 part 'src/network/parse_query.dart';
 part 'src/objects/parse_acl.dart';
 part 'src/objects/parse_base.dart';
@@ -58,6 +58,7 @@ part 'src/utils/parse_file_extensions.dart';
 part 'src/utils/parse_logger.dart';
 part 'src/utils/parse_login_helpers.dart';
 part 'src/utils/parse_utils.dart';
+part 'src/utils/parse_live_list.dart';
 
 class Parse {
   ParseCoreData data;
@@ -69,17 +70,20 @@ class Parse {
   ///
   /// ```
   /// Parse().initialize(
-  //        "PARSE_APP_ID",
-  //        "https://parse.myaddress.com/parse/,
-  //        masterKey: "asd23rjh234r234r234r",
-  //        debug: true,
-  //        liveQuery: true);
-  // ```
+  ///        "PARSE_APP_ID",
+  ///        "https://parse.myaddress.com/parse/,
+  ///        masterKey: "asd23rjh234r234r234r",
+  ///        debug: true,
+  ///        liveQuery: true);
+  /// ```
   Future<Parse> initialize(
     String appId,
     String serverUrl, {
     bool debug = false,
-    String appName = '',
+    String appName,
+    String appVersion,
+    String appPackageName,
+    String locale,
     String liveQueryUrl,
     String clientKey,
     String masterKey,
@@ -91,6 +95,9 @@ class Parse {
     ParseUserConstructor parseUserConstructor,
     ParseFileConstructor parseFileConstructor,
     List<int> liveListRetryIntervals,
+    ParseConnectivityProvider connectivityProvider,
+    String fileDirectory,
+    Stream<void> appResumedStream,
   }) async {
     final String url = removeTrailingSlash(serverUrl);
 
@@ -99,6 +106,9 @@ class Parse {
       url,
       debug: debug,
       appName: appName,
+      appVersion: appVersion,
+      appPackageName: appPackageName,
+      locale: locale,
       liveQueryUrl: liveQueryUrl,
       masterKey: masterKey,
       clientKey: clientKey,
@@ -110,6 +120,9 @@ class Parse {
       parseUserConstructor: parseUserConstructor,
       parseFileConstructor: parseFileConstructor,
       liveListRetryIntervals: liveListRetryIntervals,
+      connectivityProvider: connectivityProvider,
+      fileDirectory: fileDirectory,
+      appResumedStream: appResumedStream,
     );
 
     _hasBeenInitialized = true;

lib/src/base/parse_constants.dart

@@ -1,7 +1,7 @@
 part of dart_parse_sdk;
 
 // Library
-const String keySdkVersion = '1.0.27';
+const String keySdkVersion = '1.0.28';
 const String keyLibraryName = 'Flutter Parse SDK';
 
 // End Points

lib/src/data/parse_core_data.dart

@@ -19,6 +19,9 @@ class ParseCoreData {
     String serverUrl, {
     bool debug,
     String appName,
+    String appVersion,
+    String appPackageName,
+    String locale,
     String liveQueryUrl,
     String masterKey,
     String clientKey,
@@ -30,18 +33,32 @@ class ParseCoreData {
     ParseUserConstructor parseUserConstructor,
     ParseFileConstructor parseFileConstructor,
     List<int> liveListRetryIntervals,
+    ParseConnectivityProvider connectivityProvider,
+    String fileDirectory,
+        Stream<void> appResumedStream,
   }) async {
     _instance = ParseCoreData._init(appId, serverUrl);
 
-    _instance.storage ??=
-        store ?? await CoreStoreSembastImp.getInstance(password: masterKey);
+    assert(_instance.storage != null || store != null,
+        'There is no CoreStore set.');
+
+    _instance.storage ??= store;
 
     if (debug != null) {
       _instance.debug = debug;
     }
     if (appName != null) {
       _instance.appName = appName;
     }
+    if (appVersion != null) {
+      _instance.appVersion = appVersion;
+    }
+    if (appPackageName != null) {
+      _instance.appPackageName = appPackageName;
+    }
+    if (locale != null) {
+      _instance.locale = locale;
+    }
     if (liveQueryUrl != null) {
       _instance.liveQueryURL = liveQueryUrl;
     }
@@ -73,10 +90,25 @@ class ParseCoreData {
       parseUserConstructor: parseUserConstructor,
       parseFileConstructor: parseFileConstructor,
     );
+
+    if (connectivityProvider != null) {
+      _instance.connectivityProvider = connectivityProvider;
+    }
+
+    if (fileDirectory != null) {
+      _instance.fileDirectory = fileDirectory;
+    }
+
+    if(appResumedStream!= null){
+      _instance.appResumedStream = appResumedStream;
+    }
   }
 
   String appName;
+  String appVersion;
+  String appPackageName;
   String applicationId;
+  String locale;
   String serverUrl;
   String liveQueryURL;
   String masterKey;
@@ -88,6 +120,9 @@ class ParseCoreData {
   CoreStore storage;
   ParseSubClassHandler _subClassHandler;
   List<int> liveListRetryIntervals;
+  ParseConnectivityProvider connectivityProvider;
+  String fileDirectory;
+  Stream<void> appResumedStream;
 
   void registerSubClass(
       String className, ParseObjectConstructor objectConstructor) {

lib/src/network/parse_connectivity.dart

@@ -0,0 +1,18 @@
+part of dart_parse_sdk;
+
+/// Connection status check result.
+enum ParseConnectivityResult {
+  /// WiFi: Device connected via Wi-Fi
+  wifi,
+
+  /// Mobile: Device connected to cellular network
+  mobile,
+
+  /// None: Device not connected to any network
+  none
+}
+
+abstract class ParseConnectivityProvider {
+  Future<ParseConnectivityResult> checkConnectivity();
+  Stream<ParseConnectivityResult> get connectivityStream;
+}