FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Shinokuni 2020-11-22 19:03:10 +01:00
parent f2607c307c 1ef9757aaf
commit e9e1a94401
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

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

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

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

4
app/build.gradle
View File

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

4
fastlane/metadata/android/en-US/changelogs/12.txt Normal file
View File

@ -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>