Selaa lähdekoodia

Fix tests

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 vuosi sitten
vanhempi
commit
cd54581320

+ 5 - 1
app/src/main/java/com/nextcloud/utils/extensions/BundleExtensions.kt

@@ -40,7 +40,11 @@ fun <T : Serializable?> Bundle?.getSerializableArgument(key: String, type: Class
             this.getSerializable(key, type)
         } else {
             @Suppress("UNCHECKED_CAST", "DEPRECATION")
-            this.getSerializable(key) as T
+            if (type.isInstance(this.getSerializable(key))) {
+                this.getSerializable(key) as T
+            } else {
+                null
+            }
         }
     } catch (e: ClassCastException) {
         Log_OC.e(tag, e.localizedMessage)

+ 5 - 1
app/src/main/java/com/nextcloud/utils/extensions/IntentExtensions.kt

@@ -40,7 +40,11 @@ fun <T : Serializable?> Intent?.getSerializableArgument(key: String, type: Class
             this.getSerializableExtra(key, type)
         } else {
             @Suppress("UNCHECKED_CAST", "DEPRECATION")
-            this.getSerializableExtra(key) as T
+            if (type.isInstance(this.getSerializableExtra(key))) {
+                this.getSerializableExtra(key) as T
+            } else {
+                null
+            }
         }
     } catch (e: ClassCastException) {
         Log_OC.e(tag, e.localizedMessage)