Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/libraries/Flutter_Plugins.xml
#	.idea/workspace.xml
#	pubspec.yaml

example/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:

proto/sfiles.proto

@@ -5,21 +5,21 @@ package sfiles;
 type = 'upload-start'
 origin = server
 client cache = days(7)
-client cache_keys = text('localKey')
+client cache_keys = text('local_key')
  */
 message UploadStartSlot {
   string key = 1;
-  string localKey = 2;
+  string local_key = 2;
 }
 
 /*
 type = 'upload-progress'
 origin = server
  */
 message UploadProgress {
-  int64 nBytes = 1;
+  int64 n_bytes = 1;
   string key = 2;
-  string localKey = 3;
+  string local_key = 3;
 }
 
 /*
@@ -32,11 +32,11 @@ message UploadDone {
 }
 
 message UploadedFile {
-  string localKey = 1;
+  string local_key = 1;
   string url = 2;
   string id = 3;
   string mime = 4;
-  string thumbUrl = 5;
+  string thumb_url = 5;
   string name = 6;
   bool downloadable = 7;
 }
@@ -45,10 +45,10 @@ message UploadedFile {
 type = 'upload-start'
 origin = client
 client cache = years(1)
-client cache_keys = text('localKey')
+client cache_keys = text('local_key')
  */
 message UploadStart {
-  string localKey = 1;
+  string local_key = 1;
   string extension = 2;
   string name = 3;
   string mime = 4;

pubspec.lock

@@ -35,7 +35,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:

pubspec.yaml~

@@ -0,0 +1,83 @@
+name: flutter_persistent_socket
+description: A new Flutter plugin.
+version: 0.0.1
+author:
+homepage:
+
+environment:
+  sdk: ">=2.7.0 <3.0.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+  sqlite3_flutter_libs: ^0.2.0
+  moor: ^4.1.0
+  provider: ^5.0.0
+  path_provider: ^2.0.1
+  path: ^1.6.4
+  uuid: ^3.0.1
+  web_socket_channel: ^1.1.0
+  tus_client: ^1.0.0
+  gm5_utils:
+    git: https://github.com/vidklopcic/gm5_utils.git
+#  gm5_utils:
+#    path: /Users/vidklopcic/StudioProjects/gm5_utils
+
+  protobuf:
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  moor_generator: ^4.1.0
+  build_runner: ^1.10.0
+
+# For information on the generic Dart part of this file, see the
+# following page: https://dart.dev/tools/pub/pubspec
+
+# The following section is specific to Flutter.
+flutter:
+  # This section identifies this Flutter project as a plugin project.
+  # The 'pluginClass' and Android 'package' identifiers should not ordinarily
+  # be modified. They are used by the tooling to maintain consistency when
+  # adding or updating assets for this project.
+  plugin:
+    platforms:
+    # This plugin project was generated without specifying any
+    # platforms with the `--platform` argument. If you see the `fake_platform` map below, remove it and
+    # then add platforms following the instruction here:
+    # https://flutter.dev/docs/development/packages-and-plugins/developing-packages#plugin-platforms
+    # -------------------
+      some_platform:
+        pluginClass: somePluginClass
+    # -------------------
+
+  # To add assets to your plugin package, add an assets section, like this:
+  # assets:
+  #   - images/a_dot_burr.jpeg
+  #   - images/a_dot_ham.jpeg
+  #
+  # For details regarding assets in packages, see
+  # https://flutter.dev/assets-and-images/#from-packages
+  #
+  # An image asset can refer to one or more resolution-specific "variants", see
+  # https://flutter.dev/assets-and-images/#resolution-aware.
+
+  # To add custom fonts to your plugin package, add a fonts section here,
+  # in this "flutter" section. Each entry in this list should have a
+  # "family" key with the font family name, and a "fonts" key with a
+  # list giving the asset and other descriptors for the font. For
+  # example:
+  # fonts:
+  #   - family: Schyler
+  #     fonts:
+  #       - asset: fonts/Schyler-Regular.ttf
+  #       - asset: fonts/Schyler-Italic.ttf
+  #         style: italic
+  #   - family: Trajan Pro
+  #     fonts:
+  #       - asset: fonts/TrajanPro.ttf
+  #       - asset: fonts/TrajanPro_Bold.ttf
+  #         weight: 700
+  #
+  # For details regarding fonts in packages, see
+  # https://flutter.dev/custom-fonts/#from-packages