Merge branch 'master' into develop

2024-12-25 16:12:36 +01:00 · 2020-11-22 19:03:10 +01:00 · 2020-11-22 19:03:10 +01:00 · e9e1a94401
commit e9e1a94401
parent f2607c307c 1ef9757aaf
4 changed files with 12 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/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
--- a/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt
+++ b/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
--- a/app/build.gradle
+++ b/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 {
--- a/fastlane/metadata/android/en-US/changelogs/12.txt
+++ b/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>