Merge branch 'master' of github.com:Stremio/stremio-core-kotlin into …

…debug
Stremio · Aug 2, 2022 · a438383 · a438383
2 parents 80f0910 + 8c17ac0
commit a438383
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stremio-core-android"
-version = "1.0.10"
+version = "1.0.11"
 authors = ["Smart Code OOD"]
 edition = "2018"
 

diff --git a/README.md b/README.md
@@ -21,11 +21,11 @@ allprojects {
 
 ```gradle
 dependencies {
-    implementation 'com.github.Stremio:stremio-core-kotlin:1.0.10-debug'
+    implementation 'com.github.Stremio:stremio-core-kotlin:1.0.11-debug'
 }
 ```
 
 ## Manual
 
-[Download](https://jitpack.io/com/github/stremio/stremio-core-kotlin/1.0.10-debug/stremio-core-kotlin-1.0.10-debug.aar) aar and link
+[Download](https://jitpack.io/com/github/stremio/stremio-core-kotlin/1.0.11-debug/stremio-core-kotlin-1.0.11-debug.aar) aar and link
 it manually
diff --git a/build.gradle b/build.gradle
@@ -38,8 +38,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 11
-        versionName "1.0.10"
+        versionCode 12
+        versionName "1.0.11"
     }
 
     kotlinOptions {

diff --git a/jitpack.yml b/jitpack.yml
@@ -1,4 +1,4 @@
 install:
   - wget https://github.com/Stremio/stremio-core-kotlin/releases/download/$VERSION/stremio-core-kotlin.aar
   - FILE="-Dfile=stremio-core-kotlin.aar"
-  - mvn install:install-file $FILE -DgroupId=com.stremio.core -DartifactId=stremio-core-kotlin -Dversion=1.0.10 -Dpackaging=aar -DgeneratePom=true
+  - mvn install:install-file $FILE -DgroupId=com.stremio.core -DartifactId=stremio-core-kotlin -Dversion=1.0.11 -Dpackaging=aar -DgeneratePom=true
diff --git a/pom.xml b/pom.xml
@@ -3,5 +3,5 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.stremio.core</groupId>
   <artifactId>stremio-core-kotlin</artifactId>
-  <version>1.0.10</version>
+  <version>1.0.11</version>
 </project>
diff --git a/src/main/proto/stremio/core/runtime/event.proto b/src/main/proto/stremio/core/runtime/event.proto
@@ -32,16 +32,16 @@ message Event {
   }
 
   message ProfilePushedToStorage {
-    required string uid = 1;
+    optional string uid = 1;
   }
   message LibraryItemsPushedToStorage {
     repeated string ids = 1;
   }
   message UserPulledFromAPI {
-    required string uid = 1;
+    optional string uid = 1;
   }
   message UserPushedToAPI {
-    required string uid = 1;
+    optional string uid = 1;
   }
   message AddonsPulledFromAPI {
     repeated string transport_urls = 1;
@@ -62,7 +62,7 @@ message Event {
     required stremio.core.types.AuthRequest auth_request = 1;
   }
   message UserLoggedOut {
-    required string uid = 1;
+    optional string uid = 1;
   }
   message SessionDeleted {
     required string auth_key = 1;

diff --git a/src/main/rust/bridge/event.rs b/src/main/rust/bridge/event.rs
@@ -11,9 +11,7 @@ impl ToProtobuf<runtime::Event, ()> for Event {
     fn to_protobuf(&self, _args: &()) -> runtime::Event {
         let event = match self {
             Event::ProfilePushedToStorage { uid } => runtime::event::Type::ProfilePushedToStorage(
-                runtime::event::ProfilePushedToStorage {
-                    uid: uid.clone().unwrap(),
-                },
+                runtime::event::ProfilePushedToStorage { uid: uid.clone() },
             ),
             Event::LibraryItemsPushedToStorage { ids } => {
                 runtime::event::Type::LibraryItemsPushedToStorage(
@@ -22,12 +20,12 @@ impl ToProtobuf<runtime::Event, ()> for Event {
             }
             Event::UserPulledFromAPI { uid } => {
                 runtime::event::Type::UserPulledFromApi(runtime::event::UserPulledFromApi {
-                    uid: uid.clone().unwrap(),
+                    uid: uid.clone(),
                 })
             }
             Event::UserPushedToAPI { uid } => {
                 runtime::event::Type::UserPushedToApi(runtime::event::UserPushedToApi {
-                    uid: uid.clone().unwrap(),
+                    uid: uid.clone(),
                 })
             }
             Event::AddonsPulledFromAPI { transport_urls } => {
@@ -47,7 +45,7 @@ impl ToProtobuf<runtime::Event, ()> for Event {
             }
             Event::UserLoggedOut { uid } => {
                 runtime::event::Type::UserLoggedOut(runtime::event::UserLoggedOut {
-                    uid: uid.clone().unwrap(),
+                    uid: uid.clone(),
                 })
             }
             Event::SessionDeleted { auth_key } => {