diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cc4d5ca..6afc479a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,9 @@ build_web:
stage: coverage
image: cirrusci/flutter:beta-web
script:
+ - rm -r assets/js/package
+ - cd assets/js/ && curl -O 'https://packages.matrix.org/npm/olm/olm-3.1.4.tgz' && cd ../../
+ - cd assets/js/ && tar xaf olm-3.1.4.tgz && cd ../../
- flutter channel beta
- flutter upgrade
- flutter doctor --verbose
diff --git a/assets/js/package/olm.js b/assets/js/package/olm.js
new file mode 100644
index 00000000..0c399d16
--- /dev/null
+++ b/assets/js/package/olm.js
@@ -0,0 +1 @@
+// Dummy file
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index e5a2ed27..4d53e430 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -85,6 +85,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
+ coverage:
+ dependency: transitive
+ description:
+ name: coverage
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.13.6"
crypto:
dependency: transitive
description:
@@ -117,11 +124,18 @@ packages:
dependency: "direct main"
description:
path: "."
- ref: "0f68b60f16db924b10fa8954623e67de6252b35f"
- resolved-ref: "0f68b60f16db924b10fa8954623e67de6252b35f"
+ ref: "4921c4c31bf92a0ce26b672af8f842ab8a52b541"
+ resolved-ref: "4921c4c31bf92a0ce26b672af8f842ab8a52b541"
url: "https://gitlab.com/famedly/famedlysdk.git"
source: git
version: "0.0.1"
+ ffi:
+ dependency: transitive
+ description:
+ name: ffi
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.1.3"
file_picker:
dependency: "direct main"
description:
@@ -219,6 +233,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.0+4"
+ http_multi_server:
+ dependency: transitive
+ description:
+ name: http_multi_server
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.2.0"
http_parser:
dependency: transitive
description:
@@ -254,6 +275,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.17.9"
+ io:
+ dependency: transitive
+ description:
+ name: io
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.3.3"
js:
dependency: transitive
description:
@@ -275,6 +303,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.1+4"
+ logging:
+ dependency: transitive
+ description:
+ name: logging
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.11.4"
matcher:
dependency: transitive
description:
@@ -289,6 +324,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.8"
+ mime:
+ dependency: transitive
+ description:
+ name: mime
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.9.6+3"
mime_type:
dependency: transitive
description:
@@ -296,6 +338,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.4"
+ multi_server_socket:
+ dependency: transitive
+ description:
+ name: multi_server_socket
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.0.2"
node_interop:
dependency: transitive
description:
@@ -310,6 +359,22 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1+2"
+ node_preamble:
+ dependency: transitive
+ description:
+ name: node_preamble
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.4.8"
+ olm:
+ dependency: transitive
+ description:
+ path: "."
+ ref: "09eb49dbdb1ad9ed71c6bf74562250ecd3d4198b"
+ resolved-ref: "09eb49dbdb1ad9ed71c6bf74562250ecd3d4198b"
+ url: "https://gitlab.com/famedly/libraries/dart-olm.git"
+ source: git
+ version: "0.0.0"
package_config:
dependency: transitive
description:
@@ -317,6 +382,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
+ package_resolver:
+ dependency: transitive
+ description:
+ name: package_resolver
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.0.10"
path:
dependency: transitive
description:
@@ -373,6 +445,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
+ pool:
+ dependency: transitive
+ description:
+ name: pool
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.4.0"
pub_semver:
dependency: transitive
description:
@@ -394,11 +473,53 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3+5"
+ shelf:
+ dependency: transitive
+ description:
+ name: shelf
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.7.5"
+ shelf_packages_handler:
+ dependency: transitive
+ description:
+ name: shelf_packages_handler
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.0.4"
+ shelf_static:
+ dependency: transitive
+ description:
+ name: shelf_static
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.2.8"
+ shelf_web_socket:
+ dependency: transitive
+ description:
+ name: shelf_web_socket
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.2.3"
sky_engine:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
+ source_map_stack_trace:
+ dependency: transitive
+ description:
+ name: source_map_stack_trace
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.1.5"
+ source_maps:
+ dependency: transitive
+ description:
+ name: source_maps
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.10.9"
source_span:
dependency: transitive
description:
@@ -448,6 +569,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
+ test:
+ dependency: transitive
+ description:
+ name: test
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.9.4"
test_api:
dependency: transitive
description:
@@ -455,6 +583,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.11"
+ test_core:
+ dependency: transitive
+ description:
+ name: test_core
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.2.15"
toast:
dependency: "direct main"
description:
@@ -539,6 +674,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.8"
+ vm_service:
+ dependency: transitive
+ description:
+ name: vm_service
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.3.1"
watcher:
dependency: transitive
description:
@@ -546,6 +688,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.7+13"
+ web_socket_channel:
+ dependency: transitive
+ description:
+ name: web_socket_channel
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.1.0"
webview_flutter:
dependency: "direct main"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 64b65c59..695d0b86 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -27,7 +27,7 @@ dependencies:
famedlysdk:
git:
url: https://gitlab.com/famedly/famedlysdk.git
- ref: 0f68b60f16db924b10fa8954623e67de6252b35f
+ ref: 4921c4c31bf92a0ce26b672af8f842ab8a52b541
localstorage: ^3.0.1+4
bubble: ^1.1.9+1
@@ -81,12 +81,9 @@ flutter:
# To add assets to your application, add an assets section, like this:
assets:
- - assets/fluffychat-banner.png
- - assets/logo.png
- - assets/private_chat_wallpaper.png
- - assets/new_group_wallpaper.png
- - assets/chat.svg
- # - images/a_dot_ham.jpeg
+ - assets/
+ - assets/js/
+ - assets/js/package/
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware.
diff --git a/web/index.html b/web/index.html
index 79a62457..8fa5e96d 100644
--- a/web/index.html
+++ b/web/index.html
@@ -5,6 +5,7 @@
fluffychat
+