Merge pull request #235 from syphon-org/fix-batch-0.1.6+4

[0.1.7] Touch Up Release
syphon-org · Feb 25, 2021 · 4079387 · 4079387
2 parents 2c83b00 + 499bce6
commit 4079387
Show file tree

Hide file tree

Showing 50 changed files with 1,310 additions and 877 deletions.
diff --git a/ios/Flutter/.last_build_id b/ios/Flutter/.last_build_id
@@ -1 +1 @@
-1174475fef3d534343e40f4cc82e834d
+19b273c5c76043b5d019fcb9269015be
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -176,4 +176,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 127d285aa3bfad2bbd68630172869bd951e40542
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1
diff --git a/lib/cache/serializer.dart b/lib/cache/serializer.dart
@@ -45,12 +45,13 @@ class CacheSerializer implements StateSerializer<AppState> {
       state.authStore,
       state.syncStore,
       state.cryptoStore,
+      state.roomStore,
     ];
 
     // Queue up a cache saving will wait
     // if the previously schedule task has not finished
     Future.microtask(() async {
-      // // create a new IV for the encrypted cache
+      // create a new IV for the encrypted cache
       Cache.ivKey = generateIV();
 
       // backup the IV in case the app is force closed before caching finishes

diff --git a/lib/cache/storage.dart b/lib/cache/storage.dart
@@ -8,6 +8,7 @@ import 'package:syphon/cache/threadables.dart';
 import 'package:syphon/global/print.dart';
 import 'package:syphon/store/auth/state.dart';
 import 'package:syphon/store/crypto/state.dart';
+import 'package:syphon/store/rooms/state.dart';
 import 'package:syphon/store/sync/state.dart';
 
 class CacheStorage implements StorageEngine {
@@ -21,6 +22,7 @@ class CacheStorage implements StorageEngine {
       AuthStore(),
       SyncStore(),
       CryptoStore(),
+      RoomStore(),
     ];
 
     await Future.wait(stores.map((store) async {

diff --git a/lib/global/dimensions.dart b/lib/global/dimensions.dart
@@ -1,7 +1,3 @@
-// decoration: BoxDecoration( // DEBUG ONLY
-//   color: Colors.red,
-// ),
-
 // Flutter imports:
 import 'package:flutter/material.dart';
 

diff --git a/lib/global/libs/matrix/auth.dart b/lib/global/libs/matrix/auth.dart
@@ -5,7 +5,7 @@ import 'dart:math';
 
 // Package imports:
 import 'package:http/http.dart' as http;
-import 'package:syphon/global/algos.dart';
+import 'package:syphon/global/values.dart';
 
 /**
  * https://matrix.org/docs/spec/client_server/latest#id183
@@ -38,15 +38,15 @@ abstract class Auth {
     return await json.decode(response.body);
   }
 
-  /**
-   * https://matrix.org/docs/spec/client_server/latest#id198
-   * 
-   * Login User
-   * 
-   *  Gets the homeserver's supported login types to authenticate
-   *  users. Clients should pick one of these and supply it as 
-   *  the type when logging in.
-   */
+  ///
+  /// Login User
+  ///
+  /// Gets the homeserver's supported login types to authenticate
+  /// users. Clients should pick one of these and supply it as
+  /// the type when logging in.
+  ///
+  /// https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-login
+  ///
   static FutureOr<dynamic> loginUser({
     String protocol,
     String homeserver,
@@ -74,6 +74,7 @@ abstract class Auth {
 
     final response = await http.post(
       url,
+      headers: {'Content-type': 'application/json'},
       body: json.encode(body),
     );
 
@@ -117,6 +118,7 @@ abstract class Auth {
 
     final response = await http.post(
       url,
+      headers: {'Content-type': 'application/json'},
       body: json.encode(body),
     );
 
@@ -146,6 +148,7 @@ abstract class Auth {
 
     final response = await http.post(
       url,
+      headers: {'Content-type': 'application/json'},
       body: json.encode(body),
     );
 
@@ -228,6 +231,7 @@ abstract class Auth {
 
     final response = await http.post(
       url,
+      headers: {'Content-type': 'application/json'},
       body: json.encode(body),
     );
 
@@ -243,6 +247,7 @@ abstract class Auth {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     final response = await http.post(
@@ -265,6 +270,7 @@ abstract class Auth {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     final response = await http.post(
@@ -314,6 +320,17 @@ abstract class Auth {
     return await json.decode(response.body);
   }
 
+  static Future<dynamic> checkVersion({
+    String protocol = 'https://',
+    String homeserver = 'matrix.org',
+  }) async {
+    String url = '$protocol$homeserver/_matrix/client/versions';
+
+    final response = await http.get(url);
+
+    return await json.decode(response.body);
+  }
+
   /**
    * Update User Password
    * 
@@ -334,6 +351,7 @@ abstract class Auth {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     Map body = {
@@ -392,6 +410,7 @@ abstract class Auth {
 
     final response = await http.post(
       url,
+      headers: {'Content-type': 'application/json'},
       body: json.encode(body),
     );
 
@@ -421,6 +440,7 @@ abstract class Auth {
 
     final response = await http.post(
       url,
+      headers: {'Content-type': 'application/json'},
       body: json.encode(body),
     );
 

diff --git a/lib/global/libs/matrix/devices.dart b/lib/global/libs/matrix/devices.dart
@@ -4,6 +4,7 @@ import 'dart:convert';
 
 // Package imports:
 import 'package:http/http.dart' as http;
+import 'package:syphon/global/values.dart';
 
 abstract class Devices {
   /**
@@ -134,6 +135,7 @@ abstract class Devices {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     Map body = {

diff --git a/lib/global/libs/matrix/encryption.dart b/lib/global/libs/matrix/encryption.dart
@@ -4,6 +4,7 @@ import 'dart:convert';
 
 // Package imports:
 import 'package:http/http.dart' as http;
+import 'package:syphon/global/values.dart';
 
 class Algorithms {
   static const signedcurve25519 = 'signed_curve25519';
@@ -38,6 +39,7 @@ abstract class Encryption {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     Map body = {
@@ -137,6 +139,7 @@ abstract class Encryption {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     Map body = {
@@ -162,6 +165,7 @@ abstract class Encryption {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     final response = await http.post(

diff --git a/lib/global/libs/matrix/events.dart b/lib/global/libs/matrix/events.dart
@@ -7,6 +7,7 @@ import 'package:http/http.dart' as http;
 
 // Project imports:
 import 'package:syphon/global/libs/matrix/encryption.dart';
+import 'package:syphon/global/values.dart';
 import 'package:syphon/store/events/model.dart';
 import 'package:syphon/global/libs/matrix/constants.dart';
 
@@ -401,6 +402,7 @@ abstract class Events {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     Map body = {

diff --git a/lib/global/libs/matrix/index.dart b/lib/global/libs/matrix/index.dart
@@ -24,6 +24,7 @@ abstract class MatrixApi {
   static final checkUsernameAvailability = Auth.checkUsernameAvailability;
   static final sendPasswordResetEmail = Auth.sendPasswordResetEmail;
   static final checkHomeserver = Auth.checkHomeserver;
+  static final checkVersion = Auth.checkVersion;
 
   // Search
   static final searchRooms = Search.searchRooms;

diff --git a/lib/global/libs/matrix/notifications.dart b/lib/global/libs/matrix/notifications.dart
@@ -4,6 +4,7 @@ import 'dart:convert';
 
 // Package imports:
 import 'package:http/http.dart' as http;
+import 'package:syphon/global/values.dart';
 
 abstract class Notifications {
   /**
@@ -111,6 +112,7 @@ abstract class Notifications {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     Map body = {
@@ -131,8 +133,6 @@ abstract class Notifications {
       body['profile_tag'] = profileTag;
     }
 
-    // return {'errcode': 'ya done'};
-
     final response = await http.post(
       url,
       headers: headers,

diff --git a/lib/global/libs/matrix/rooms.dart b/lib/global/libs/matrix/rooms.dart
@@ -4,6 +4,7 @@ import 'dart:convert';
 
 // Package imports:
 import 'package:http/http.dart' as http;
+import 'package:syphon/global/values.dart';
 
 abstract class Rooms {
   /**
@@ -164,6 +165,7 @@ abstract class Rooms {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     final response = await http.post(
@@ -172,9 +174,7 @@ abstract class Rooms {
       body: json.encode({}),
     );
 
-    return await json.decode(
-      response.body,
-    );
+    return await json.decode(response.body);
   }
 
   /**
@@ -204,6 +204,7 @@ abstract class Rooms {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     Map body = {
@@ -231,9 +232,7 @@ abstract class Rooms {
       body: json.encode(body),
     );
 
-    return await json.decode(
-      response.body,
-    );
+    return await json.decode(response.body);
   }
 
   /**
@@ -259,6 +258,7 @@ abstract class Rooms {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     final reponse = await http.post(
@@ -296,16 +296,15 @@ abstract class Rooms {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
-    final reponse = await http.post(
+    final response = await http.post(
       url,
       headers: headers,
     );
 
-    return await json.decode(
-      reponse.body,
-    );
+    return await json.decode(response.body);
   }
 
   /**
@@ -364,6 +363,7 @@ abstract class Rooms {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     Map body = filters;
@@ -405,6 +405,7 @@ abstract class Rooms {
 
     Map<String, String> headers = {
       'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
     };
 
     final reponse = await http.post(

diff --git a/lib/global/libs/matrix/search.dart b/lib/global/libs/matrix/search.dart
@@ -4,6 +4,7 @@ import 'dart:convert';
 
 // Package imports:
 import 'package:http/http.dart' as http;
+import 'package:syphon/global/values.dart';
 
 /**
  * https://matrix.org/docs/spec/client_server/latest#id295
@@ -28,7 +29,10 @@ class Search {
     String since,
   }) async {
     String url = '$protocol$homeserver/_matrix/client/r0/user_directory/search';
-    Map<String, String> headers = {'Authorization': 'Bearer $accessToken'};
+    Map<String, String> headers = {
+      'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
+    };
 
     Map body = {
       "limit": 10,
@@ -54,7 +58,10 @@ class Search {
     String since,
   }) async {
     String url = '$protocol$homeserver/_matrix/client/r0/publicRooms';
-    Map<String, String> headers = {'Authorization': 'Bearer $accessToken'};
+    Map<String, String> headers = {
+      'Authorization': 'Bearer $accessToken',
+      ...Values.defaultHeaders,
+    };
 
     Map body = {
       "limit": 20,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1174475fef3d534343e40f4cc82e834d
		19b273c5c76043b5d019fcb9269015be
Original file line number	Diff line number	Diff line change
Expand Up		@@ -176,4 +176,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 127d285aa3bfad2bbd68630172869bd951e40542

		COCOAPODS: 1.10.0
		COCOAPODS: 1.10.1