Merge branch 'master' into develop

CHANGELOG.md

@@ -1,4 +1,9 @@
-#v1.2.0
+# v1.2.1
+
+- Accept null value for Nextcloud News feed attribute folderId #87
+- Fix local RSS url parsing 
+
+# v1.2.0
 
 - Adaptive icon
 - Background synchronisation

api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt

@@ -1,7 +1,6 @@
 package com.readrops.api.services.nextcloudnews.adapters
 
 import android.annotation.SuppressLint
-import androidx.core.net.toUri
 import com.readrops.api.utils.exceptions.ParseException
 import com.readrops.api.utils.extensions.nextNonEmptyString
 import com.readrops.api.utils.extensions.nextNullableInt

app/build.gradle

@@ -12,8 +12,8 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         buildToolsVersion rootProject.ext.buildToolsVersion
 
-        versionCode 11
-        versionName "1.2.0"
+        versionCode 12
+        versionName "1.2.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     testOptions {

fastlane/metadata/android/en-US/changelogs/12.txt

@@ -0,0 +1,4 @@
+ <ul>
+	<li>Accept null value for Nextcloud News feed attribute folderId #87</li>
+	<li>Fix local RSS url parsing</li>
+</ul>