Compare commits
	
		
			121 Commits
		
	
	
		
			v171811310
			...
			d0557cf653
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| d0557cf653 | |||
| f6999dd547 | |||
| 040c845c15 | |||
| cb07227cb7 | |||
| cda09a4e8a | |||
| 3de95ba6e4 | |||
| 47f00dc694 | |||
| 584c6869b5 | |||
| b0c4b010a2 | |||
| e08fc2604f | |||
| 41386adf4e | |||
| 59c307323f | |||
| 41e825bc50 | |||
| 0bab675560 | |||
| 55ced4a5fb | |||
| 2d5ab7bf0c | |||
| 9ba281befb | |||
| 00c8eed034 | |||
| a1e4f89cd1 | |||
| 36a43b3861 | |||
| 
						 | 
					aa6d470f40 | ||
| 
						 | 
					0046a8a477 | ||
| 
						 | 
					43ff9d186a | ||
| 
						 | 
					73dae304be | ||
| 
						 | 
					66103a451b | ||
| 
						 | 
					600c62316d | ||
| 
						 | 
					d370ddc4d1 | ||
| 
						 | 
					4049f6a5c7 | ||
| 
						 | 
					3e96ac207e | ||
| 
						 | 
					84f1ab12cf | ||
| 
						 | 
					f48f6ed788 | ||
| 
						 | 
					e517803bd8 | ||
| 
						 | 
					3eaf390790 | ||
| 
						 | 
					6de54d63e6 | ||
| 
						 | 
					dd7a2f476b | ||
| 
						 | 
					1485cc05f4 | ||
| 
						 | 
					d1dad3e61a | ||
| 
						 | 
					e5024b0420 | ||
| 
						 | 
					9b01692c55 | ||
| 
						 | 
					33aa587d36 | ||
| 
						 | 
					12e0766803 | ||
| 
						 | 
					a8721ad7a4 | ||
| 
						 | 
					bc5e882894 | ||
| 
						 | 
					e3460322b1 | ||
| 
						 | 
					7e3288a076 | ||
| 
						 | 
					ddc754ec25 | ||
| 
						 | 
					134a0766d6 | ||
| 
						 | 
					69da932ab5 | ||
| 
						 | 
					592fb6328a | ||
| 
						 | 
					a0aead6491 | ||
| 
						 | 
					722b6cc06d | ||
| 
						 | 
					6d7c4b40f6 | ||
| 
						 | 
					f538ed39fc | ||
| 
						 | 
					65821492ad | ||
| 
						 | 
					6ede718a9f | ||
| 
						 | 
					f1757937a4 | ||
| 2bd2e0a953 | |||
| 
						 | 
					b5aef28af0 | ||
| 
						 | 
					45747a1506 | ||
| 
						 | 
					c6e2e08bcb | ||
| 
						 | 
					25bf18661e | ||
| 
						 | 
					6b088dcd24 | ||
| 
						 | 
					d2b18e1880 | ||
| 
						 | 
					eec7c94e98 | ||
| 
						 | 
					d1f8fcacc0 | ||
| 
						 | 
					07e4a33cbd | ||
| 
						 | 
					f6317f566e | ||
| 
						 | 
					9f51e4e6a5 | ||
| 
						 | 
					750604a31f | ||
| 
						 | 
					392eee0ad4 | ||
| 
						 | 
					37e7b987ee | ||
| 
						 | 
					9eac51e729 | ||
| 
						 | 
					fa9cce6783 | ||
| 
						 | 
					f0d4b63a97 | ||
| 
						 | 
					83eeb11388 | ||
| 
						 | 
					01f746f33d | ||
| 
						 | 
					200851894b | ||
| 
						 | 
					862e5cf4ab | ||
| 
						 | 
					0b07f2a407 | ||
| 
						 | 
					9ba6feef0b | ||
| 
						 | 
					63a0638522 | ||
| 
						 | 
					f9a4e6e363 | ||
| 
						 | 
					6b40fd4bdc | ||
| 
						 | 
					04c7776466 | ||
| 
						 | 
					92c335b4e1 | ||
| 
						 | 
					17251e576b | ||
| 
						 | 
					62ea782429 | ||
| 
						 | 
					f99474e3c1 | ||
| 
						 | 
					57ac8f428f | ||
| 
						 | 
					9cc1adbf15 | ||
| 
						 | 
					1d9a440ae7 | ||
| 
						 | 
					511553806c | ||
| 
						 | 
					87e7d7c4fe | ||
| 
						 | 
					ec87089310 | ||
| 
						 | 
					d8478ebb01 | ||
| 
						 | 
					600adc81b5 | ||
| 
						 | 
					ddac2870af | ||
| 8d9c8c1394 | |||
| 
						 | 
					b59c3bcb23 | ||
| 7f554adba5 | |||
| 
						 | 
					21ce061282 | ||
| 
						 | 
					bdb71e9b14 | ||
| 
						 | 
					df22e7de15 | ||
| 
						 | 
					6b3550396b | ||
| 
						 | 
					c70f1e31a6 | ||
| 
						 | 
					695670e944 | ||
| 
						 | 
					1028826788 | ||
| 
						 | 
					82a8977c96 | ||
| 
						 | 
					07d9ce1054 | ||
| 
						 | 
					7da7d49277 | ||
| 
						 | 
					9b45365441 | ||
| 
						 | 
					91a7464bce | ||
| 
						 | 
					51add226eb | ||
| 
						 | 
					332e9f5108 | ||
| 
						 | 
					0b91087c07 | ||
| 
						 | 
					ebbb1ba0f8 | ||
| 
						 | 
					e9143ae852 | ||
| 
						 | 
					42e8ecee78 | ||
| 
						 | 
					4efd76fcbc | ||
| 
						 | 
					fb1614070e | ||
| 
						 | 
					c473dd7227 | 
							
								
								
									
										6
									
								
								.github/CONTRIBUTING.md
									
									
									
									
										vendored
									
									
								
							
							
						
						@@ -41,6 +41,12 @@ Always check if the web version of your instance is working.
 | 
			
		||||
* Remember that PR review can take time.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Install Selfoss (if you don't have an instance)
 | 
			
		||||
 | 
			
		||||
I won't provide any selfoss instance url. If you want to help, but to not have one, you'll have to install one, and use it.
 | 
			
		||||
 | 
			
		||||
All the details to need are [here](https://selfoss.aditu.de/).
 | 
			
		||||
 | 
			
		||||
# Build the project
 | 
			
		||||
 | 
			
		||||
You can directly import this project into IntellIJ/Android Studio.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										14
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						@@ -1,5 +1,19 @@
 | 
			
		||||
**1.7.x**
 | 
			
		||||
 | 
			
		||||
- Hiding tags with 0 articles
 | 
			
		||||
 | 
			
		||||
- Fixed issue with basic auth and images loading
 | 
			
		||||
 | 
			
		||||
- Added the ability to justify or left align the reader text
 | 
			
		||||
 | 
			
		||||
- Fixed #251
 | 
			
		||||
 | 
			
		||||
- Added experimental issue to set a default timeout. Should work for #238.
 | 
			
		||||
 | 
			
		||||
- Closing #220.
 | 
			
		||||
 | 
			
		||||
- Start of #238. "Add a quick shortcut to open the app on offline mode ?"
 | 
			
		||||
 | 
			
		||||
- Closes #216. Issue with selfoss version 2.19.
 | 
			
		||||
 | 
			
		||||
- Closes #179. Sync of read/unread/star/unstar items on background task or on app reload with network available.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										31
									
								
								README.md
									
									
									
									
									
								
							
							
						
						@@ -1,24 +1,34 @@
 | 
			
		||||
# ReaderForSelfoss
 | 
			
		||||
# ReaderForSelfoss **(Only available from F-Droid)**
 | 
			
		||||
 | 
			
		||||
[](https://join.slack.com/t/readerforselfoss/shared_invite/enQtMjkyNzc3NjM2Mjc1LTUzZTZhOGM5YjQ1MTI5MWZiODRjMjE1ZDBmMzQxZmQ3NWZhYTNhMTBjNGEwNmE2ZGFjODU5NjUxZjBkMWJmMDQ) [](https://jenkins.amine-bou.fr/job/ReaderForSelfoss/) [](https://www.codetriage.com/aminecmi/readerforselfoss) [](https://crowdin.com/project/readerforselfoss)
 | 
			
		||||
[](https://crowdin.com/project/readerforselfoss)
 | 
			
		||||
 | 
			
		||||
It's an RSS Reader for Android, that **only** works with [Selfoss](https://selfoss.aditu.de/)
 | 
			
		||||
 | 
			
		||||
<a href='https://play.google.com/store/apps/details?id=apps.amine.bou.readerforselfoss'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="100"/></a> <a href="https://f-droid.org/packages/apps.amine.bou.readerforselfoss"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
 | 
			
		||||
**The project is not dead at all.** 
 | 
			
		||||
 | 
			
		||||
Also, the last APK built from source is available [here](https://jenkins.amine-bou.fr/job/ReaderForSelfoss/lastSuccessfulBuild/artifact/SignApksBuilder-out/selfoss-key/selfoss/app-githubConfig-release-unsigned.apk/app-githubConfig-release.apk).
 | 
			
		||||
I still want to work on it, but for the last few months, I didn't have that much time to do so. 
 | 
			
		||||
 | 
			
		||||
## Join the alpha channel
 | 
			
		||||
If you are a developer, don't hesitate to help with PRs.
 | 
			
		||||
 | 
			
		||||
**Keep in mind, it could be instable, but you'll have the new updates faster**
 | 
			
		||||
If you are a user, you can still create new issues. I'll fix them when I can.
 | 
			
		||||
 | 
			
		||||
- First, join the google [group](https://groups.google.com/d/forum/reader-for-selfoss-alpha-testing).
 | 
			
		||||
- Then, join the [alpha channel](https://play.google.com/apps/testing/apps.amine.bou.readerforselfoss) of the app.
 | 
			
		||||
- You'll be able to update the app for the current alpha version.
 | 
			
		||||
<a href="https://f-droid.org/packages/apps.amine.bou.readerforselfoss"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
 | 
			
		||||
 | 
			
		||||
## Screen captures
 | 
			
		||||
 | 
			
		||||
<img src="res//fr-card.png?raw=true" alt="card view" width="400"/> <img src="res//fr-list.png?raw=true" alt="list view" width="400"/>
 | 
			
		||||
 | 
			
		||||
## Like my app ?
 | 
			
		||||
 | 
			
		||||
<a href="https://www.buymeacoffee.com/aminecmi" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/lato-orange.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;" ></a>
 | 
			
		||||
 | 
			
		||||
## Want to help ?
 | 
			
		||||
 | 
			
		||||
Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md)
 | 
			
		||||
1. **You'll have to have a Selfoss instance running.** You'll find everything you need to install it [here](https://selfoss.aditu.de/).
 | 
			
		||||
 | 
			
		||||
2. Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md).
 | 
			
		||||
 | 
			
		||||
3. Build the project by following [these steps](https://github.com/aminecmi/ReaderforSelfoss/blob/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
 | 
			
		||||
 | 
			
		||||
## Useful links
 | 
			
		||||
 | 
			
		||||
@@ -26,4 +36,3 @@ Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob
 | 
			
		||||
- [See what I'm doing](https://github.com/aminecmi/ReaderforSelfoss/projects/1)
 | 
			
		||||
- [Create an issue, or request a new feature](https://github.com/aminecmi/ReaderforSelfoss/issues)
 | 
			
		||||
- [Help translation the app](https://crowdin.com/project/readerforselfoss)
 | 
			
		||||
- [Ask for help](https://join.slack.com/t/readerforselfoss/shared_invite/enQtMjkyNzc3NjM2Mjc1LTUzZTZhOGM5YjQ1MTI5MWZiODRjMjE1ZDBmMzQxZmQ3NWZhYTNhMTBjNGEwNmE2ZGFjODU5NjUxZjBkMWJmMDQ)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,17 +1,17 @@
 | 
			
		||||
buildscript {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ext {
 | 
			
		||||
    configuration = [
 | 
			
		||||
            buildDate: new Date()
 | 
			
		||||
    ]
 | 
			
		||||
    // This will make me able to build multiple times a day. May break thinks. I may forget it.
 | 
			
		||||
    todaysBuilds = "1"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
def gitVersion() {
 | 
			
		||||
    def process = "git describe --abbrev=0 --tags".execute()
 | 
			
		||||
    return process.text.substring(1).replaceAll("\\.", "").trim()
 | 
			
		||||
    def process
 | 
			
		||||
    def maybeTagOfCurrentCommit = 'git describe --contains HEAD'.execute()
 | 
			
		||||
    if (maybeTagOfCurrentCommit.text.isEmpty()) {
 | 
			
		||||
        println "No tag on current commit. Will take the latest one."
 | 
			
		||||
        process = "git for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1".execute()
 | 
			
		||||
    } else {
 | 
			
		||||
        println "Tag found on current commit"
 | 
			
		||||
        process = 'git describe --contains HEAD'.execute()
 | 
			
		||||
    }
 | 
			
		||||
    return process.text.replaceAll("'", "").substring(1).replaceAll("\\.", "").trim()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
def versionCodeFromGit() {
 | 
			
		||||
@@ -67,15 +67,11 @@ android {
 | 
			
		||||
    buildTypes {
 | 
			
		||||
        release {
 | 
			
		||||
            minifyEnabled true
 | 
			
		||||
            shrinkResources true
 | 
			
		||||
            shrinkResources false
 | 
			
		||||
            proguardFiles getDefaultProguardFile('proguard-android.txt'),
 | 
			
		||||
                    'proguard-rules.pro'
 | 
			
		||||
        }
 | 
			
		||||
        debug {
 | 
			
		||||
            buildConfigField "String", "LOGIN_URL", appLoginUrl
 | 
			
		||||
            buildConfigField "String", "LOGIN_USERNAME", appLoginUsername
 | 
			
		||||
            buildConfigField "String", "LOGIN_PASSWORD", appLoginPassword
 | 
			
		||||
            applicationIdSuffix ".dev"
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    flavorDimensions "build"
 | 
			
		||||
@@ -84,36 +80,32 @@ android {
 | 
			
		||||
            versionNameSuffix '-github'
 | 
			
		||||
            dimension "build"
 | 
			
		||||
        }
 | 
			
		||||
        storeConfig {
 | 
			
		||||
            // As jenkins publishes to alpha first, this is the default suffix now.
 | 
			
		||||
            versionNameSuffix '-store'
 | 
			
		||||
            dimension "build"
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
dependencies {
 | 
			
		||||
    // Testing
 | 
			
		||||
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta02'
 | 
			
		||||
    androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
 | 
			
		||||
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-beta01'
 | 
			
		||||
    androidTestImplementation 'androidx.test:runner:1.2.0-beta01'
 | 
			
		||||
    // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
 | 
			
		||||
    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0-beta02'
 | 
			
		||||
    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0-beta01'
 | 
			
		||||
    // Espresso-intents for validation and stubbing of Intents
 | 
			
		||||
    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0-beta02'
 | 
			
		||||
    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0-beta01'
 | 
			
		||||
    implementation fileTree(include: ['*.jar'], dir: 'libs')
 | 
			
		||||
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 | 
			
		||||
    // Android Support
 | 
			
		||||
    implementation "androidx.appcompat:appcompat:$android_version"
 | 
			
		||||
    implementation "com.google.android.material:material:$android_version"
 | 
			
		||||
    implementation "androidx.recyclerview:recyclerview:$android_version"
 | 
			
		||||
    implementation "androidx.appcompat:appcompat:$androidx_version"
 | 
			
		||||
    implementation "com.google.android.material:material:1.1.0-alpha06"
 | 
			
		||||
    implementation "androidx.recyclerview:recyclerview:1.1.0-alpha05"
 | 
			
		||||
    implementation "androidx.legacy:legacy-support-v4:$android_version"
 | 
			
		||||
    implementation "androidx.vectordrawable:vectordrawable:$android_version"
 | 
			
		||||
    implementation "androidx.vectordrawable:vectordrawable:1.1.0-beta01"
 | 
			
		||||
    implementation "androidx.browser:browser:$android_version"
 | 
			
		||||
    implementation "androidx.cardview:cardview:$android_version"
 | 
			
		||||
    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
 | 
			
		||||
    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
 | 
			
		||||
    implementation 'org.jsoup:jsoup:1.13.1'
 | 
			
		||||
 | 
			
		||||
    //multidex
 | 
			
		||||
    implementation 'androidx.multidex:multidex:2.0.0'
 | 
			
		||||
    implementation 'androidx.multidex:multidex:2.0.1'
 | 
			
		||||
 | 
			
		||||
    // About
 | 
			
		||||
    implementation('com.mikepenz:aboutlibraries:6.2.0@aar') {
 | 
			
		||||
@@ -127,7 +119,7 @@ dependencies {
 | 
			
		||||
    implementation 'com.burgstaller:okhttp-digest:1.12'
 | 
			
		||||
 | 
			
		||||
    // Material-ish things
 | 
			
		||||
    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.0.5'
 | 
			
		||||
    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.1.0'
 | 
			
		||||
    implementation 'com.github.jd-alexander:LikeButton:0.2.3'
 | 
			
		||||
    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 | 
			
		||||
 | 
			
		||||
@@ -135,11 +127,8 @@ dependencies {
 | 
			
		||||
    implementation 'com.github.bumptech.glide:glide:4.1.1'
 | 
			
		||||
    implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1'
 | 
			
		||||
 | 
			
		||||
    // Asking politely users to rate the app
 | 
			
		||||
    implementation 'com.github.stkent:amplify:2.2.0'
 | 
			
		||||
 | 
			
		||||
    // Drawer
 | 
			
		||||
    implementation 'co.zsmb:materialdrawer-kt:2.0.1'
 | 
			
		||||
    implementation 'co.zsmb:materialdrawer-kt:2.0.2'
 | 
			
		||||
 | 
			
		||||
    // Themes
 | 
			
		||||
    implementation 'com.52inc:scoops:1.0.0'
 | 
			
		||||
@@ -149,11 +138,10 @@ dependencies {
 | 
			
		||||
    // Pager
 | 
			
		||||
    implementation 'me.relex:circleindicator:2.0.0@aar'
 | 
			
		||||
 | 
			
		||||
    implementation 'androidx.core:core-ktx:1.0.0'
 | 
			
		||||
    //PhotoView
 | 
			
		||||
    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
 | 
			
		||||
 | 
			
		||||
    // Crash
 | 
			
		||||
    implementation 'ch.acra:acra-http:5.2.1'
 | 
			
		||||
    implementation 'ch.acra:acra-dialog:5.2.1'
 | 
			
		||||
    implementation 'androidx.core:core-ktx:1.1.0-beta01'
 | 
			
		||||
 | 
			
		||||
    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
 | 
			
		||||
    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 | 
			
		||||
@@ -162,21 +150,4 @@ dependencies {
 | 
			
		||||
    kapt "androidx.room:room-compiler:$room_version"
 | 
			
		||||
 | 
			
		||||
    implementation "android.arch.work:work-runtime-ktx:$work_version"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
afterEvaluate {
 | 
			
		||||
    initAppLoginPropertiesIfNeeded()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
def initAppLoginPropertiesIfNeeded() {
 | 
			
		||||
    def propertiesFile = file(System.getProperty("user.home") + '/.gradle/gradle.properties')
 | 
			
		||||
    if (!propertiesFile.exists()) {
 | 
			
		||||
        def commentMessage = "This is autogenerated local property from system environment to prevent key to be committed to source control."
 | 
			
		||||
        ant.propertyfile(file: System.getProperty("user.home") + "/.gradle/gradle.properties", comment: commentMessage) {
 | 
			
		||||
            entry(key: "appLoginUrl", value: System.getProperty("appLoginUrl"))
 | 
			
		||||
            entry(key: "appLoginUsername", value: System.getProperty("appLoginUsername"))
 | 
			
		||||
            entry(key: "appLoginPassword", value: System.getProperty("appLoginPassword"))
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,7 +1,6 @@
 | 
			
		||||
<?xml version="1.0" encoding="utf-8"?>
 | 
			
		||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 | 
			
		||||
    package="apps.amine.bou.readerforselfoss"
 | 
			
		||||
    xmlns:tools="http://schemas.android.com/tools">
 | 
			
		||||
    package="apps.amine.bou.readerforselfoss">
 | 
			
		||||
 | 
			
		||||
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 | 
			
		||||
    <uses-permission android:name="android.permission.INTERNET" />
 | 
			
		||||
@@ -12,15 +11,19 @@
 | 
			
		||||
        android:icon="@mipmap/ic_launcher"
 | 
			
		||||
        android:label="@string/app_name"
 | 
			
		||||
        android:supportsRtl="true"
 | 
			
		||||
        android:networkSecurityConfig="@xml/network_security_config"
 | 
			
		||||
        android:theme="@style/NoBar">
 | 
			
		||||
        <activity
 | 
			
		||||
            android:name=".MainActivity"
 | 
			
		||||
            android:theme="@style/SplashTheme">
 | 
			
		||||
            <intent-filter>
 | 
			
		||||
                <action android:name="android.intent.action.MAIN" />
 | 
			
		||||
 | 
			
		||||
                <category android:name="android.intent.category.LAUNCHER" />
 | 
			
		||||
            </intent-filter>
 | 
			
		||||
 | 
			
		||||
            <meta-data
 | 
			
		||||
                android:name="android.app.shortcuts"
 | 
			
		||||
                android:resource="@xml/shortcuts" />
 | 
			
		||||
        </activity>
 | 
			
		||||
        <activity
 | 
			
		||||
            android:name=".LoginActivity"
 | 
			
		||||
@@ -34,7 +37,7 @@
 | 
			
		||||
            android:parentActivityName=".HomeActivity">
 | 
			
		||||
            <meta-data
 | 
			
		||||
                android:name="android.support.PARENT_ACTIVITY"
 | 
			
		||||
                android:value="apps.amine.bou.readerforselfoss.HomeActivity" />
 | 
			
		||||
                android:value=".HomeActivity" />
 | 
			
		||||
        </activity>
 | 
			
		||||
        <activity
 | 
			
		||||
            android:name=".SourcesActivity"
 | 
			
		||||
@@ -52,15 +55,16 @@
 | 
			
		||||
 | 
			
		||||
            <intent-filter>
 | 
			
		||||
                <action android:name="android.intent.action.SEND" />
 | 
			
		||||
 | 
			
		||||
                <category android:name="android.intent.category.DEFAULT" />
 | 
			
		||||
 | 
			
		||||
                <data android:mimeType="text/plain" />
 | 
			
		||||
            </intent-filter>
 | 
			
		||||
        </activity>
 | 
			
		||||
        <activity
 | 
			
		||||
            android:name=".ReaderActivity">
 | 
			
		||||
        </activity>
 | 
			
		||||
        <activity
 | 
			
		||||
            android:name=".ImageActivity">
 | 
			
		||||
        </activity>
 | 
			
		||||
 | 
			
		||||
        <meta-data
 | 
			
		||||
            android:name="apps.amine.bou.readerforselfoss.utils.glide.SelfSignedGlideModule"
 | 
			
		||||
@@ -73,6 +77,9 @@
 | 
			
		||||
            android:value="true" />
 | 
			
		||||
 | 
			
		||||
        <meta-data android:name="android.max_aspect" android:value="2.1" />
 | 
			
		||||
        <meta-data
 | 
			
		||||
            android:name="preloaded_fonts"
 | 
			
		||||
            android:resource="@array/preloaded_fonts" />
 | 
			
		||||
    </application>
 | 
			
		||||
 | 
			
		||||
</manifest>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
package apps.amine.bou.readerforselfoss
 | 
			
		||||
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import android.content.Intent
 | 
			
		||||
import android.os.Build
 | 
			
		||||
import android.os.Bundle
 | 
			
		||||
@@ -85,11 +86,13 @@ class AddSourceActivity : AppCompatActivity() {
 | 
			
		||||
 | 
			
		||||
        try {
 | 
			
		||||
            val prefs = PreferenceManager.getDefaultSharedPreferences(this)
 | 
			
		||||
            val settings =
 | 
			
		||||
                getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
 | 
			
		||||
            api = SelfossApi(
 | 
			
		||||
                this,
 | 
			
		||||
                this@AddSourceActivity,
 | 
			
		||||
                prefs.getBoolean("isSelfSignedCert", false),
 | 
			
		||||
                prefs.getBoolean("should_log_everything", false)
 | 
			
		||||
                settings.getBoolean("isSelfSignedCert", false),
 | 
			
		||||
                prefs.getString("api_timeout", "-1").toLong()
 | 
			
		||||
            )
 | 
			
		||||
        } catch (e: IllegalArgumentException) {
 | 
			
		||||
            mustLoginToAddSource()
 | 
			
		||||
@@ -108,7 +111,7 @@ class AddSourceActivity : AppCompatActivity() {
 | 
			
		||||
        super.onResume()
 | 
			
		||||
        val config = Config(this)
 | 
			
		||||
 | 
			
		||||
        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid()) {
 | 
			
		||||
        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid(this@AddSourceActivity)) {
 | 
			
		||||
            mustLoginToAddSource()
 | 
			
		||||
        } else {
 | 
			
		||||
            handleSpoutsSpinner(spoutsSpinner, api, progress, formContainer)
 | 
			
		||||
 
 | 
			
		||||
@@ -4,42 +4,30 @@ import android.content.Context
 | 
			
		||||
import android.content.Intent
 | 
			
		||||
import android.content.SharedPreferences
 | 
			
		||||
import android.graphics.Color
 | 
			
		||||
import android.graphics.drawable.BitmapDrawable
 | 
			
		||||
import android.graphics.drawable.GradientDrawable
 | 
			
		||||
import android.net.Uri
 | 
			
		||||
import android.os.Build
 | 
			
		||||
import android.os.Bundle
 | 
			
		||||
import android.preference.PreferenceManager
 | 
			
		||||
import androidx.core.view.MenuItemCompat
 | 
			
		||||
import androidx.appcompat.app.AlertDialog
 | 
			
		||||
import androidx.appcompat.app.AppCompatActivity
 | 
			
		||||
import androidx.recyclerview.widget.DividerItemDecoration
 | 
			
		||||
import androidx.recyclerview.widget.GridLayoutManager
 | 
			
		||||
import androidx.recyclerview.widget.RecyclerView
 | 
			
		||||
import androidx.appcompat.widget.SearchView
 | 
			
		||||
import androidx.recyclerview.widget.StaggeredGridLayoutManager
 | 
			
		||||
import androidx.recyclerview.widget.ItemTouchHelper
 | 
			
		||||
import android.util.Log
 | 
			
		||||
import android.view.Menu
 | 
			
		||||
import android.view.MenuItem
 | 
			
		||||
import android.view.View
 | 
			
		||||
import android.widget.Toast
 | 
			
		||||
import androidx.appcompat.app.AlertDialog
 | 
			
		||||
import androidx.appcompat.app.AppCompatActivity
 | 
			
		||||
import androidx.appcompat.widget.SearchView
 | 
			
		||||
import androidx.core.view.MenuItemCompat
 | 
			
		||||
import androidx.recyclerview.widget.*
 | 
			
		||||
import androidx.room.Room
 | 
			
		||||
import androidx.room.RoomDatabase
 | 
			
		||||
import androidx.work.Constraints
 | 
			
		||||
import androidx.work.ExistingPeriodicWorkPolicy
 | 
			
		||||
import androidx.work.NetworkType
 | 
			
		||||
import androidx.work.OneTimeWorkRequestBuilder
 | 
			
		||||
import androidx.work.PeriodicWorkRequestBuilder
 | 
			
		||||
import androidx.work.WorkManager
 | 
			
		||||
import apps.amine.bou.readerforselfoss.adapters.ItemCardAdapter
 | 
			
		||||
import apps.amine.bou.readerforselfoss.adapters.ItemListAdapter
 | 
			
		||||
import apps.amine.bou.readerforselfoss.adapters.ItemsAdapter
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.Item
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.Source
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.Stats
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.Tag
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.*
 | 
			
		||||
import apps.amine.bou.readerforselfoss.background.LoadingWorker
 | 
			
		||||
import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 | 
			
		||||
import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 | 
			
		||||
@@ -52,10 +40,8 @@ import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.bottombar.maybeShow
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.bottombar.removeBadge
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.drawer.CustomUrlPrimaryDrawerItem
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.flattenTags
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.longHash
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.persistence.toView
 | 
			
		||||
@@ -67,9 +53,8 @@ import co.zsmb.materialdrawerkt.draweritems.profile.profile
 | 
			
		||||
import com.ashokvarma.bottomnavigation.BottomNavigationBar
 | 
			
		||||
import com.ashokvarma.bottomnavigation.BottomNavigationItem
 | 
			
		||||
import com.ashokvarma.bottomnavigation.TextBadgeItem
 | 
			
		||||
import com.bumptech.glide.Glide
 | 
			
		||||
import com.ftinc.scoop.Scoop
 | 
			
		||||
import com.github.stkent.amplify.tracking.Amplify
 | 
			
		||||
import com.google.gson.reflect.TypeToken
 | 
			
		||||
import com.mikepenz.aboutlibraries.Libs
 | 
			
		||||
import com.mikepenz.aboutlibraries.LibsBuilder
 | 
			
		||||
import com.mikepenz.materialdrawer.Drawer
 | 
			
		||||
@@ -79,8 +64,6 @@ import com.mikepenz.materialdrawer.model.DividerDrawerItem
 | 
			
		||||
import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
 | 
			
		||||
import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
 | 
			
		||||
import kotlinx.android.synthetic.main.activity_home.*
 | 
			
		||||
import kotlinx.android.synthetic.main.fragment_article.*
 | 
			
		||||
import org.acra.ACRA
 | 
			
		||||
import retrofit2.Call
 | 
			
		||||
import retrofit2.Callback
 | 
			
		||||
import retrofit2.Response
 | 
			
		||||
@@ -101,8 +84,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
    private var items: ArrayList<Item> = ArrayList()
 | 
			
		||||
    private var allItems: ArrayList<Item> = ArrayList()
 | 
			
		||||
 | 
			
		||||
    private var debugReadingItems = false
 | 
			
		||||
    private var shouldLogEverything = false
 | 
			
		||||
    private var internalBrowser = false
 | 
			
		||||
    private var articleViewer = false
 | 
			
		||||
    private var shouldBeCardView = false
 | 
			
		||||
@@ -145,10 +126,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
    private var badgeAll: Int = -1
 | 
			
		||||
    private var badgeFavs: Int = -1
 | 
			
		||||
 | 
			
		||||
    private var fromTabShortcut: Boolean = false
 | 
			
		||||
    private var offlineShortcut: Boolean = false
 | 
			
		||||
 | 
			
		||||
    private lateinit var tagsBadge: Map<Long, Int>
 | 
			
		||||
 | 
			
		||||
    private lateinit var db: AppDatabase
 | 
			
		||||
 | 
			
		||||
    private lateinit var config: Config
 | 
			
		||||
 | 
			
		||||
    data class DrawerData(val tags: List<Tag>?, val sources: List<Source>?)
 | 
			
		||||
 | 
			
		||||
    override fun onStart() {
 | 
			
		||||
@@ -158,17 +144,22 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
 | 
			
		||||
    override fun onCreate(savedInstanceState: Bundle?) {
 | 
			
		||||
        appColors = AppColors(this@HomeActivity)
 | 
			
		||||
        config = Config(this@HomeActivity)
 | 
			
		||||
 | 
			
		||||
        super.onCreate(savedInstanceState)
 | 
			
		||||
 | 
			
		||||
        fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
 | 
			
		||||
        offlineShortcut =  intent.getBooleanExtra("startOffline", false)
 | 
			
		||||
 | 
			
		||||
        if (fromTabShortcut) {
 | 
			
		||||
            elementsShown = intent.getIntExtra("shortcutTab", UNREAD_SHOWN)
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        setContentView(R.layout.activity_home)
 | 
			
		||||
 | 
			
		||||
        handleThemeBinding()
 | 
			
		||||
 | 
			
		||||
        setSupportActionBar(toolBar)
 | 
			
		||||
        if (savedInstanceState == null) {
 | 
			
		||||
            Amplify.getSharedInstance().promptIfReady(promptView)
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        db = Room.databaseBuilder(
 | 
			
		||||
            applicationContext,
 | 
			
		||||
@@ -185,7 +176,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
            this,
 | 
			
		||||
            this@HomeActivity,
 | 
			
		||||
            settings.getBoolean("isSelfSignedCert", false),
 | 
			
		||||
            shouldLogEverything
 | 
			
		||||
            sharedPref.getString("api_timeout", "-1").toLong()
 | 
			
		||||
        )
 | 
			
		||||
        items = ArrayList()
 | 
			
		||||
        allItems = ArrayList()
 | 
			
		||||
@@ -203,6 +194,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
            R.color.refresh_progress_3
 | 
			
		||||
        )
 | 
			
		||||
        swipeRefreshLayout.setOnRefreshListener {
 | 
			
		||||
            offlineShortcut = false
 | 
			
		||||
            allItems = ArrayList()
 | 
			
		||||
            lastFetchDone = false
 | 
			
		||||
            handleDrawerItems()
 | 
			
		||||
@@ -218,7 +210,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                    recyclerView: RecyclerView,
 | 
			
		||||
                    viewHolder: RecyclerView.ViewHolder
 | 
			
		||||
                ): Int =
 | 
			
		||||
                    if (elementsShown != UNREAD_SHOWN) {
 | 
			
		||||
                    if (elementsShown != UNREAD_SHOWN && elementsShown != READ_SHOWN) {
 | 
			
		||||
                        0
 | 
			
		||||
                    } else {
 | 
			
		||||
                        super.getSwipeDirs(
 | 
			
		||||
@@ -238,14 +230,18 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                    val i = items.elementAtOrNull(position)
 | 
			
		||||
 | 
			
		||||
                    if (i != null) {
 | 
			
		||||
                        val adapter = recyclerView.adapter
 | 
			
		||||
                        val adapter = recyclerView.adapter as ItemsAdapter<*>
 | 
			
		||||
 | 
			
		||||
                        when (adapter) {
 | 
			
		||||
                            is ItemCardAdapter -> adapter.removeItemAtIndex(position)
 | 
			
		||||
                            is ItemListAdapter -> adapter.removeItemAtIndex(position)
 | 
			
		||||
                        val wasItemUnread = adapter.unreadItemStatusAtIndex(position)
 | 
			
		||||
 | 
			
		||||
                        adapter.handleItemAtIndex(position)
 | 
			
		||||
 | 
			
		||||
                        if (wasItemUnread) {
 | 
			
		||||
                            badgeNew--
 | 
			
		||||
                        } else {
 | 
			
		||||
                            badgeNew++
 | 
			
		||||
                        }
 | 
			
		||||
 | 
			
		||||
                        badgeNew--
 | 
			
		||||
                        reloadBadgeContent()
 | 
			
		||||
 | 
			
		||||
                        val tagHashes = i.tags.tags.split(",").map { it.longHash() }
 | 
			
		||||
@@ -292,19 +288,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
 | 
			
		||||
        val tabNew =
 | 
			
		||||
            BottomNavigationItem(
 | 
			
		||||
                R.drawable.ic_fiber_new_black_24dp,
 | 
			
		||||
                R.drawable.ic_tab_fiber_new_black_24dp,
 | 
			
		||||
                getString(R.string.tab_new)
 | 
			
		||||
            ).setActiveColor(appColors.colorAccent)
 | 
			
		||||
                .setBadgeItem(tabNewBadge)
 | 
			
		||||
        val tabArchive =
 | 
			
		||||
            BottomNavigationItem(
 | 
			
		||||
                R.drawable.ic_archive_black_24dp,
 | 
			
		||||
                R.drawable.ic_tab_archive_black_24dp,
 | 
			
		||||
                getString(R.string.tab_read)
 | 
			
		||||
            ).setActiveColor(appColors.colorAccentDark)
 | 
			
		||||
                .setBadgeItem(tabArchiveBadge)
 | 
			
		||||
        val tabStarred =
 | 
			
		||||
            BottomNavigationItem(
 | 
			
		||||
                R.drawable.ic_favorite_black_24dp,
 | 
			
		||||
                R.drawable.ic_tab_favorite_black_24dp,
 | 
			
		||||
                getString(R.string.tab_favs)
 | 
			
		||||
            ).setActiveColorResource(R.color.pink)
 | 
			
		||||
                .setBadgeItem(tabStarredBadge)
 | 
			
		||||
@@ -318,6 +314,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
 | 
			
		||||
        bottomBar.setMode(BottomNavigationBar.MODE_SHIFTING)
 | 
			
		||||
        bottomBar.setBackgroundStyle(BottomNavigationBar.BACKGROUND_STYLE_STATIC)
 | 
			
		||||
 | 
			
		||||
        if (fromTabShortcut) {
 | 
			
		||||
            bottomBar.selectTab(elementsShown - 1)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun onResume() {
 | 
			
		||||
@@ -348,8 +348,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
 | 
			
		||||
        getElementsAccordingToTab()
 | 
			
		||||
 | 
			
		||||
        handleGDPRDialog(sharedPref.getBoolean("GDPR_shown", false))
 | 
			
		||||
 | 
			
		||||
        handleRecurringTask()
 | 
			
		||||
 | 
			
		||||
        handleOfflineActions()
 | 
			
		||||
@@ -384,8 +382,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun handleSharedPrefs() {
 | 
			
		||||
        debugReadingItems = sharedPref.getBoolean("read_debug", false)
 | 
			
		||||
        shouldLogEverything = sharedPref.getBoolean("should_log_everything", false)
 | 
			
		||||
        internalBrowser = sharedPref.getBoolean("prefer_internal_browser", true)
 | 
			
		||||
        articleViewer = sharedPref.getBoolean("prefer_article_viewer", true)
 | 
			
		||||
        shouldBeCardView = sharedPref.getBoolean("card_view_active", false)
 | 
			
		||||
@@ -462,7 +458,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
 | 
			
		||||
            footer {
 | 
			
		||||
                primaryItem(R.string.drawer_report_bug) {
 | 
			
		||||
                    icon = R.drawable.ic_bug_report
 | 
			
		||||
                    icon = R.drawable.ic_bug_report_black_24dp
 | 
			
		||||
                    iconTintingEnabled = true
 | 
			
		||||
                    onClick { _ ->
 | 
			
		||||
                        val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Config.trackerUrl))
 | 
			
		||||
@@ -472,7 +468,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                primaryItem(R.string.title_activity_settings) {
 | 
			
		||||
                    icon = R.drawable.ic_settings
 | 
			
		||||
                    icon = R.drawable.ic_settings_black_24dp
 | 
			
		||||
                    iconTintingEnabled = true
 | 
			
		||||
                    onClick { _ ->
 | 
			
		||||
                        startActivityForResult(
 | 
			
		||||
@@ -502,7 +498,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                        )
 | 
			
		||||
                    }
 | 
			
		||||
                } else {
 | 
			
		||||
                    val filteredTags = maybeTags.filterNot { hiddenTags.contains(it.tag) }
 | 
			
		||||
                    val filteredTags = maybeTags
 | 
			
		||||
                        .filterNot { hiddenTags.contains(it.tag) }
 | 
			
		||||
                        .sortedBy { it.unread == 0 }
 | 
			
		||||
                    tagsBadge = filteredTags.map {
 | 
			
		||||
                        val gd = GradientDrawable()
 | 
			
		||||
                        val color = try {
 | 
			
		||||
@@ -515,12 +513,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                        gd.shape = GradientDrawable.RECTANGLE
 | 
			
		||||
                        gd.setSize(30, 30)
 | 
			
		||||
                        gd.cornerRadius = 30F
 | 
			
		||||
                        drawer.addItem(
 | 
			
		||||
                        var drawerItem =
 | 
			
		||||
                            PrimaryDrawerItem()
 | 
			
		||||
                                .withName(it.tag)
 | 
			
		||||
                                .withIdentifier(it.tag.longHash())
 | 
			
		||||
                                .withIcon(gd)
 | 
			
		||||
                                .withBadge("${it.unread}")
 | 
			
		||||
                                .withBadgeStyle(
 | 
			
		||||
                                    BadgeStyle().withTextColor(Color.WHITE)
 | 
			
		||||
                                        .withColor(appColors.colorAccent)
 | 
			
		||||
@@ -531,6 +528,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                                    getElementsAccordingToTab()
 | 
			
		||||
                                    false
 | 
			
		||||
                                }
 | 
			
		||||
                        if (it.unread > 0) {
 | 
			
		||||
                            drawerItem = drawerItem.withBadge("${it.unread}")
 | 
			
		||||
                        }
 | 
			
		||||
                        drawer.addItem(
 | 
			
		||||
                            drawerItem
 | 
			
		||||
                        )
 | 
			
		||||
 | 
			
		||||
                        (it.tag.longHash() to it.unread)
 | 
			
		||||
@@ -562,12 +564,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                        gd.shape = GradientDrawable.RECTANGLE
 | 
			
		||||
                        gd.setSize(30, 30)
 | 
			
		||||
                        gd.cornerRadius = 30F
 | 
			
		||||
                        drawer.addItem(
 | 
			
		||||
                        var drawerItem =
 | 
			
		||||
                            PrimaryDrawerItem()
 | 
			
		||||
                                .withName(it.tag)
 | 
			
		||||
                                .withIdentifier(it.tag.longHash())
 | 
			
		||||
                                .withIcon(gd)
 | 
			
		||||
                                .withBadge("${it.unread}")
 | 
			
		||||
                                .withBadgeStyle(
 | 
			
		||||
                                    BadgeStyle().withTextColor(Color.WHITE)
 | 
			
		||||
                                        .withColor(appColors.colorAccent)
 | 
			
		||||
@@ -578,6 +579,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                                    getElementsAccordingToTab()
 | 
			
		||||
                                    false
 | 
			
		||||
                                }
 | 
			
		||||
                        if (it.unread > 0) {
 | 
			
		||||
                            drawerItem = drawerItem.withBadge("${it.unread}")
 | 
			
		||||
                        }
 | 
			
		||||
                        drawer.addItem(
 | 
			
		||||
                            drawerItem
 | 
			
		||||
                        )
 | 
			
		||||
 | 
			
		||||
                        (it.tag.longHash() to it.unread)
 | 
			
		||||
@@ -596,18 +602,27 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                    }
 | 
			
		||||
                } else {
 | 
			
		||||
                    for (tag in maybeSources) {
 | 
			
		||||
                        drawer.addItem(
 | 
			
		||||
                            CustomUrlPrimaryDrawerItem()
 | 
			
		||||
                        val item = PrimaryDrawerItem()
 | 
			
		||||
                                .withName(tag.title)
 | 
			
		||||
                                .withIdentifier(tag.id.toLong())
 | 
			
		||||
                                .withIcon(tag.getIcon(this@HomeActivity))
 | 
			
		||||
                                .withOnDrawerItemClickListener { _, _, _ ->
 | 
			
		||||
                                    allItems = ArrayList()
 | 
			
		||||
                                    maybeSourceFilter = tag
 | 
			
		||||
                                    getElementsAccordingToTab()
 | 
			
		||||
                                    false
 | 
			
		||||
                                }
 | 
			
		||||
                        )
 | 
			
		||||
                        if (tag.getIcon(this@HomeActivity).isNotBlank()) {
 | 
			
		||||
                            thread {
 | 
			
		||||
                                try {
 | 
			
		||||
                                    item.withIcon(BitmapDrawable(resources, Glide.with(this@HomeActivity).asBitmap().load(tag.getIcon(this@HomeActivity)).submit(100, 100).get()))
 | 
			
		||||
                                } catch (e: Exception) {
 | 
			
		||||
                                }
 | 
			
		||||
                            }
 | 
			
		||||
                        } else {
 | 
			
		||||
                            item.withIcon(R.mipmap.ic_launcher)
 | 
			
		||||
                        }
 | 
			
		||||
                        drawer.addItem(item)
 | 
			
		||||
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
@@ -628,14 +643,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                            false
 | 
			
		||||
                        }
 | 
			
		||||
                )
 | 
			
		||||
                drawer.addItem(DividerDrawerItem())
 | 
			
		||||
                drawer.addItem(
 | 
			
		||||
                    SecondaryDrawerItem()
 | 
			
		||||
                        .withName(getString(R.string.drawer_item_tags))
 | 
			
		||||
                        .withIdentifier(DRAWER_ID_TAGS)
 | 
			
		||||
                        .withSelectable(false)
 | 
			
		||||
                )
 | 
			
		||||
                handleTags(maybeDrawerData.tags)
 | 
			
		||||
                if (hiddenTags.isNotEmpty()) {
 | 
			
		||||
                    drawer.addItem(DividerDrawerItem())
 | 
			
		||||
                    drawer.addItem(
 | 
			
		||||
@@ -647,6 +654,14 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                    handleHiddenTags(maybeDrawerData.tags)
 | 
			
		||||
                }
 | 
			
		||||
                drawer.addItem(DividerDrawerItem())
 | 
			
		||||
                drawer.addItem(
 | 
			
		||||
                    SecondaryDrawerItem()
 | 
			
		||||
                        .withName(getString(R.string.drawer_item_tags))
 | 
			
		||||
                        .withIdentifier(DRAWER_ID_TAGS)
 | 
			
		||||
                        .withSelectable(false)
 | 
			
		||||
                )
 | 
			
		||||
                handleTags(maybeDrawerData.tags)
 | 
			
		||||
                drawer.addItem(DividerDrawerItem())
 | 
			
		||||
                drawer.addItem(
 | 
			
		||||
                    SecondaryDrawerItem()
 | 
			
		||||
                        .withName(getString(R.string.drawer_item_sources))
 | 
			
		||||
@@ -664,7 +679,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                    PrimaryDrawerItem()
 | 
			
		||||
                        .withName(R.string.action_about)
 | 
			
		||||
                        .withSelectable(false)
 | 
			
		||||
                        .withIcon(R.drawable.ic_info_outline)
 | 
			
		||||
                        .withIcon(R.drawable.ic_info_outline_white_24dp)
 | 
			
		||||
                        .withIconTintingEnabled(true)
 | 
			
		||||
                        .withOnDrawerItemClickListener { _, _, _ ->
 | 
			
		||||
                            LibsBuilder()
 | 
			
		||||
@@ -721,7 +736,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
            var sources: List<Source>?
 | 
			
		||||
 | 
			
		||||
            fun sourcesApiCall() {
 | 
			
		||||
                if (this@HomeActivity.isNetworkAccessible(null)) {
 | 
			
		||||
                if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
 | 
			
		||||
                    api.sources.enqueue(object : Callback<List<Source>> {
 | 
			
		||||
                        override fun onResponse(
 | 
			
		||||
                            call: Call<List<Source>>?,
 | 
			
		||||
@@ -744,7 +759,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            if (this@HomeActivity.isNetworkAccessible(null)) {
 | 
			
		||||
            if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
 | 
			
		||||
                api.tags.enqueue(object : Callback<List<Tag>> {
 | 
			
		||||
                    override fun onResponse(
 | 
			
		||||
                        call: Call<List<Tag>>,
 | 
			
		||||
@@ -875,7 +890,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                                    else -> Unit
 | 
			
		||||
                                }
 | 
			
		||||
                            } else {
 | 
			
		||||
                                if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout))) {
 | 
			
		||||
                                if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
 | 
			
		||||
                                    when (position) {
 | 
			
		||||
                                        0 -> getUnRead()
 | 
			
		||||
                                        1 -> getRead()
 | 
			
		||||
@@ -972,7 +987,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                        handleListResult()
 | 
			
		||||
                        doGetAccordingToTab()
 | 
			
		||||
                    } else {
 | 
			
		||||
                        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout))) {
 | 
			
		||||
                        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
 | 
			
		||||
                            doGetAccordingToTab()
 | 
			
		||||
                            getAndStoreAllItems()
 | 
			
		||||
                        }
 | 
			
		||||
@@ -1031,7 +1046,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
            swipeRefreshLayout.post { swipeRefreshLayout.isRefreshing = true }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout))) {
 | 
			
		||||
        if (this@HomeActivity.isNetworkAccessible(this@HomeActivity.findViewById(R.id.coordLayout), offlineShortcut)) {
 | 
			
		||||
            call(maybeTagFilter?.tag, maybeSourceFilter?.id?.toLong(), maybeSearchFilter)
 | 
			
		||||
                .enqueue(object : Callback<List<Item>> {
 | 
			
		||||
                    override fun onResponse(
 | 
			
		||||
@@ -1119,8 +1134,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                            articleViewer,
 | 
			
		||||
                            fullHeightCards,
 | 
			
		||||
                            appColors,
 | 
			
		||||
                            debugReadingItems,
 | 
			
		||||
                            userIdentifier
 | 
			
		||||
                            userIdentifier,
 | 
			
		||||
                            config
 | 
			
		||||
                        ) {
 | 
			
		||||
                            updateItems(it)
 | 
			
		||||
                        }
 | 
			
		||||
@@ -1134,9 +1149,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                            customTabActivityHelper,
 | 
			
		||||
                            internalBrowser,
 | 
			
		||||
                            articleViewer,
 | 
			
		||||
                            debugReadingItems,
 | 
			
		||||
                            userIdentifier,
 | 
			
		||||
                            appColors
 | 
			
		||||
                            appColors,
 | 
			
		||||
                            config
 | 
			
		||||
                        ) {
 | 
			
		||||
                            updateItems(it)
 | 
			
		||||
                        }
 | 
			
		||||
@@ -1161,7 +1176,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun reloadBadges() {
 | 
			
		||||
        if (this@HomeActivity.isNetworkAccessible(null) && (displayUnreadCount || displayAllCount)) {
 | 
			
		||||
        if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut) && (displayUnreadCount || displayAllCount)) {
 | 
			
		||||
            api.stats.enqueue(object : Callback<Stats> {
 | 
			
		||||
                override fun onResponse(call: Call<Stats>, response: Response<Stats>) {
 | 
			
		||||
                    if (response.body() != null) {
 | 
			
		||||
@@ -1267,7 +1282,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
 | 
			
		||||
        when (item.itemId) {
 | 
			
		||||
            R.id.refresh -> {
 | 
			
		||||
                if (this@HomeActivity.isNetworkAccessible(null)) {
 | 
			
		||||
                if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
 | 
			
		||||
                    needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
 | 
			
		||||
                        api.update().enqueue(object : Callback<String> {
 | 
			
		||||
                            override fun onResponse(
 | 
			
		||||
@@ -1307,11 +1322,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                                .map { it.key to it.value.size }
 | 
			
		||||
                                .toMap()
 | 
			
		||||
 | 
			
		||||
                        fun readAllDebug(e: Throwable) {
 | 
			
		||||
                            ACRA.getErrorReporter().maybeHandleSilentException(e, this@HomeActivity)
 | 
			
		||||
                        }
 | 
			
		||||
 | 
			
		||||
                        if (ids.isNotEmpty() && this@HomeActivity.isNetworkAccessible(null)) {
 | 
			
		||||
                        if (ids.isNotEmpty() && this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
 | 
			
		||||
                            api.readAll(ids).enqueue(object : Callback<SuccessResponse> {
 | 
			
		||||
                                override fun onResponse(
 | 
			
		||||
                                    call: Call<SuccessResponse>,
 | 
			
		||||
@@ -1325,12 +1336,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                                        ).show()
 | 
			
		||||
                                        tabNewBadge.removeBadge()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
                                        tagsBadge = itemsByTag.map {
 | 
			
		||||
                                            (it.key to ((tagsBadge[it.key] ?: it.value) - it.value))
 | 
			
		||||
                                        }.toMap()
 | 
			
		||||
 | 
			
		||||
                                        reloadTagsBadges()
 | 
			
		||||
                                        handleDrawerItems()
 | 
			
		||||
 | 
			
		||||
                                        getElementsAccordingToTab()
 | 
			
		||||
                                    } else {
 | 
			
		||||
@@ -1340,14 +1346,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                                            Toast.LENGTH_SHORT
 | 
			
		||||
                                        ).show()
 | 
			
		||||
 | 
			
		||||
                                        if (debugReadingItems) {
 | 
			
		||||
                                            readAllDebug(
 | 
			
		||||
                                                Throwable(
 | 
			
		||||
                                                    "Got response, but : response.body() (${response.body()}) != null && response.body()!!.isSuccess (${response.body()?.isSuccess})." +
 | 
			
		||||
                                                            "Request url was (${call.request().url()}), ids were $ids"
 | 
			
		||||
                                                )
 | 
			
		||||
                                            )
 | 
			
		||||
                                        }
 | 
			
		||||
 | 
			
		||||
                                    }
 | 
			
		||||
 | 
			
		||||
                                    swipeRefreshLayout.isRefreshing = false
 | 
			
		||||
@@ -1360,10 +1359,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
                                        Toast.LENGTH_SHORT
 | 
			
		||||
                                    ).show()
 | 
			
		||||
                                    swipeRefreshLayout.isRefreshing = false
 | 
			
		||||
 | 
			
		||||
                                    if (debugReadingItems) {
 | 
			
		||||
                                        readAllDebug(t)
 | 
			
		||||
                                    }
 | 
			
		||||
                                }
 | 
			
		||||
                            })
 | 
			
		||||
                            items = ArrayList()
 | 
			
		||||
@@ -1400,24 +1395,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
        items = adapterItems
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun handleGDPRDialog(GDPRShown: Boolean) {
 | 
			
		||||
        val sharedEditor = sharedPref.edit()
 | 
			
		||||
        if (!GDPRShown) {
 | 
			
		||||
            val alertDialog = AlertDialog.Builder(this).create()
 | 
			
		||||
            alertDialog.setTitle(getString(R.string.gdpr_dialog_title))
 | 
			
		||||
            alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
 | 
			
		||||
            alertDialog.setButton(
 | 
			
		||||
                AlertDialog.BUTTON_NEUTRAL,
 | 
			
		||||
                "OK"
 | 
			
		||||
            ) { dialog, _ ->
 | 
			
		||||
                sharedEditor.putBoolean("GDPR_shown", true)
 | 
			
		||||
                sharedEditor.commit()
 | 
			
		||||
                dialog.dismiss()
 | 
			
		||||
            }
 | 
			
		||||
            alertDialog.show()
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun handleRecurringTask() {
 | 
			
		||||
        if (periodicRefresh) {
 | 
			
		||||
            val myConstraints = Constraints.Builder()
 | 
			
		||||
@@ -1450,12 +1427,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 | 
			
		||||
               }
 | 
			
		||||
 | 
			
		||||
               override fun onFailure(call: Call<T>, t: Throwable) {
 | 
			
		||||
                   ACRA.getErrorReporter().maybeHandleSilentException(t, this@HomeActivity)
 | 
			
		||||
               }
 | 
			
		||||
           })
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (this@HomeActivity.isNetworkAccessible(null)) {
 | 
			
		||||
        if (this@HomeActivity.isNetworkAccessible(null, offlineShortcut)) {
 | 
			
		||||
            thread {
 | 
			
		||||
                val actions = db.actionsDao().actions()
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,52 @@
 | 
			
		||||
package apps.amine.bou.readerforselfoss
 | 
			
		||||
 | 
			
		||||
import android.os.Bundle
 | 
			
		||||
import android.view.MenuItem
 | 
			
		||||
import androidx.appcompat.app.AppCompatActivity
 | 
			
		||||
import androidx.fragment.app.FragmentManager
 | 
			
		||||
import androidx.fragment.app.FragmentStatePagerAdapter
 | 
			
		||||
import apps.amine.bou.readerforselfoss.fragments.ImageFragment
 | 
			
		||||
import kotlinx.android.synthetic.main.activity_reader.*
 | 
			
		||||
 | 
			
		||||
class ImageActivity : AppCompatActivity() {
 | 
			
		||||
    private lateinit var allImages : ArrayList<String>
 | 
			
		||||
    private var position : Int = 0
 | 
			
		||||
 | 
			
		||||
    override fun onCreate(savedInstanceState: Bundle?) {
 | 
			
		||||
        super.onCreate(savedInstanceState)
 | 
			
		||||
 | 
			
		||||
        setContentView(R.layout.activity_image)
 | 
			
		||||
 | 
			
		||||
        setSupportActionBar(toolBar)
 | 
			
		||||
        supportActionBar?.setDisplayShowTitleEnabled(false)
 | 
			
		||||
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
 | 
			
		||||
 | 
			
		||||
        allImages = intent.getStringArrayListExtra("allImages")
 | 
			
		||||
        position = intent.getIntExtra("position", 0)
 | 
			
		||||
 | 
			
		||||
        pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager)
 | 
			
		||||
        pager.currentItem = position
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
 | 
			
		||||
        when (item.itemId) {
 | 
			
		||||
            android.R.id.home -> {
 | 
			
		||||
                onBackPressed()
 | 
			
		||||
                return true
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        return super.onOptionsItemSelected(item)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private inner class ScreenSlidePagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm, FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 | 
			
		||||
 | 
			
		||||
        override fun getCount(): Int {
 | 
			
		||||
            return allImages.size
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        override fun getItem(position: Int): ImageFragment {
 | 
			
		||||
            return ImageFragment.newInstance(allImages[position])
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -20,12 +20,10 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 | 
			
		||||
import apps.amine.bou.readerforselfoss.themes.AppColors
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 | 
			
		||||
import com.mikepenz.aboutlibraries.Libs
 | 
			
		||||
import com.mikepenz.aboutlibraries.LibsBuilder
 | 
			
		||||
import kotlinx.android.synthetic.main.activity_login.*
 | 
			
		||||
import org.acra.ACRA
 | 
			
		||||
import retrofit2.Call
 | 
			
		||||
import retrofit2.Callback
 | 
			
		||||
import retrofit2.Response
 | 
			
		||||
@@ -40,7 +38,6 @@ class LoginActivity : AppCompatActivity() {
 | 
			
		||||
    private lateinit var settings: SharedPreferences
 | 
			
		||||
    private lateinit var editor: SharedPreferences.Editor
 | 
			
		||||
    private lateinit var userIdentifier: String
 | 
			
		||||
    private var logErrors: Boolean = false
 | 
			
		||||
    private lateinit var appColors: AppColors
 | 
			
		||||
 | 
			
		||||
    override fun onCreate(savedInstanceState: Bundle?) {
 | 
			
		||||
@@ -54,10 +51,8 @@ class LoginActivity : AppCompatActivity() {
 | 
			
		||||
 | 
			
		||||
        handleBaseUrlFail()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
 | 
			
		||||
        userIdentifier = settings.getString("unique_id", "")
 | 
			
		||||
        logErrors = settings.getBoolean("login_debug", false)
 | 
			
		||||
 | 
			
		||||
        editor = settings.edit()
 | 
			
		||||
 | 
			
		||||
@@ -145,7 +140,7 @@ class LoginActivity : AppCompatActivity() {
 | 
			
		||||
        var cancel = false
 | 
			
		||||
        var focusView: View? = null
 | 
			
		||||
 | 
			
		||||
        if (!url.isBaseUrlValid()) {
 | 
			
		||||
        if (!url.isBaseUrlValid(this@LoginActivity)) {
 | 
			
		||||
            urlView.error = getString(R.string.login_url_problem)
 | 
			
		||||
            focusView = urlView
 | 
			
		||||
            cancel = true
 | 
			
		||||
@@ -164,7 +159,7 @@ class LoginActivity : AppCompatActivity() {
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (isWithLogin || isWithHTTPLogin) {
 | 
			
		||||
        if (isWithLogin) {
 | 
			
		||||
            if (TextUtils.isEmpty(password)) {
 | 
			
		||||
                passwordView.error = getString(R.string.error_invalid_password)
 | 
			
		||||
                focusView = passwordView
 | 
			
		||||
@@ -178,6 +173,20 @@ class LoginActivity : AppCompatActivity() {
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (isWithHTTPLogin) {
 | 
			
		||||
            if (TextUtils.isEmpty(httpPassword)) {
 | 
			
		||||
                httpPasswordView.error = getString(R.string.error_invalid_password)
 | 
			
		||||
                focusView = httpPasswordView
 | 
			
		||||
                cancel = true
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            if (TextUtils.isEmpty(httpLogin)) {
 | 
			
		||||
                httpLoginView.error = getString(R.string.error_field_required)
 | 
			
		||||
                focusView = httpLoginView
 | 
			
		||||
                cancel = true
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (cancel) {
 | 
			
		||||
            focusView?.requestFocus()
 | 
			
		||||
        } else {
 | 
			
		||||
@@ -195,7 +204,7 @@ class LoginActivity : AppCompatActivity() {
 | 
			
		||||
                this,
 | 
			
		||||
                this@LoginActivity,
 | 
			
		||||
                isWithSelfSignedCert,
 | 
			
		||||
                isWithSelfSignedCert
 | 
			
		||||
                -1L
 | 
			
		||||
            )
 | 
			
		||||
 | 
			
		||||
            if (this@LoginActivity.isNetworkAccessible(this@LoginActivity.findViewById(R.id.loginForm))) {
 | 
			
		||||
@@ -212,14 +221,6 @@ class LoginActivity : AppCompatActivity() {
 | 
			
		||||
                        passwordView.error = getString(R.string.wrong_infos)
 | 
			
		||||
                        httpLoginView.error = getString(R.string.wrong_infos)
 | 
			
		||||
                        httpPasswordView.error = getString(R.string.wrong_infos)
 | 
			
		||||
                        if (logErrors) {
 | 
			
		||||
                            ACRA.getErrorReporter().maybeHandleSilentException(t, this@LoginActivity)
 | 
			
		||||
                            Toast.makeText(
 | 
			
		||||
                                this@LoginActivity,
 | 
			
		||||
                                t.message,
 | 
			
		||||
                                Toast.LENGTH_LONG
 | 
			
		||||
                            ).show()
 | 
			
		||||
                        }
 | 
			
		||||
                        showProgress(false)
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
@@ -276,29 +277,20 @@ class LoginActivity : AppCompatActivity() {
 | 
			
		||||
 | 
			
		||||
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
 | 
			
		||||
        menuInflater.inflate(R.menu.login_menu, menu)
 | 
			
		||||
        menu.findItem(R.id.login_debug).isChecked = logErrors
 | 
			
		||||
        return true
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
 | 
			
		||||
        when (item.itemId) {
 | 
			
		||||
        return when (item.itemId) {
 | 
			
		||||
            R.id.about -> {
 | 
			
		||||
                LibsBuilder()
 | 
			
		||||
                    .withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR)
 | 
			
		||||
                    .withAboutIconShown(true)
 | 
			
		||||
                    .withAboutVersionShown(true)
 | 
			
		||||
                    .start(this)
 | 
			
		||||
                return true
 | 
			
		||||
                true
 | 
			
		||||
            }
 | 
			
		||||
            R.id.login_debug -> {
 | 
			
		||||
                val newState = !item.isChecked
 | 
			
		||||
                item.isChecked = newState
 | 
			
		||||
                logErrors = newState
 | 
			
		||||
                editor.putBoolean("login_debug", newState)
 | 
			
		||||
                editor.apply()
 | 
			
		||||
                return true
 | 
			
		||||
            }
 | 
			
		||||
            else -> return super.onOptionsItemSelected(item)
 | 
			
		||||
            else -> super.onOptionsItemSelected(item)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -7,48 +7,23 @@ import android.graphics.drawable.Drawable
 | 
			
		||||
import android.net.Uri
 | 
			
		||||
import android.os.Build
 | 
			
		||||
import android.preference.PreferenceManager
 | 
			
		||||
import androidx.multidex.MultiDexApplication
 | 
			
		||||
import android.widget.ImageView
 | 
			
		||||
import androidx.multidex.MultiDexApplication
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 | 
			
		||||
import com.bumptech.glide.Glide
 | 
			
		||||
import com.bumptech.glide.request.RequestOptions
 | 
			
		||||
import com.ftinc.scoop.Scoop
 | 
			
		||||
import com.github.stkent.amplify.feedback.DefaultEmailFeedbackCollector
 | 
			
		||||
import com.github.stkent.amplify.feedback.GooglePlayStoreFeedbackCollector
 | 
			
		||||
import com.github.stkent.amplify.tracking.Amplify
 | 
			
		||||
import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
 | 
			
		||||
import com.mikepenz.materialdrawer.util.DrawerImageLoader
 | 
			
		||||
import org.acra.ACRA
 | 
			
		||||
import org.acra.ReportField
 | 
			
		||||
import org.acra.annotation.AcraCore
 | 
			
		||||
import org.acra.annotation.AcraDialog
 | 
			
		||||
import org.acra.annotation.AcraHttpSender
 | 
			
		||||
import org.acra.sender.HttpSender
 | 
			
		||||
import java.io.IOException
 | 
			
		||||
import java.util.UUID.randomUUID
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@AcraHttpSender(uri = "http://amine-bou.fr:5984/acra-selfoss/_design/acra-storage/_update/report",
 | 
			
		||||
                basicAuthLogin = "selfoss",
 | 
			
		||||
                basicAuthPassword = "selfoss",
 | 
			
		||||
                httpMethod = HttpSender.Method.PUT)
 | 
			
		||||
@AcraDialog(resText = R.string.crash_dialog_text,
 | 
			
		||||
            resCommentPrompt = R.string.crash_dialog_comment,
 | 
			
		||||
            resTheme = android.R.style.Theme_DeviceDefault_Dialog)
 | 
			
		||||
@AcraCore(reportContent = [ReportField.REPORT_ID, ReportField.INSTALLATION_ID,
 | 
			
		||||
    ReportField.APP_VERSION_CODE, ReportField.APP_VERSION_NAME,
 | 
			
		||||
    ReportField.BUILD, ReportField.ANDROID_VERSION, ReportField.BRAND, ReportField.PHONE_MODEL,
 | 
			
		||||
    ReportField.AVAILABLE_MEM_SIZE, ReportField.TOTAL_MEM_SIZE,
 | 
			
		||||
    ReportField.STACK_TRACE, ReportField.APPLICATION_LOG, ReportField.LOGCAT,
 | 
			
		||||
    ReportField.INITIAL_CONFIGURATION, ReportField.CRASH_CONFIGURATION, ReportField.IS_SILENT,
 | 
			
		||||
    ReportField.USER_APP_START_DATE, ReportField.USER_COMMENT, ReportField.USER_CRASH_DATE, ReportField.USER_EMAIL, ReportField.CUSTOM_DATA],
 | 
			
		||||
          buildConfigClass = BuildConfig::class)
 | 
			
		||||
class MyApp : MultiDexApplication() {
 | 
			
		||||
    private lateinit var config: Config
 | 
			
		||||
 | 
			
		||||
    override fun onCreate() {
 | 
			
		||||
        super.onCreate()
 | 
			
		||||
 | 
			
		||||
        initAmplify()
 | 
			
		||||
        config = Config(baseContext)
 | 
			
		||||
 | 
			
		||||
        val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
 | 
			
		||||
        if (prefs.getString("unique_id", "").isEmpty()) {
 | 
			
		||||
@@ -83,21 +58,6 @@ class MyApp : MultiDexApplication() {
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun attachBaseContext(base: Context?) {
 | 
			
		||||
        super.attachBaseContext(base)
 | 
			
		||||
        val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
 | 
			
		||||
        ACRA.init(this)
 | 
			
		||||
        ACRA.getErrorReporter().putCustomData("unique_id", prefs.getString("unique_id", ""))
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun initAmplify() {
 | 
			
		||||
        Amplify.initSharedInstance(this)
 | 
			
		||||
            .setPositiveFeedbackCollectors(GooglePlayStoreFeedbackCollector())
 | 
			
		||||
            .setCriticalFeedbackCollectors(DefaultEmailFeedbackCollector(Config.feedbackEmail))
 | 
			
		||||
            .applyAllDefaultRules()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun initDrawerImageLoader() {
 | 
			
		||||
        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
 | 
			
		||||
            override fun set(
 | 
			
		||||
@@ -107,7 +67,7 @@ class MyApp : MultiDexApplication() {
 | 
			
		||||
                tag: String?
 | 
			
		||||
            ) {
 | 
			
		||||
                Glide.with(imageView?.context)
 | 
			
		||||
                    .load(uri)
 | 
			
		||||
                    .loadMaybeBasicAuth(config, uri.toString())
 | 
			
		||||
                    .apply(RequestOptions.fitCenterTransform().placeholder(placeholder))
 | 
			
		||||
                    .into(imageView)
 | 
			
		||||
            }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,7 @@
 | 
			
		||||
package apps.amine.bou.readerforselfoss
 | 
			
		||||
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import android.content.SharedPreferences
 | 
			
		||||
import android.graphics.drawable.ColorDrawable
 | 
			
		||||
import android.os.Build
 | 
			
		||||
import android.os.Bundle
 | 
			
		||||
@@ -13,6 +15,7 @@ import android.view.Menu
 | 
			
		||||
import android.view.MenuItem
 | 
			
		||||
import android.view.ViewGroup
 | 
			
		||||
import android.widget.Toast
 | 
			
		||||
import androidx.fragment.app.Fragment
 | 
			
		||||
import androidx.room.Room
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.Item
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 | 
			
		||||
@@ -25,7 +28,7 @@ import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 | 
			
		||||
import apps.amine.bou.readerforselfoss.themes.AppColors
 | 
			
		||||
import apps.amine.bou.readerforselfoss.themes.Toppings
 | 
			
		||||
import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.succeeded
 | 
			
		||||
@@ -33,7 +36,6 @@ import apps.amine.bou.readerforselfoss.utils.toggleStar
 | 
			
		||||
import com.ftinc.scoop.Scoop
 | 
			
		||||
import kotlinx.android.synthetic.main.activity_reader.*
 | 
			
		||||
import me.relex.circleindicator.CircleIndicator
 | 
			
		||||
import org.acra.ACRA
 | 
			
		||||
import retrofit2.Call
 | 
			
		||||
import retrofit2.Callback
 | 
			
		||||
import retrofit2.Response
 | 
			
		||||
@@ -42,7 +44,6 @@ import kotlin.concurrent.thread
 | 
			
		||||
class ReaderActivity : AppCompatActivity() {
 | 
			
		||||
 | 
			
		||||
    private var markOnScroll: Boolean = false
 | 
			
		||||
    private var debugReadingItems: Boolean = false
 | 
			
		||||
    private var currentItem: Int = 0
 | 
			
		||||
    private lateinit var userIdentifier: String
 | 
			
		||||
 | 
			
		||||
@@ -51,6 +52,11 @@ class ReaderActivity : AppCompatActivity() {
 | 
			
		||||
    private lateinit var toolbarMenu: Menu
 | 
			
		||||
 | 
			
		||||
    private lateinit var db: AppDatabase
 | 
			
		||||
    private lateinit var prefs: SharedPreferences
 | 
			
		||||
 | 
			
		||||
    private var activeAlignment: Int = 1
 | 
			
		||||
    val JUSTIFY = 1
 | 
			
		||||
    val ALIGN_LEFT = 2
 | 
			
		||||
 | 
			
		||||
    private fun showMenuItem(willAddToFavorite: Boolean) {
 | 
			
		||||
        toolbarMenu.findItem(R.id.save).isVisible = willAddToFavorite
 | 
			
		||||
@@ -65,6 +71,8 @@ class ReaderActivity : AppCompatActivity() {
 | 
			
		||||
        showMenuItem(false)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private lateinit var editor: SharedPreferences.Editor
 | 
			
		||||
 | 
			
		||||
    override fun onCreate(savedInstanceState: Bundle?) {
 | 
			
		||||
        super.onCreate(savedInstanceState)
 | 
			
		||||
 | 
			
		||||
@@ -85,17 +93,21 @@ class ReaderActivity : AppCompatActivity() {
 | 
			
		||||
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
 | 
			
		||||
        supportActionBar?.setDisplayShowHomeEnabled(true)
 | 
			
		||||
 | 
			
		||||
        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
 | 
			
		||||
        val settings =
 | 
			
		||||
            getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
 | 
			
		||||
 | 
			
		||||
        prefs = PreferenceManager.getDefaultSharedPreferences(this)
 | 
			
		||||
        editor = prefs.edit()
 | 
			
		||||
 | 
			
		||||
        debugReadingItems = prefs.getBoolean("read_debug", false)
 | 
			
		||||
        userIdentifier = prefs.getString("unique_id", "")
 | 
			
		||||
        markOnScroll = prefs.getBoolean("mark_on_scroll", false)
 | 
			
		||||
        activeAlignment = prefs.getInt("text_align", JUSTIFY)
 | 
			
		||||
 | 
			
		||||
        api = SelfossApi(
 | 
			
		||||
            this,
 | 
			
		||||
            this@ReaderActivity,
 | 
			
		||||
            prefs.getBoolean("isSelfSignedCert", false),
 | 
			
		||||
            prefs.getBoolean("should_log_everything", false)
 | 
			
		||||
            settings.getBoolean("isSelfSignedCert", false),
 | 
			
		||||
            prefs.getString("api_timeout", "-1").toLong()
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
        if (allItems.isEmpty()) {
 | 
			
		||||
@@ -147,18 +159,6 @@ class ReaderActivity : AppCompatActivity() {
 | 
			
		||||
                            call: Call<SuccessResponse>,
 | 
			
		||||
                            response: Response<SuccessResponse>
 | 
			
		||||
                        ) {
 | 
			
		||||
                            if (!response.succeeded() && debugReadingItems) {
 | 
			
		||||
                                val message =
 | 
			
		||||
                                    "message: ${response.message()} " +
 | 
			
		||||
                                            "response isSuccess: ${response.isSuccessful} " +
 | 
			
		||||
                                            "response code: ${response.code()} " +
 | 
			
		||||
                                            "response message: ${response.message()} " +
 | 
			
		||||
                                            "response errorBody: ${response.errorBody()?.string()} " +
 | 
			
		||||
                                            "body success: ${response.body()?.success} " +
 | 
			
		||||
                                            "body isSuccess: ${response.body()?.isSuccess}"
 | 
			
		||||
                                ACRA.getErrorReporter()
 | 
			
		||||
                                    .maybeHandleSilentException(Exception(message), this@ReaderActivity)
 | 
			
		||||
                            }
 | 
			
		||||
                        }
 | 
			
		||||
 | 
			
		||||
                        override fun onFailure(
 | 
			
		||||
@@ -168,10 +168,6 @@ class ReaderActivity : AppCompatActivity() {
 | 
			
		||||
                            thread {
 | 
			
		||||
                                db.itemsDao().insertAllItems(item.toEntity())
 | 
			
		||||
                            }
 | 
			
		||||
                            if (debugReadingItems) {
 | 
			
		||||
                                ACRA.getErrorReporter()
 | 
			
		||||
                                    .maybeHandleSilentException(t, this@ReaderActivity)
 | 
			
		||||
                            }
 | 
			
		||||
                        }
 | 
			
		||||
                    }
 | 
			
		||||
                )
 | 
			
		||||
@@ -194,7 +190,7 @@ class ReaderActivity : AppCompatActivity() {
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun onSaveInstanceState(oldInstanceState: Bundle?) {
 | 
			
		||||
    override fun onSaveInstanceState(oldInstanceState: Bundle) {
 | 
			
		||||
        super.onSaveInstanceState(oldInstanceState)
 | 
			
		||||
        oldInstanceState!!.clear()
 | 
			
		||||
    }
 | 
			
		||||
@@ -222,6 +218,11 @@ class ReaderActivity : AppCompatActivity() {
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun alignmentMenu(showJustify: Boolean) {
 | 
			
		||||
        toolbarMenu.findItem(R.id.align_left).isVisible = !showJustify
 | 
			
		||||
        toolbarMenu.findItem(R.id.align_justify).isVisible = showJustify
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
 | 
			
		||||
        val inflater = menuInflater
 | 
			
		||||
        inflater.inflate(R.menu.reader_menu, menu)
 | 
			
		||||
@@ -232,6 +233,11 @@ class ReaderActivity : AppCompatActivity() {
 | 
			
		||||
        } else {
 | 
			
		||||
            canFavorite()
 | 
			
		||||
        }
 | 
			
		||||
        if (activeAlignment == JUSTIFY) {
 | 
			
		||||
            alignmentMenu(false)
 | 
			
		||||
        } else {
 | 
			
		||||
            alignmentMenu(true)
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        return true
 | 
			
		||||
    }
 | 
			
		||||
@@ -313,10 +319,29 @@ class ReaderActivity : AppCompatActivity() {
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            R.id.align_left -> {
 | 
			
		||||
                editor.putInt("text_align", ALIGN_LEFT)
 | 
			
		||||
                editor.apply()
 | 
			
		||||
                alignmentMenu(true)
 | 
			
		||||
                refreshFragment()
 | 
			
		||||
            }
 | 
			
		||||
            R.id.align_justify -> {
 | 
			
		||||
                editor.putInt("text_align", JUSTIFY)
 | 
			
		||||
                editor.apply()
 | 
			
		||||
                alignmentMenu(false)
 | 
			
		||||
                refreshFragment()
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        return super.onOptionsItemSelected(item)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun refreshFragment() {
 | 
			
		||||
        finish()
 | 
			
		||||
        overridePendingTransition(0, 0)
 | 
			
		||||
        startActivity(intent)
 | 
			
		||||
        overridePendingTransition(0, 0)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    companion object {
 | 
			
		||||
        var allItems: ArrayList<Item> = ArrayList()
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
package apps.amine.bou.readerforselfoss
 | 
			
		||||
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import android.content.Intent
 | 
			
		||||
import android.content.res.ColorStateList
 | 
			
		||||
import android.os.Build
 | 
			
		||||
@@ -13,6 +14,7 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.Source
 | 
			
		||||
import apps.amine.bou.readerforselfoss.themes.AppColors
 | 
			
		||||
import apps.amine.bou.readerforselfoss.themes.Toppings
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 | 
			
		||||
import com.ftinc.scoop.Scoop
 | 
			
		||||
import kotlinx.android.synthetic.main.activity_sources.*
 | 
			
		||||
@@ -54,13 +56,15 @@ class SourcesActivity : AppCompatActivity() {
 | 
			
		||||
        super.onResume()
 | 
			
		||||
        val mLayoutManager = LinearLayoutManager(this)
 | 
			
		||||
 | 
			
		||||
        val settings =
 | 
			
		||||
            getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
 | 
			
		||||
        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
 | 
			
		||||
 | 
			
		||||
        val api = SelfossApi(
 | 
			
		||||
            this,
 | 
			
		||||
            this@SourcesActivity,
 | 
			
		||||
            prefs.getBoolean("isSelfSignedCert", false),
 | 
			
		||||
            prefs.getBoolean("should_log_everything", false)
 | 
			
		||||
            settings.getBoolean("isSelfSignedCert", false),
 | 
			
		||||
            prefs.getString("api_timeout", "-1").toLong()
 | 
			
		||||
        )
 | 
			
		||||
        var items: ArrayList<Source> = ArrayList()
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,6 @@ import android.app.Activity
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import androidx.cardview.widget.CardView
 | 
			
		||||
import androidx.recyclerview.widget.RecyclerView
 | 
			
		||||
import android.text.Html
 | 
			
		||||
import android.view.LayoutInflater
 | 
			
		||||
import android.view.View
 | 
			
		||||
import android.view.ViewGroup
 | 
			
		||||
@@ -17,6 +16,7 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 | 
			
		||||
import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 | 
			
		||||
import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 | 
			
		||||
import apps.amine.bou.readerforselfoss.themes.AppColors
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.LinkOnTouchListener
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 | 
			
		||||
@@ -49,8 +49,8 @@ class ItemCardAdapter(
 | 
			
		||||
    private val articleViewer: Boolean,
 | 
			
		||||
    private val fullHeightCards: Boolean,
 | 
			
		||||
    override val appColors: AppColors,
 | 
			
		||||
    override val debugReadingItems: Boolean,
 | 
			
		||||
    override val userIdentifier: String,
 | 
			
		||||
    override val config: Config,
 | 
			
		||||
    override val updateItems: (ArrayList<Item>) -> Unit
 | 
			
		||||
) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
 | 
			
		||||
    private val c: Context = app.baseContext
 | 
			
		||||
@@ -68,7 +68,7 @@ class ItemCardAdapter(
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        holder.mView.favButton.isLiked = itm.starred
 | 
			
		||||
        holder.mView.title.text = Html.fromHtml(itm.title)
 | 
			
		||||
        holder.mView.title.text = itm.getTitleDecoded()
 | 
			
		||||
        holder.mView.title.setOnTouchListener(LinkOnTouchListener())
 | 
			
		||||
 | 
			
		||||
        holder.mView.title.setLinkTextColor(appColors.colorAccent)
 | 
			
		||||
@@ -86,7 +86,7 @@ class ItemCardAdapter(
 | 
			
		||||
            holder.mView.itemImage.setImageDrawable(null)
 | 
			
		||||
        } else {
 | 
			
		||||
            holder.mView.itemImage.visibility = View.VISIBLE
 | 
			
		||||
            c.bitmapCenterCrop(itm.getThumbnail(c), holder.mView.itemImage)
 | 
			
		||||
            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (itm.getIcon(c).isEmpty()) {
 | 
			
		||||
@@ -99,7 +99,7 @@ class ItemCardAdapter(
 | 
			
		||||
                    .build(itm.sourcetitle.toTextDrawableString(c), color)
 | 
			
		||||
            holder.mView.sourceImage.setImageDrawable(drawable)
 | 
			
		||||
        } else {
 | 
			
		||||
            c.circularBitmapDrawable(itm.getIcon(c), holder.mView.sourceImage)
 | 
			
		||||
            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.sourceImage)
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        holder.mView.favButton.isLiked = itm.starred
 | 
			
		||||
@@ -179,7 +179,8 @@ class ItemCardAdapter(
 | 
			
		||||
            })
 | 
			
		||||
 | 
			
		||||
            mView.shareBtn.setOnClickListener {
 | 
			
		||||
                c.shareLink(items[adapterPosition].getLinkDecoded())
 | 
			
		||||
                val item = items[adapterPosition]
 | 
			
		||||
                c.shareLink(item.getLinkDecoded(), item.getTitleDecoded())
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            mView.browserBtn.setOnClickListener {
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,6 @@ import android.app.Activity
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import androidx.constraintlayout.widget.ConstraintLayout
 | 
			
		||||
import androidx.recyclerview.widget.RecyclerView
 | 
			
		||||
import android.text.Html
 | 
			
		||||
import android.text.Spannable
 | 
			
		||||
import android.text.style.ClickableSpan
 | 
			
		||||
import android.util.TypedValue
 | 
			
		||||
@@ -20,6 +19,7 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 | 
			
		||||
import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 | 
			
		||||
import apps.amine.bou.readerforselfoss.themes.AppColors
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.LinkOnTouchListener
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 | 
			
		||||
@@ -49,9 +49,9 @@ class ItemListAdapter(
 | 
			
		||||
    private val helper: CustomTabActivityHelper,
 | 
			
		||||
    private val internalBrowser: Boolean,
 | 
			
		||||
    private val articleViewer: Boolean,
 | 
			
		||||
    override val debugReadingItems: Boolean,
 | 
			
		||||
    override val userIdentifier: String,
 | 
			
		||||
    override val appColors: AppColors,
 | 
			
		||||
    override val config: Config,
 | 
			
		||||
    override val updateItems: (ArrayList<Item>) -> Unit
 | 
			
		||||
) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
 | 
			
		||||
    private val generator: ColorGenerator = ColorGenerator.MATERIAL
 | 
			
		||||
@@ -70,7 +70,7 @@ class ItemListAdapter(
 | 
			
		||||
        val itm = items[position]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        holder.mView.title.text = Html.fromHtml(itm.title)
 | 
			
		||||
        holder.mView.title.text = itm.getTitleDecoded()
 | 
			
		||||
 | 
			
		||||
        holder.mView.title.setOnTouchListener(LinkOnTouchListener())
 | 
			
		||||
 | 
			
		||||
@@ -79,23 +79,6 @@ class ItemListAdapter(
 | 
			
		||||
        holder.mView.sourceTitleAndDate.text = itm.sourceAndDateText()
 | 
			
		||||
 | 
			
		||||
        if (itm.getThumbnail(c).isEmpty()) {
 | 
			
		||||
            val sizeInInt = 46
 | 
			
		||||
            val sizeInDp = TypedValue.applyDimension(
 | 
			
		||||
                TypedValue.COMPLEX_UNIT_DIP, sizeInInt.toFloat(), c.resources
 | 
			
		||||
                    .displayMetrics
 | 
			
		||||
            ).toInt()
 | 
			
		||||
 | 
			
		||||
            val marginInInt = 16
 | 
			
		||||
            val marginInDp = TypedValue.applyDimension(
 | 
			
		||||
                TypedValue.COMPLEX_UNIT_DIP, marginInInt.toFloat(), c.resources
 | 
			
		||||
                    .displayMetrics
 | 
			
		||||
            ).toInt()
 | 
			
		||||
 | 
			
		||||
            val params = holder.mView.itemImage.layoutParams as ViewGroup.MarginLayoutParams
 | 
			
		||||
            params.height = sizeInDp
 | 
			
		||||
            params.width = sizeInDp
 | 
			
		||||
            params.setMargins(marginInDp, 0, 0, 0)
 | 
			
		||||
            holder.mView.itemImage.layoutParams = params
 | 
			
		||||
 | 
			
		||||
            if (itm.getIcon(c).isEmpty()) {
 | 
			
		||||
                val color = generator.getColor(itm.sourcetitle)
 | 
			
		||||
@@ -108,10 +91,10 @@ class ItemListAdapter(
 | 
			
		||||
 | 
			
		||||
                holder.mView.itemImage.setImageDrawable(drawable)
 | 
			
		||||
            } else {
 | 
			
		||||
                c.circularBitmapDrawable(itm.getIcon(c), holder.mView.itemImage)
 | 
			
		||||
                c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
 | 
			
		||||
            }
 | 
			
		||||
        } else {
 | 
			
		||||
            c.bitmapCenterCrop(itm.getThumbnail(c), holder.mView.itemImage)
 | 
			
		||||
            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -13,11 +13,10 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 | 
			
		||||
import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 | 
			
		||||
import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 | 
			
		||||
import apps.amine.bou.readerforselfoss.themes.AppColors
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.succeeded
 | 
			
		||||
import org.acra.ACRA
 | 
			
		||||
import retrofit2.Call
 | 
			
		||||
import retrofit2.Callback
 | 
			
		||||
import retrofit2.Response
 | 
			
		||||
@@ -27,10 +26,10 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
 | 
			
		||||
    abstract var items: ArrayList<Item>
 | 
			
		||||
    abstract val api: SelfossApi
 | 
			
		||||
    abstract val db: AppDatabase
 | 
			
		||||
    abstract val debugReadingItems: Boolean
 | 
			
		||||
    abstract val userIdentifier: String
 | 
			
		||||
    abstract val app: Activity
 | 
			
		||||
    abstract val appColors: AppColors
 | 
			
		||||
    abstract val config: Config
 | 
			
		||||
    abstract val updateItems: (ArrayList<Item>) -> Unit
 | 
			
		||||
 | 
			
		||||
    fun updateAllItems(newItems: ArrayList<Item>) {
 | 
			
		||||
@@ -39,7 +38,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
 | 
			
		||||
        updateItems(items)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun doUnmark(i: Item, position: Int) {
 | 
			
		||||
    private fun unmarkSnackbar(i: Item, position: Int) {
 | 
			
		||||
        val s = Snackbar
 | 
			
		||||
            .make(
 | 
			
		||||
                app.findViewById(R.id.coordLayout),
 | 
			
		||||
@@ -69,12 +68,11 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
 | 
			
		||||
                            }
 | 
			
		||||
                            notifyItemRemoved(position)
 | 
			
		||||
                            updateItems(items)
 | 
			
		||||
                            doUnmark(i, position)
 | 
			
		||||
                        }
 | 
			
		||||
                    })
 | 
			
		||||
                } else {
 | 
			
		||||
                    thread {
 | 
			
		||||
                        db.actionsDao().deleteReadActionForArticle(i.id)
 | 
			
		||||
                        db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
@@ -85,7 +83,64 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
 | 
			
		||||
        s.show()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun removeItemAtIndex(position: Int) {
 | 
			
		||||
    private fun markSnackbar(i: Item, position: Int) {
 | 
			
		||||
        val s = Snackbar
 | 
			
		||||
            .make(
 | 
			
		||||
                app.findViewById(R.id.coordLayout),
 | 
			
		||||
                R.string.marked_as_unread,
 | 
			
		||||
                Snackbar.LENGTH_LONG
 | 
			
		||||
            )
 | 
			
		||||
            .setAction(R.string.undo_string) {
 | 
			
		||||
                items.add(position, i)
 | 
			
		||||
                thread {
 | 
			
		||||
                    db.itemsDao().delete(i.toEntity())
 | 
			
		||||
                }
 | 
			
		||||
                notifyItemInserted(position)
 | 
			
		||||
                updateItems(items)
 | 
			
		||||
 | 
			
		||||
                if (app.isNetworkAccessible(null)) {
 | 
			
		||||
                    api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
 | 
			
		||||
                        override fun onResponse(
 | 
			
		||||
                            call: Call<SuccessResponse>,
 | 
			
		||||
                            response: Response<SuccessResponse>
 | 
			
		||||
                        ) {
 | 
			
		||||
                        }
 | 
			
		||||
 | 
			
		||||
                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
 | 
			
		||||
                            items.remove(i)
 | 
			
		||||
                            thread {
 | 
			
		||||
                                db.itemsDao().insertAllItems(i.toEntity())
 | 
			
		||||
                            }
 | 
			
		||||
                            notifyItemRemoved(position)
 | 
			
		||||
                            updateItems(items)
 | 
			
		||||
                        }
 | 
			
		||||
                    })
 | 
			
		||||
                } else {
 | 
			
		||||
                    thread {
 | 
			
		||||
                        db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
        val view = s.view
 | 
			
		||||
        val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
 | 
			
		||||
        tv.setTextColor(Color.WHITE)
 | 
			
		||||
        s.show()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun handleItemAtIndex(position: Int) {
 | 
			
		||||
        if (unreadItemStatusAtIndex(position)) {
 | 
			
		||||
            readItemAtIndex(position)
 | 
			
		||||
        } else {
 | 
			
		||||
            unreadItemAtIndex(position)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun unreadItemStatusAtIndex(position: Int): Boolean {
 | 
			
		||||
        return items[position].unread
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun readItemAtIndex(position: Int) {
 | 
			
		||||
        val i = items[position]
 | 
			
		||||
        items.remove(i)
 | 
			
		||||
        notifyItemRemoved(position)
 | 
			
		||||
@@ -101,33 +156,17 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
 | 
			
		||||
                    call: Call<SuccessResponse>,
 | 
			
		||||
                    response: Response<SuccessResponse>
 | 
			
		||||
                ) {
 | 
			
		||||
                    if (!response.succeeded() && debugReadingItems) {
 | 
			
		||||
                        val message =
 | 
			
		||||
                            "message: ${response.message()} " +
 | 
			
		||||
                                    "response isSuccess: ${response.isSuccessful} " +
 | 
			
		||||
                                    "response code: ${response.code()} " +
 | 
			
		||||
                                    "response message: ${response.message()} " +
 | 
			
		||||
                                    "response errorBody: ${response.errorBody()?.string()} " +
 | 
			
		||||
                                    "body success: ${response.body()?.success} " +
 | 
			
		||||
                                    "body isSuccess: ${response.body()?.isSuccess}"
 | 
			
		||||
                        ACRA.getErrorReporter().maybeHandleSilentException(Exception(message), app)
 | 
			
		||||
                        Toast.makeText(app.baseContext, message, Toast.LENGTH_LONG).show()
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
                    doUnmark(i, position)
 | 
			
		||||
                    unmarkSnackbar(i, position)
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
 | 
			
		||||
                    if (debugReadingItems) {
 | 
			
		||||
                        ACRA.getErrorReporter().maybeHandleSilentException(t, app)
 | 
			
		||||
                        Toast.makeText(app.baseContext, t.message, Toast.LENGTH_LONG).show()
 | 
			
		||||
                    }
 | 
			
		||||
                    Toast.makeText(
 | 
			
		||||
                        app,
 | 
			
		||||
                        app.getString(R.string.cant_mark_read),
 | 
			
		||||
                        Toast.LENGTH_SHORT
 | 
			
		||||
                    ).show()
 | 
			
		||||
                    items.add(i)
 | 
			
		||||
                    items.add(position, i)
 | 
			
		||||
                    notifyItemInserted(position)
 | 
			
		||||
                    updateItems(items)
 | 
			
		||||
 | 
			
		||||
@@ -139,7 +178,48 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
 | 
			
		||||
        } else {
 | 
			
		||||
            thread {
 | 
			
		||||
                db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
 | 
			
		||||
                doUnmark(i, position)
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun unreadItemAtIndex(position: Int) {
 | 
			
		||||
        val i = items[position]
 | 
			
		||||
        items.remove(i)
 | 
			
		||||
        notifyItemRemoved(position)
 | 
			
		||||
        updateItems(items)
 | 
			
		||||
 | 
			
		||||
        thread {
 | 
			
		||||
            db.itemsDao().insertAllItems(i.toEntity())
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (app.isNetworkAccessible(null)) {
 | 
			
		||||
            api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
 | 
			
		||||
                override fun onResponse(
 | 
			
		||||
                    call: Call<SuccessResponse>,
 | 
			
		||||
                    response: Response<SuccessResponse>
 | 
			
		||||
                ) {
 | 
			
		||||
 | 
			
		||||
                    markSnackbar(i, position)
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
 | 
			
		||||
                    Toast.makeText(
 | 
			
		||||
                        app,
 | 
			
		||||
                        app.getString(R.string.cant_mark_unread),
 | 
			
		||||
                        Toast.LENGTH_SHORT
 | 
			
		||||
                    ).show()
 | 
			
		||||
                    items.add(i)
 | 
			
		||||
                    notifyItemInserted(position)
 | 
			
		||||
                    updateItems(items)
 | 
			
		||||
 | 
			
		||||
                    thread {
 | 
			
		||||
                        db.itemsDao().delete(i.toEntity())
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            })
 | 
			
		||||
        } else {
 | 
			
		||||
            thread {
 | 
			
		||||
                db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -12,6 +12,7 @@ import apps.amine.bou.readerforselfoss.R
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.Source
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
 | 
			
		||||
@@ -29,6 +30,7 @@ class SourcesListAdapter(
 | 
			
		||||
) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>() {
 | 
			
		||||
    private val c: Context = app.baseContext
 | 
			
		||||
    private val generator: ColorGenerator = ColorGenerator.MATERIAL
 | 
			
		||||
    private lateinit var config: Config
 | 
			
		||||
 | 
			
		||||
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
 | 
			
		||||
        val v = LayoutInflater.from(c).inflate(
 | 
			
		||||
@@ -41,6 +43,7 @@ class SourcesListAdapter(
 | 
			
		||||
 | 
			
		||||
    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
 | 
			
		||||
        val itm = items[position]
 | 
			
		||||
        config = Config(c)
 | 
			
		||||
 | 
			
		||||
        if (itm.getIcon(c).isEmpty()) {
 | 
			
		||||
            val color = generator.getColor(itm.title)
 | 
			
		||||
@@ -52,7 +55,7 @@ class SourcesListAdapter(
 | 
			
		||||
                    .build(itm.title.toTextDrawableString(c), color)
 | 
			
		||||
            holder.mView.itemImage.setImageDrawable(drawable)
 | 
			
		||||
        } else {
 | 
			
		||||
            c.circularBitmapDrawable(itm.getIcon(c), holder.mView.itemImage)
 | 
			
		||||
            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        holder.mView.sourceTitle.text = itm.title
 | 
			
		||||
 
 | 
			
		||||
@@ -7,17 +7,13 @@ import retrofit2.Call
 | 
			
		||||
import retrofit2.Retrofit
 | 
			
		||||
import retrofit2.converter.gson.GsonConverterFactory
 | 
			
		||||
 | 
			
		||||
class MercuryApi(shouldLog: Boolean) {
 | 
			
		||||
class MercuryApi() {
 | 
			
		||||
    private val service: MercuryService
 | 
			
		||||
 | 
			
		||||
    init {
 | 
			
		||||
 | 
			
		||||
        val interceptor = HttpLoggingInterceptor()
 | 
			
		||||
        interceptor.level = if (shouldLog) {
 | 
			
		||||
            HttpLoggingInterceptor.Level.BODY
 | 
			
		||||
        } else {
 | 
			
		||||
            HttpLoggingInterceptor.Level.NONE
 | 
			
		||||
        }
 | 
			
		||||
        interceptor.level = HttpLoggingInterceptor.Level.NONE
 | 
			
		||||
        val client = OkHttpClient.Builder().addInterceptor(interceptor).build()
 | 
			
		||||
 | 
			
		||||
        val gson = GsonBuilder()
 | 
			
		||||
 
 | 
			
		||||
@@ -12,18 +12,20 @@ import com.burgstaller.okhttp.digest.CachingAuthenticator
 | 
			
		||||
import com.burgstaller.okhttp.digest.Credentials
 | 
			
		||||
import com.burgstaller.okhttp.digest.DigestAuthenticator
 | 
			
		||||
import com.google.gson.GsonBuilder
 | 
			
		||||
import okhttp3.OkHttpClient
 | 
			
		||||
import okhttp3.*
 | 
			
		||||
import okhttp3.logging.HttpLoggingInterceptor
 | 
			
		||||
import retrofit2.Call
 | 
			
		||||
import retrofit2.Retrofit
 | 
			
		||||
import retrofit2.converter.gson.GsonConverterFactory
 | 
			
		||||
import java.net.SocketTimeoutException
 | 
			
		||||
import java.util.concurrent.ConcurrentHashMap
 | 
			
		||||
import java.util.concurrent.TimeUnit
 | 
			
		||||
 | 
			
		||||
class SelfossApi(
 | 
			
		||||
    c: Context,
 | 
			
		||||
    callingActivity: Activity?,
 | 
			
		||||
    isWithSelfSignedCert: Boolean,
 | 
			
		||||
    shouldLog: Boolean
 | 
			
		||||
    timeout: Long
 | 
			
		||||
) {
 | 
			
		||||
 | 
			
		||||
    private lateinit var service: SelfossService
 | 
			
		||||
@@ -38,19 +40,39 @@ class SelfossApi(
 | 
			
		||||
            this
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
    fun OkHttpClient.Builder.maybeWithSettingsTimeout(timeout: Long): OkHttpClient.Builder =
 | 
			
		||||
        if (timeout != -1L) {
 | 
			
		||||
            this.readTimeout(timeout, TimeUnit.SECONDS)
 | 
			
		||||
                .connectTimeout(timeout, TimeUnit.SECONDS)
 | 
			
		||||
        } else {
 | 
			
		||||
            this
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
    fun Credentials.createAuthenticator(): DispatchingAuthenticator =
 | 
			
		||||
        DispatchingAuthenticator.Builder()
 | 
			
		||||
            .with("digest", DigestAuthenticator(this))
 | 
			
		||||
            .with("basic", BasicAuthenticator(this))
 | 
			
		||||
            .build()
 | 
			
		||||
 | 
			
		||||
    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean): OkHttpClient.Builder {
 | 
			
		||||
    fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean, timeout: Long): OkHttpClient.Builder {
 | 
			
		||||
        val authCache = ConcurrentHashMap<String, CachingAuthenticator>()
 | 
			
		||||
        return OkHttpClient
 | 
			
		||||
            .Builder()
 | 
			
		||||
            .maybeWithSettingsTimeout(timeout)
 | 
			
		||||
            .maybeWithSelfSigned(isWithSelfSignedCert)
 | 
			
		||||
            .authenticator(CachingAuthenticatorDecorator(this, authCache))
 | 
			
		||||
            .addInterceptor(AuthenticationCacheInterceptor(authCache))
 | 
			
		||||
            .addInterceptor(object: Interceptor {
 | 
			
		||||
                override fun intercept(chain: Interceptor.Chain): Response {
 | 
			
		||||
                    val request: Request = chain.request()
 | 
			
		||||
                    val response: Response = chain.proceed(request)
 | 
			
		||||
 | 
			
		||||
                    if (response.code() == 408) {
 | 
			
		||||
                        return response
 | 
			
		||||
                    }
 | 
			
		||||
                    return response
 | 
			
		||||
                }
 | 
			
		||||
            })
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    init {
 | 
			
		||||
@@ -72,15 +94,34 @@ class SelfossApi(
 | 
			
		||||
 | 
			
		||||
        val logging = HttpLoggingInterceptor()
 | 
			
		||||
 | 
			
		||||
        logging.level = if (shouldLog) {
 | 
			
		||||
            HttpLoggingInterceptor.Level.BODY
 | 
			
		||||
        } else {
 | 
			
		||||
            HttpLoggingInterceptor.Level.NONE
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        val httpClient = authenticator.getHttpClien(isWithSelfSignedCert)
 | 
			
		||||
        logging.level = HttpLoggingInterceptor.Level.NONE
 | 
			
		||||
        val httpClient = authenticator.getHttpClien(isWithSelfSignedCert, timeout)
 | 
			
		||||
 | 
			
		||||
        httpClient.addInterceptor(logging)
 | 
			
		||||
        val timeoutCode = 504
 | 
			
		||||
        httpClient
 | 
			
		||||
                .addInterceptor { chain ->
 | 
			
		||||
                    val res = chain.proceed(chain.request())
 | 
			
		||||
                    if (res.code() == timeoutCode) {
 | 
			
		||||
                        throw SocketTimeoutException("timeout")
 | 
			
		||||
                    }
 | 
			
		||||
                    res
 | 
			
		||||
                }
 | 
			
		||||
                .addInterceptor(logging)
 | 
			
		||||
                .addInterceptor { chain ->
 | 
			
		||||
                    val request = chain.request()
 | 
			
		||||
                    try {
 | 
			
		||||
                        chain.proceed(request)
 | 
			
		||||
                    } catch (e: SocketTimeoutException) {
 | 
			
		||||
                        Response.Builder()
 | 
			
		||||
                                .code(timeoutCode)
 | 
			
		||||
                                .protocol(Protocol.HTTP_2)
 | 
			
		||||
                                .body(ResponseBody.create(MediaType.parse("text/plain"), ""))
 | 
			
		||||
                                .message("")
 | 
			
		||||
                                .request(request)
 | 
			
		||||
                                .build()
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
        try {
 | 
			
		||||
            val retrofit =
 | 
			
		||||
 
 | 
			
		||||
@@ -4,9 +4,15 @@ import android.content.Context
 | 
			
		||||
import android.net.Uri
 | 
			
		||||
import android.os.Parcel
 | 
			
		||||
import android.os.Parcelable
 | 
			
		||||
import android.text.Html
 | 
			
		||||
import android.webkit.URLUtil
 | 
			
		||||
import org.jsoup.Jsoup
 | 
			
		||||
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
 | 
			
		||||
import com.bumptech.glide.Glide
 | 
			
		||||
import com.bumptech.glide.load.engine.DiskCacheStrategy
 | 
			
		||||
import com.bumptech.glide.request.RequestOptions
 | 
			
		||||
import com.google.gson.annotations.SerializedName
 | 
			
		||||
 | 
			
		||||
private fun constructUrl(config: Config?, path: String, file: String?): String {
 | 
			
		||||
@@ -67,8 +73,8 @@ data class Item(
 | 
			
		||||
    @SerializedName("content") val content: String,
 | 
			
		||||
    @SerializedName("unread") val unread: Boolean,
 | 
			
		||||
    @SerializedName("starred") var starred: Boolean,
 | 
			
		||||
    @SerializedName("thumbnail") val thumbnail: String,
 | 
			
		||||
    @SerializedName("icon") val icon: String,
 | 
			
		||||
    @SerializedName("thumbnail") val thumbnail: String?,
 | 
			
		||||
    @SerializedName("icon") val icon: String?,
 | 
			
		||||
    @SerializedName("link") val link: String,
 | 
			
		||||
    @SerializedName("sourcetitle") val sourcetitle: String,
 | 
			
		||||
    @SerializedName("tags") val tags: SelfossTagType
 | 
			
		||||
@@ -127,6 +133,40 @@ data class Item(
 | 
			
		||||
        return constructUrl(config, "thumbnails", thumbnail)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun getImages() : ArrayList<String> {
 | 
			
		||||
        var allImages = ArrayList<String>()
 | 
			
		||||
 | 
			
		||||
        for ( image in Jsoup.parse(content).getElementsByTag("img")) {
 | 
			
		||||
            allImages.add(image.attr("src"))
 | 
			
		||||
        }
 | 
			
		||||
        return allImages
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun preloadImages(context: Context) : Boolean {
 | 
			
		||||
        val imageUrls = this.getImages()
 | 
			
		||||
 | 
			
		||||
        val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        try {
 | 
			
		||||
            for (url in imageUrls) {
 | 
			
		||||
                if ( URLUtil.isValidUrl(url)) {
 | 
			
		||||
                    val image = Glide.with(context).asBitmap()
 | 
			
		||||
                            .apply(glideOptions)
 | 
			
		||||
                            .load(url).submit().get()
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        } catch (e : Error) {
 | 
			
		||||
            return false
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        return true
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun getTitleDecoded(): String {
 | 
			
		||||
        return Html.fromHtml(title).toString()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // TODO: maybe find a better way to handle these kind of urls
 | 
			
		||||
    fun getLinkDecoded(): String {
 | 
			
		||||
        var stringUrl: String
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,9 @@
 | 
			
		||||
package apps.amine.bou.readerforselfoss.background
 | 
			
		||||
 | 
			
		||||
import android.app.NotificationManager
 | 
			
		||||
import android.app.PendingIntent
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import android.content.Intent
 | 
			
		||||
import android.preference.PreferenceManager
 | 
			
		||||
import androidx.core.app.NotificationCompat
 | 
			
		||||
import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 | 
			
		||||
@@ -9,6 +11,7 @@ import androidx.core.app.NotificationCompat.PRIORITY_LOW
 | 
			
		||||
import androidx.room.Room
 | 
			
		||||
import androidx.work.Worker
 | 
			
		||||
import androidx.work.WorkerParameters
 | 
			
		||||
import apps.amine.bou.readerforselfoss.MainActivity
 | 
			
		||||
import apps.amine.bou.readerforselfoss.R
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.Item
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 | 
			
		||||
@@ -17,10 +20,8 @@ import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 | 
			
		||||
import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 | 
			
		||||
import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 | 
			
		||||
import org.acra.ACRA
 | 
			
		||||
import retrofit2.Call
 | 
			
		||||
import retrofit2.Callback
 | 
			
		||||
import retrofit2.Response
 | 
			
		||||
@@ -43,14 +44,13 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
 | 
			
		||||
                .setOngoing(true)
 | 
			
		||||
                .setPriority(PRIORITY_LOW)
 | 
			
		||||
                .setChannelId(Config.syncChannelId)
 | 
			
		||||
                .setSmallIcon(R.drawable.ic_cloud_download)
 | 
			
		||||
                .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
 | 
			
		||||
 | 
			
		||||
            notificationManager.notify(1, notification.build())
 | 
			
		||||
 | 
			
		||||
            val settings =
 | 
			
		||||
                this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
 | 
			
		||||
            val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context)
 | 
			
		||||
            val shouldLogEverything = sharedPref.getBoolean("should_log_everything", false)
 | 
			
		||||
            val notifyNewItems = sharedPref.getBoolean("notify_new_items", false)
 | 
			
		||||
 | 
			
		||||
            db = Room.databaseBuilder(
 | 
			
		||||
@@ -62,7 +62,7 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
 | 
			
		||||
                this.context,
 | 
			
		||||
                null,
 | 
			
		||||
                settings.getBoolean("isSelfSignedCert", false),
 | 
			
		||||
                shouldLogEverything
 | 
			
		||||
                sharedPref.getString("api_timeout", "-1").toLong()
 | 
			
		||||
            )
 | 
			
		||||
 | 
			
		||||
            api.allItems().enqueue(object : Callback<List<Item>> {
 | 
			
		||||
@@ -85,17 +85,26 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
 | 
			
		||||
 | 
			
		||||
                            val newSize = apiItems.filter { it.unread }.size
 | 
			
		||||
                            if (notifyNewItems && newSize > 0) {
 | 
			
		||||
 | 
			
		||||
                                val intent = Intent(context, MainActivity::class.java).apply {
 | 
			
		||||
                                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
 | 
			
		||||
                                }
 | 
			
		||||
                                val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
 | 
			
		||||
 | 
			
		||||
                                val newItemsNotification = NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)
 | 
			
		||||
                                    .setContentTitle(context.getString(R.string.new_items_notification_title))
 | 
			
		||||
                                    .setContentText(context.getString(R.string.new_items_notification_text, newSize))
 | 
			
		||||
                                    .setPriority(PRIORITY_DEFAULT)
 | 
			
		||||
                                    .setChannelId(Config.newItemsChannelId)
 | 
			
		||||
                                    .setSmallIcon(R.drawable.ic_fiber_new_black_24dp)
 | 
			
		||||
                                    .setContentIntent(pendingIntent)
 | 
			
		||||
                                    .setAutoCancel(true)
 | 
			
		||||
                                    .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
 | 
			
		||||
 | 
			
		||||
                                Timer("", false).schedule(4000) {
 | 
			
		||||
                                    notificationManager.notify(2, newItemsNotification.build())
 | 
			
		||||
                                }
 | 
			
		||||
                            }
 | 
			
		||||
                            apiItems.map {it.preloadImages(context)}
 | 
			
		||||
                        }
 | 
			
		||||
                        Timer("", false).schedule(4000) {
 | 
			
		||||
                            notificationManager.cancel(1)
 | 
			
		||||
@@ -119,7 +128,7 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        return Result.SUCCESS
 | 
			
		||||
        return Result.success()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun <T> doAndReportOnFail(call: Call<T>, action: ActionEntity) {
 | 
			
		||||
@@ -134,7 +143,6 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            override fun onFailure(call: Call<T>, t: Throwable) {
 | 
			
		||||
                ACRA.getErrorReporter().maybeHandleSilentException(t, context)
 | 
			
		||||
            }
 | 
			
		||||
        })
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,23 +1,28 @@
 | 
			
		||||
package apps.amine.bou.readerforselfoss.fragments
 | 
			
		||||
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import android.content.Intent
 | 
			
		||||
import android.content.SharedPreferences
 | 
			
		||||
import android.content.res.ColorStateList
 | 
			
		||||
import android.content.res.TypedArray
 | 
			
		||||
import android.graphics.Bitmap
 | 
			
		||||
import android.graphics.Typeface
 | 
			
		||||
import android.graphics.drawable.ColorDrawable
 | 
			
		||||
import android.net.Uri
 | 
			
		||||
import android.os.Build
 | 
			
		||||
import android.os.Bundle
 | 
			
		||||
import android.preference.PreferenceManager
 | 
			
		||||
import android.view.*
 | 
			
		||||
import android.webkit.*
 | 
			
		||||
import androidx.browser.customtabs.CustomTabsIntent
 | 
			
		||||
import com.google.android.material.floatingactionbutton.FloatingActionButton
 | 
			
		||||
import androidx.fragment.app.Fragment
 | 
			
		||||
import androidx.core.content.ContextCompat
 | 
			
		||||
import androidx.core.widget.NestedScrollView
 | 
			
		||||
import android.view.LayoutInflater
 | 
			
		||||
import android.view.MenuItem
 | 
			
		||||
import android.view.View
 | 
			
		||||
import android.view.ViewGroup
 | 
			
		||||
import android.webkit.WebSettings
 | 
			
		||||
import androidx.appcompat.app.AlertDialog
 | 
			
		||||
import androidx.core.content.res.ResourcesCompat
 | 
			
		||||
import androidx.room.Room
 | 
			
		||||
import apps.amine.bou.readerforselfoss.ImageActivity
 | 
			
		||||
import apps.amine.bou.readerforselfoss.R
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
 | 
			
		||||
@@ -32,48 +37,64 @@ import apps.amine.bou.readerforselfoss.themes.AppColors
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.glide.getBitmapInputStream
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.openItemUrl
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.shareLink
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.succeeded
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.toPx
 | 
			
		||||
import com.bumptech.glide.Glide
 | 
			
		||||
import com.bumptech.glide.load.engine.DiskCacheStrategy
 | 
			
		||||
import com.bumptech.glide.request.RequestOptions
 | 
			
		||||
import com.github.rubensousa.floatingtoolbar.FloatingToolbar
 | 
			
		||||
import kotlinx.android.synthetic.main.fragment_article.view.*
 | 
			
		||||
import org.acra.ACRA
 | 
			
		||||
import retrofit2.Call
 | 
			
		||||
import retrofit2.Callback
 | 
			
		||||
import retrofit2.Response
 | 
			
		||||
import java.net.MalformedURLException
 | 
			
		||||
import java.net.URL
 | 
			
		||||
import java.util.concurrent.ExecutionException
 | 
			
		||||
import kotlin.collections.ArrayList
 | 
			
		||||
import kotlin.concurrent.thread
 | 
			
		||||
 | 
			
		||||
class ArticleFragment : Fragment() {
 | 
			
		||||
    private lateinit var pageNumber: Number
 | 
			
		||||
    private var fontSize: Int = 14
 | 
			
		||||
    private var fontSize: Int = 16
 | 
			
		||||
    private lateinit var allItems: ArrayList<Item>
 | 
			
		||||
    private lateinit var mCustomTabActivityHelper: CustomTabActivityHelper
 | 
			
		||||
    private var mCustomTabActivityHelper: CustomTabActivityHelper? = null;
 | 
			
		||||
    private lateinit var url: String
 | 
			
		||||
    private lateinit var contentText: String
 | 
			
		||||
    private lateinit var contentSource: String
 | 
			
		||||
    private lateinit var contentImage: String
 | 
			
		||||
    private lateinit var contentTitle: String
 | 
			
		||||
    private lateinit var allImages : ArrayList<String>
 | 
			
		||||
    private lateinit var editor: SharedPreferences.Editor
 | 
			
		||||
    private lateinit var fab: FloatingActionButton
 | 
			
		||||
    private lateinit var appColors: AppColors
 | 
			
		||||
    private lateinit var db: AppDatabase
 | 
			
		||||
    private lateinit var textAlignment: String
 | 
			
		||||
    private lateinit var config: Config
 | 
			
		||||
 | 
			
		||||
    private var rootView: ViewGroup? = null
 | 
			
		||||
 | 
			
		||||
    private lateinit var prefs: SharedPreferences
 | 
			
		||||
 | 
			
		||||
    private var typeface: Typeface? = null
 | 
			
		||||
    private var resId: Int = 0
 | 
			
		||||
    private var font = ""
 | 
			
		||||
 | 
			
		||||
    override fun onStop() {
 | 
			
		||||
        super.onStop()
 | 
			
		||||
        mCustomTabActivityHelper.unbindCustomTabsService(activity)
 | 
			
		||||
        if (mCustomTabActivityHelper != null) {
 | 
			
		||||
            mCustomTabActivityHelper!!.unbindCustomTabsService(activity)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun onCreate(savedInstanceState: Bundle?) {
 | 
			
		||||
        appColors = AppColors(activity!!)
 | 
			
		||||
        config = Config(activity!!)
 | 
			
		||||
 | 
			
		||||
        super.onCreate(savedInstanceState)
 | 
			
		||||
 | 
			
		||||
@@ -86,156 +107,182 @@ class ArticleFragment : Fragment() {
 | 
			
		||||
        ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).build()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private lateinit var rootView: ViewGroup
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    override fun onCreateView(
 | 
			
		||||
        inflater: LayoutInflater,
 | 
			
		||||
        container: ViewGroup?,
 | 
			
		||||
        savedInstanceState: Bundle?
 | 
			
		||||
    ): View? {
 | 
			
		||||
        rootView = inflater
 | 
			
		||||
            .inflate(R.layout.fragment_article, container, false) as ViewGroup
 | 
			
		||||
        try {
 | 
			
		||||
            rootView = inflater
 | 
			
		||||
                .inflate(R.layout.fragment_article, container, false) as ViewGroup
 | 
			
		||||
 | 
			
		||||
        url = allItems[pageNumber.toInt()].getLinkDecoded()
 | 
			
		||||
        contentText = allItems[pageNumber.toInt()].content
 | 
			
		||||
        contentTitle = allItems[pageNumber.toInt()].title
 | 
			
		||||
        contentImage = allItems[pageNumber.toInt()].getThumbnail(activity!!)
 | 
			
		||||
        contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
 | 
			
		||||
            url = allItems[pageNumber.toInt()].getLinkDecoded()
 | 
			
		||||
            contentText = allItems[pageNumber.toInt()].content
 | 
			
		||||
            contentTitle = allItems[pageNumber.toInt()].getTitleDecoded()
 | 
			
		||||
            contentImage = allItems[pageNumber.toInt()].getThumbnail(activity!!)
 | 
			
		||||
            contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
 | 
			
		||||
            allImages = allItems[pageNumber.toInt()].getImages()
 | 
			
		||||
 | 
			
		||||
        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
 | 
			
		||||
        editor = prefs.edit()
 | 
			
		||||
        fontSize = prefs.getString("reader_font_size", "14").toInt()
 | 
			
		||||
            prefs = PreferenceManager.getDefaultSharedPreferences(activity)
 | 
			
		||||
            editor = prefs.edit()
 | 
			
		||||
            fontSize = prefs.getString("reader_font_size", "16").toInt()
 | 
			
		||||
 | 
			
		||||
        val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
 | 
			
		||||
        val debugReadingItems = prefs.getBoolean("read_debug", false)
 | 
			
		||||
            font = prefs.getString("reader_font", "")
 | 
			
		||||
            if (font.isNotEmpty()) {
 | 
			
		||||
                resId = context!!.resources.getIdentifier(font, "font", context!!.packageName)
 | 
			
		||||
                typeface = try {
 | 
			
		||||
                    ResourcesCompat.getFont(context!!, resId)!!
 | 
			
		||||
                } catch (e: java.lang.Exception) {
 | 
			
		||||
                    // ACRA.getErrorReporter().maybeHandleSilentException(Throwable("Font loading issue: ${e.message}"), context!!)
 | 
			
		||||
                    // Just to be sure
 | 
			
		||||
                    null
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
        val api = SelfossApi(
 | 
			
		||||
            context!!,
 | 
			
		||||
            activity!!,
 | 
			
		||||
            settings.getBoolean("isSelfSignedCert", false),
 | 
			
		||||
            prefs.getBoolean("should_log_everything", false)
 | 
			
		||||
        )
 | 
			
		||||
            refreshAlignment()
 | 
			
		||||
 | 
			
		||||
        fab = rootView.fab
 | 
			
		||||
            val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
 | 
			
		||||
 | 
			
		||||
        fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
 | 
			
		||||
            val api = SelfossApi(
 | 
			
		||||
                context!!,
 | 
			
		||||
                activity!!,
 | 
			
		||||
                settings.getBoolean("isSelfSignedCert", false),
 | 
			
		||||
                prefs.getString("api_timeout", "-1").toLong()
 | 
			
		||||
            )
 | 
			
		||||
 | 
			
		||||
        fab.rippleColor = appColors.colorAccentDark
 | 
			
		||||
            fab = rootView!!.fab
 | 
			
		||||
 | 
			
		||||
        val floatingToolbar: FloatingToolbar = rootView.floatingToolbar
 | 
			
		||||
        floatingToolbar.attachFab(fab)
 | 
			
		||||
            fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
 | 
			
		||||
 | 
			
		||||
        floatingToolbar.background = ColorDrawable(appColors.colorAccent)
 | 
			
		||||
            fab.rippleColor = appColors.colorAccentDark
 | 
			
		||||
 | 
			
		||||
        val customTabsIntent = activity!!.buildCustomTabsIntent()
 | 
			
		||||
        mCustomTabActivityHelper = CustomTabActivityHelper()
 | 
			
		||||
        mCustomTabActivityHelper.bindCustomTabsService(activity)
 | 
			
		||||
            val floatingToolbar: FloatingToolbar = rootView!!.floatingToolbar
 | 
			
		||||
            floatingToolbar.attachFab(fab)
 | 
			
		||||
 | 
			
		||||
            floatingToolbar.background = ColorDrawable(appColors.colorAccent)
 | 
			
		||||
 | 
			
		||||
            val customTabsIntent = activity!!.buildCustomTabsIntent()
 | 
			
		||||
            mCustomTabActivityHelper = CustomTabActivityHelper()
 | 
			
		||||
            mCustomTabActivityHelper!!.bindCustomTabsService(activity)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        floatingToolbar.setClickListener(
 | 
			
		||||
            object : FloatingToolbar.ItemClickListener {
 | 
			
		||||
                override fun onItemClick(item: MenuItem) {
 | 
			
		||||
                    when (item.itemId) {
 | 
			
		||||
                        R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
 | 
			
		||||
                        R.id.share_action -> activity!!.shareLink(url)
 | 
			
		||||
                        R.id.open_action -> activity!!.openItemUrl(
 | 
			
		||||
                            allItems,
 | 
			
		||||
                            pageNumber.toInt(),
 | 
			
		||||
                            url,
 | 
			
		||||
                            customTabsIntent,
 | 
			
		||||
                            false,
 | 
			
		||||
                            false,
 | 
			
		||||
                            activity!!
 | 
			
		||||
                        )
 | 
			
		||||
                        R.id.unread_action -> if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
 | 
			
		||||
                            api.unmarkItem(allItems[pageNumber.toInt()].id).enqueue(
 | 
			
		||||
                                object : Callback<SuccessResponse> {
 | 
			
		||||
                                    override fun onResponse(
 | 
			
		||||
                                        call: Call<SuccessResponse>,
 | 
			
		||||
                                        response: Response<SuccessResponse>
 | 
			
		||||
                                    ) {
 | 
			
		||||
                                        if (!response.succeeded() && debugReadingItems) {
 | 
			
		||||
                                            val message =
 | 
			
		||||
                                                "message: ${response.message()} " +
 | 
			
		||||
                                                        "response isSuccess: ${response.isSuccessful} " +
 | 
			
		||||
                                                        "response code: ${response.code()} " +
 | 
			
		||||
                                                        "response message: ${response.message()} " +
 | 
			
		||||
                                                        "response errorBody: ${response.errorBody()?.string()} " +
 | 
			
		||||
                                                        "body success: ${response.body()?.success} " +
 | 
			
		||||
                                                        "body isSuccess: ${response.body()?.isSuccess}"
 | 
			
		||||
                                            ACRA.getErrorReporter().maybeHandleSilentException(Exception(message), activity!!)
 | 
			
		||||
                                        }
 | 
			
		||||
                                    }
 | 
			
		||||
 | 
			
		||||
                                    override fun onFailure(
 | 
			
		||||
                                        call: Call<SuccessResponse>,
 | 
			
		||||
                                        t: Throwable
 | 
			
		||||
                                    ) {
 | 
			
		||||
                                        if (debugReadingItems) {
 | 
			
		||||
                                            ACRA.getErrorReporter().maybeHandleSilentException(t, activity!!)
 | 
			
		||||
                                        }
 | 
			
		||||
                                    }
 | 
			
		||||
                                }
 | 
			
		||||
            floatingToolbar.setClickListener(
 | 
			
		||||
                object : FloatingToolbar.ItemClickListener {
 | 
			
		||||
                    override fun onItemClick(item: MenuItem) {
 | 
			
		||||
                        when (item.itemId) {
 | 
			
		||||
                            R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
 | 
			
		||||
                            R.id.share_action -> activity!!.shareLink(url, contentTitle)
 | 
			
		||||
                            R.id.open_action -> activity!!.openItemUrl(
 | 
			
		||||
                                allItems,
 | 
			
		||||
                                pageNumber.toInt(),
 | 
			
		||||
                                url,
 | 
			
		||||
                                customTabsIntent,
 | 
			
		||||
                                false,
 | 
			
		||||
                                false,
 | 
			
		||||
                                activity!!
 | 
			
		||||
                            )
 | 
			
		||||
                        } else {
 | 
			
		||||
                            thread {
 | 
			
		||||
                                db.actionsDao().insertAllActions(ActionEntity(allItems[pageNumber.toInt()].id, false, true, false, false))
 | 
			
		||||
                            R.id.unread_action -> if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
 | 
			
		||||
                                api.unmarkItem(allItems[pageNumber.toInt()].id).enqueue(
 | 
			
		||||
                                    object : Callback<SuccessResponse> {
 | 
			
		||||
                                        override fun onResponse(
 | 
			
		||||
                                            call: Call<SuccessResponse>,
 | 
			
		||||
                                            response: Response<SuccessResponse>
 | 
			
		||||
                                        ) {
 | 
			
		||||
                                        }
 | 
			
		||||
 | 
			
		||||
                                        override fun onFailure(
 | 
			
		||||
                                            call: Call<SuccessResponse>,
 | 
			
		||||
                                            t: Throwable
 | 
			
		||||
                                        ) {
 | 
			
		||||
                                        }
 | 
			
		||||
                                    }
 | 
			
		||||
                                )
 | 
			
		||||
                            } else {
 | 
			
		||||
                                thread {
 | 
			
		||||
                                    db.actionsDao().insertAllActions(ActionEntity(allItems[pageNumber.toInt()].id, false, true, false, false))
 | 
			
		||||
                                }
 | 
			
		||||
                            }
 | 
			
		||||
                            else -> Unit
 | 
			
		||||
                        }
 | 
			
		||||
                        else -> Unit
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
                    override fun onItemLongClick(item: MenuItem?) {
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            )
 | 
			
		||||
 | 
			
		||||
                override fun onItemLongClick(item: MenuItem?) {
 | 
			
		||||
            rootView!!.source.text = contentSource
 | 
			
		||||
            if (typeface != null) {
 | 
			
		||||
                rootView!!.source.typeface = typeface
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            if (contentText.isEmptyOrNullOrNullString()) {
 | 
			
		||||
                getContentFromMercury(customTabsIntent, prefs)
 | 
			
		||||
            } else {
 | 
			
		||||
                rootView!!.titleView.text = contentTitle
 | 
			
		||||
                if (typeface != null) {
 | 
			
		||||
                    rootView!!.titleView.typeface = typeface
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                htmlToWebview()
 | 
			
		||||
 | 
			
		||||
                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
 | 
			
		||||
                    rootView!!.imageView.visibility = View.VISIBLE
 | 
			
		||||
                    Glide
 | 
			
		||||
                        .with(context!!)
 | 
			
		||||
                        .asBitmap()
 | 
			
		||||
                        .loadMaybeBasicAuth(config, contentImage)
 | 
			
		||||
                        .apply(RequestOptions.fitCenterTransform())
 | 
			
		||||
                        .into(rootView!!.imageView)
 | 
			
		||||
                } else {
 | 
			
		||||
                    rootView!!.imageView.visibility = View.GONE
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
        rootView.source.text = contentSource
 | 
			
		||||
            rootView!!.nestedScrollView.setOnScrollChangeListener(
 | 
			
		||||
                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
 | 
			
		||||
                    if (scrollY > oldScrollY) {
 | 
			
		||||
                        fab.hide()
 | 
			
		||||
                    } else {
 | 
			
		||||
                        if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            )
 | 
			
		||||
 | 
			
		||||
        if (contentText.isEmptyOrNullOrNullString()) {
 | 
			
		||||
            getContentFromMercury(customTabsIntent, prefs)
 | 
			
		||||
        } else {
 | 
			
		||||
            rootView.titleView.text = contentTitle
 | 
			
		||||
 | 
			
		||||
            htmlToWebview(contentText, prefs)
 | 
			
		||||
 | 
			
		||||
            if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
 | 
			
		||||
                rootView.imageView.visibility = View.VISIBLE
 | 
			
		||||
                Glide
 | 
			
		||||
                    .with(context!!)
 | 
			
		||||
                    .asBitmap()
 | 
			
		||||
                    .load(contentImage)
 | 
			
		||||
                    .apply(RequestOptions.fitCenterTransform())
 | 
			
		||||
                    .into(rootView.imageView)
 | 
			
		||||
            } else {
 | 
			
		||||
                rootView.imageView.visibility = View.GONE
 | 
			
		||||
            }
 | 
			
		||||
        } catch (e: InflateException) {
 | 
			
		||||
            AlertDialog.Builder(context!!)
 | 
			
		||||
                .setMessage(context!!.getString(R.string.webview_dialog_issue_message))
 | 
			
		||||
                .setTitle(context!!.getString(R.string.webview_dialog_issue_title))
 | 
			
		||||
                .setPositiveButton(android.R.string.ok
 | 
			
		||||
                ) { dialog, which ->
 | 
			
		||||
                    val sharedPref = PreferenceManager.getDefaultSharedPreferences(context!!)
 | 
			
		||||
                    val editor = sharedPref.edit()
 | 
			
		||||
                    editor.putBoolean("prefer_article_viewer", false)
 | 
			
		||||
                    editor.commit()
 | 
			
		||||
                    activity!!.finish()
 | 
			
		||||
                }
 | 
			
		||||
                .create()
 | 
			
		||||
                .show()
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        rootView.nestedScrollView.setOnScrollChangeListener(
 | 
			
		||||
            NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
 | 
			
		||||
                if (scrollY > oldScrollY) {
 | 
			
		||||
                    fab.hide()
 | 
			
		||||
                } else {
 | 
			
		||||
                    if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
        return rootView
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun refreshAlignment() {
 | 
			
		||||
        textAlignment = when (prefs.getInt("text_align", 1)) {
 | 
			
		||||
            1 -> "justify"
 | 
			
		||||
            2 -> "left"
 | 
			
		||||
            else -> "justify"
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun getContentFromMercury(
 | 
			
		||||
        customTabsIntent: CustomTabsIntent,
 | 
			
		||||
        prefs: SharedPreferences
 | 
			
		||||
    ) {
 | 
			
		||||
        if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
 | 
			
		||||
            rootView.progressBar.visibility = View.VISIBLE
 | 
			
		||||
            val parser = MercuryApi(
 | 
			
		||||
                prefs.getBoolean("should_log_everything", false)
 | 
			
		||||
            )
 | 
			
		||||
            rootView!!.progressBar.visibility = View.VISIBLE
 | 
			
		||||
            val parser = MercuryApi()
 | 
			
		||||
 | 
			
		||||
            parser.parseUrl(url).enqueue(
 | 
			
		||||
                object : Callback<ParsedContent> {
 | 
			
		||||
@@ -247,57 +294,52 @@ class ArticleFragment : Fragment() {
 | 
			
		||||
                        try {
 | 
			
		||||
                            if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
 | 
			
		||||
                                try {
 | 
			
		||||
                                    rootView.titleView.text = response.body()!!.title
 | 
			
		||||
                                    rootView!!.titleView.text = response.body()!!.title
 | 
			
		||||
                                    if (typeface != null) {
 | 
			
		||||
                                        rootView!!.titleView.typeface = typeface
 | 
			
		||||
                                    }
 | 
			
		||||
                                    try {
 | 
			
		||||
                                        // Note: Mercury may return relative urls... If it does the url val will not be changed.
 | 
			
		||||
                                        URL(response.body()!!.url)
 | 
			
		||||
                                        url = response.body()!!.url
 | 
			
		||||
                                    } catch (e: MalformedURLException) {
 | 
			
		||||
                                        ACRA.getErrorReporter().maybeHandleSilentException(e, activity!!)
 | 
			
		||||
                                        // Mercury returned a relative url. We do nothing.
 | 
			
		||||
                                    }
 | 
			
		||||
                                } catch (e: Exception) {
 | 
			
		||||
                                    if (context != null) {
 | 
			
		||||
                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
 | 
			
		||||
                                    }
 | 
			
		||||
                                }
 | 
			
		||||
 | 
			
		||||
                                try {
 | 
			
		||||
                                    htmlToWebview(response.body()!!.content.orEmpty(), prefs)
 | 
			
		||||
                                    contentText = response.body()!!.content.orEmpty()
 | 
			
		||||
                                    htmlToWebview()
 | 
			
		||||
                                } catch (e: Exception) {
 | 
			
		||||
                                    if (context != null) {
 | 
			
		||||
                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
 | 
			
		||||
                                    }
 | 
			
		||||
                                }
 | 
			
		||||
 | 
			
		||||
                                try {
 | 
			
		||||
                                    if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isNullOrEmpty() && context != null) {
 | 
			
		||||
                                        rootView.imageView.visibility = View.VISIBLE
 | 
			
		||||
                                        rootView!!.imageView.visibility = View.VISIBLE
 | 
			
		||||
                                        try {
 | 
			
		||||
                                            Glide
 | 
			
		||||
                                                .with(context!!)
 | 
			
		||||
                                                .asBitmap()
 | 
			
		||||
                                                .load(response.body()!!.lead_image_url)
 | 
			
		||||
                                                .loadMaybeBasicAuth(config, response.body()!!.lead_image_url.orEmpty())
 | 
			
		||||
                                                .apply(RequestOptions.fitCenterTransform())
 | 
			
		||||
                                                .into(rootView.imageView)
 | 
			
		||||
                                                .into(rootView!!.imageView)
 | 
			
		||||
                                        } catch (e: Exception) {
 | 
			
		||||
                                            ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
 | 
			
		||||
                                        }
 | 
			
		||||
                                    } else {
 | 
			
		||||
                                        rootView.imageView.visibility = View.GONE
 | 
			
		||||
                                        rootView!!.imageView.visibility = View.GONE
 | 
			
		||||
                                    }
 | 
			
		||||
                                } catch (e: Exception) {
 | 
			
		||||
                                    if (context != null) {
 | 
			
		||||
                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
 | 
			
		||||
                                    }
 | 
			
		||||
                                }
 | 
			
		||||
 | 
			
		||||
                                try {
 | 
			
		||||
                                    rootView.nestedScrollView.scrollTo(0, 0)
 | 
			
		||||
                                    rootView!!.nestedScrollView.scrollTo(0, 0)
 | 
			
		||||
 | 
			
		||||
                                    rootView.progressBar.visibility = View.GONE
 | 
			
		||||
                                    rootView!!.progressBar.visibility = View.GONE
 | 
			
		||||
                                } catch (e: Exception) {
 | 
			
		||||
                                    if (context != null) {
 | 
			
		||||
                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
 | 
			
		||||
                                    }
 | 
			
		||||
                                }
 | 
			
		||||
                            } else {
 | 
			
		||||
@@ -305,13 +347,11 @@ class ArticleFragment : Fragment() {
 | 
			
		||||
                                    openInBrowserAfterFailing(customTabsIntent)
 | 
			
		||||
                                } catch (e: Exception) {
 | 
			
		||||
                                    if (context != null) {
 | 
			
		||||
                                        ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
 | 
			
		||||
                                    }
 | 
			
		||||
                                }
 | 
			
		||||
                            }
 | 
			
		||||
                        } catch (e: Exception) {
 | 
			
		||||
                            if (context != null) {
 | 
			
		||||
                                ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
 | 
			
		||||
                            }
 | 
			
		||||
                        }
 | 
			
		||||
                    }
 | 
			
		||||
@@ -325,31 +365,36 @@ class ArticleFragment : Fragment() {
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun htmlToWebview(c: String, prefs: SharedPreferences) {
 | 
			
		||||
    private fun htmlToWebview() {
 | 
			
		||||
        val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)
 | 
			
		||||
 | 
			
		||||
        rootView.webcontent.visibility = View.VISIBLE
 | 
			
		||||
        val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
 | 
			
		||||
        val a: TypedArray = context!!.obtainStyledAttributes(resId, attrs)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        rootView!!.webcontent.settings.standardFontFamily = a.getString(0)
 | 
			
		||||
        rootView!!.webcontent.visibility = View.VISIBLE
 | 
			
		||||
        val (textColor, backgroundColor) = if (appColors.isDarkTheme) {
 | 
			
		||||
            if (context != null) {
 | 
			
		||||
                rootView.webcontent.setBackgroundColor(
 | 
			
		||||
                rootView!!.webcontent.setBackgroundColor(
 | 
			
		||||
                    ContextCompat.getColor(
 | 
			
		||||
                        context!!,
 | 
			
		||||
                        R.color.dark_webview
 | 
			
		||||
                    )
 | 
			
		||||
                )
 | 
			
		||||
                Pair(ContextCompat.getColor(context!!, R.color.dark_webview_text), ContextCompat.getColor(context!!, R.color.light_webview_text))
 | 
			
		||||
                Pair(ContextCompat.getColor(context!!, R.color.dark_webview_text), ContextCompat.getColor(context!!, R.color.dark_webview))
 | 
			
		||||
            } else {
 | 
			
		||||
                Pair(null, null)
 | 
			
		||||
            }
 | 
			
		||||
        } else {
 | 
			
		||||
            if (context != null) {
 | 
			
		||||
                rootView.webcontent.setBackgroundColor(
 | 
			
		||||
                rootView!!.webcontent.setBackgroundColor(
 | 
			
		||||
                    ContextCompat.getColor(
 | 
			
		||||
                        context!!,
 | 
			
		||||
                        R.color.light_webview
 | 
			
		||||
                    )
 | 
			
		||||
                )
 | 
			
		||||
                Pair(ContextCompat.getColor(context!!, R.color.light_webview_text), ContextCompat.getColor(context!!, R.color.dark_webview_text))
 | 
			
		||||
                Pair(ContextCompat.getColor(context!!, R.color.light_webview_text), ContextCompat.getColor(context!!, R.color.light_webview))
 | 
			
		||||
            } else {
 | 
			
		||||
                Pair(null, null)
 | 
			
		||||
            }
 | 
			
		||||
@@ -367,15 +412,56 @@ class ArticleFragment : Fragment() {
 | 
			
		||||
            "#FFFFFF"
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        rootView.webcontent.settings.useWideViewPort = true
 | 
			
		||||
        rootView.webcontent.settings.loadWithOverviewMode = true
 | 
			
		||||
        rootView.webcontent.settings.javaScriptEnabled = false
 | 
			
		||||
        rootView!!.webcontent.settings.useWideViewPort = true
 | 
			
		||||
        rootView!!.webcontent.settings.loadWithOverviewMode = true
 | 
			
		||||
        rootView!!.webcontent.settings.javaScriptEnabled = false
 | 
			
		||||
 | 
			
		||||
        rootView!!.webcontent.webViewClient = object : WebViewClient() {
 | 
			
		||||
            override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
 | 
			
		||||
                if (rootView!!.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
 | 
			
		||||
                    rootView!!.context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
 | 
			
		||||
                }
 | 
			
		||||
                return true
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
 | 
			
		||||
                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
 | 
			
		||||
                if (url.toLowerCase().contains(".jpg") || url.toLowerCase().contains(".jpeg")) {
 | 
			
		||||
                    try {
 | 
			
		||||
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
 | 
			
		||||
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
 | 
			
		||||
                    }catch ( e : ExecutionException) {}
 | 
			
		||||
                }
 | 
			
		||||
                else if (url.toLowerCase().contains(".png")) {
 | 
			
		||||
                    try {
 | 
			
		||||
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
 | 
			
		||||
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
 | 
			
		||||
                    }catch ( e : ExecutionException) {}
 | 
			
		||||
                }
 | 
			
		||||
                else if (url.toLowerCase().contains(".webp")) {
 | 
			
		||||
                    try {
 | 
			
		||||
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
 | 
			
		||||
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
 | 
			
		||||
                    }catch ( e : ExecutionException) {}
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                return super.shouldInterceptRequest(view, url)
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
 | 
			
		||||
            override fun onSingleTapUp(e: MotionEvent?): Boolean {
 | 
			
		||||
                return performClick()
 | 
			
		||||
            }
 | 
			
		||||
        })
 | 
			
		||||
 | 
			
		||||
        rootView!!.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
 | 
			
		||||
 | 
			
		||||
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 | 
			
		||||
            rootView.webcontent.settings.layoutAlgorithm =
 | 
			
		||||
            rootView!!.webcontent.settings.layoutAlgorithm =
 | 
			
		||||
                    WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
 | 
			
		||||
        } else {
 | 
			
		||||
            rootView.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
 | 
			
		||||
            rootView!!.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        var baseUrl: String? = null
 | 
			
		||||
@@ -384,13 +470,31 @@ class ArticleFragment : Fragment() {
 | 
			
		||||
            val itemUrl = URL(url)
 | 
			
		||||
            baseUrl = itemUrl.protocol + "://" + itemUrl.host
 | 
			
		||||
        } catch (e: MalformedURLException) {
 | 
			
		||||
            ACRA.getErrorReporter().maybeHandleSilentException(e, activity!!)
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        rootView.webcontent.loadDataWithBaseURL(
 | 
			
		||||
        val fontName =  when (font) {
 | 
			
		||||
            getString(R.string.open_sans_font_id) -> "Open Sans"
 | 
			
		||||
            getString(R.string.roboto_font_id) -> "Roboto"
 | 
			
		||||
            else -> ""
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        val fontLinkAndStyle = if (font.isNotEmpty()) {
 | 
			
		||||
            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
 | 
			
		||||
                |<style>
 | 
			
		||||
                |   * {
 | 
			
		||||
                |       font-family: '$fontName';
 | 
			
		||||
                |   }
 | 
			
		||||
                |</style>
 | 
			
		||||
            """.trimMargin()
 | 
			
		||||
        } else {
 | 
			
		||||
            ""
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        rootView!!.webcontent.loadDataWithBaseURL(
 | 
			
		||||
            baseUrl,
 | 
			
		||||
            """<html>
 | 
			
		||||
                |<head>
 | 
			
		||||
                |   <meta name="viewport" content="width=device-width, initial-scale=1">
 | 
			
		||||
                |   <style>
 | 
			
		||||
                |      img {
 | 
			
		||||
                |        display: inline-block;
 | 
			
		||||
@@ -405,13 +509,21 @@ class ArticleFragment : Fragment() {
 | 
			
		||||
                |        color: $stringTextColor;
 | 
			
		||||
                |      }
 | 
			
		||||
                |      * {
 | 
			
		||||
                |        font-size: ${fontSize.toPx}px;
 | 
			
		||||
                |        text-align: justify;
 | 
			
		||||
                |        font-size: ${fontSize}px;
 | 
			
		||||
                |        text-align: $textAlignment;
 | 
			
		||||
                |        word-break: break-word;
 | 
			
		||||
                |        overflow:hidden;
 | 
			
		||||
                |        line-height: 1.5em;
 | 
			
		||||
                |        background-color: $stringBackgroundColor;
 | 
			
		||||
                |      }
 | 
			
		||||
                |      body, html {
 | 
			
		||||
                |        background-color: $stringBackgroundColor !important;
 | 
			
		||||
                |        border-color: $stringBackgroundColor  !important;
 | 
			
		||||
                |        padding: 0 !important;
 | 
			
		||||
                |        margin: 0 !important;
 | 
			
		||||
                |      }
 | 
			
		||||
                |      a, pre, code {
 | 
			
		||||
                |        text-align: left;
 | 
			
		||||
                |        text-align: $textAlignment;
 | 
			
		||||
                |      }
 | 
			
		||||
                |      pre, code {
 | 
			
		||||
                |        white-space: pre-wrap;
 | 
			
		||||
@@ -419,9 +531,10 @@ class ArticleFragment : Fragment() {
 | 
			
		||||
                |        background-color: $stringBackgroundColor;
 | 
			
		||||
                |      }
 | 
			
		||||
                |   </style>
 | 
			
		||||
                |   $fontLinkAndStyle
 | 
			
		||||
                |</head>
 | 
			
		||||
                |<body>
 | 
			
		||||
                |   $c
 | 
			
		||||
                |   $contentText
 | 
			
		||||
                |</body>""".trimMargin(),
 | 
			
		||||
            "text/html",
 | 
			
		||||
            "utf-8",
 | 
			
		||||
@@ -430,7 +543,7 @@ class ArticleFragment : Fragment() {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
 | 
			
		||||
        rootView.progressBar.visibility = View.GONE
 | 
			
		||||
        rootView!!.progressBar.visibility = View.GONE
 | 
			
		||||
        activity!!.openItemUrl(
 | 
			
		||||
            allItems,
 | 
			
		||||
            pageNumber.toInt(),
 | 
			
		||||
@@ -459,5 +572,20 @@ class ArticleFragment : Fragment() {
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun performClick(): Boolean {
 | 
			
		||||
        if (rootView!!.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
 | 
			
		||||
                rootView!!.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
 | 
			
		||||
 | 
			
		||||
            val position : Int = allImages.indexOf(rootView!!.webcontent.hitTestResult.extra)
 | 
			
		||||
 | 
			
		||||
            val intent = Intent(activity, ImageActivity::class.java)
 | 
			
		||||
            intent.putExtra("allImages", allImages)
 | 
			
		||||
            intent.putExtra("position", position)
 | 
			
		||||
            startActivity(intent)
 | 
			
		||||
            return false
 | 
			
		||||
        }
 | 
			
		||||
        return false
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,49 @@
 | 
			
		||||
package apps.amine.bou.readerforselfoss.fragments
 | 
			
		||||
 | 
			
		||||
import android.os.Bundle
 | 
			
		||||
import android.view.*
 | 
			
		||||
import androidx.fragment.app.Fragment
 | 
			
		||||
import apps.amine.bou.readerforselfoss.R
 | 
			
		||||
import com.bumptech.glide.Glide
 | 
			
		||||
import com.bumptech.glide.load.engine.DiskCacheStrategy
 | 
			
		||||
import com.bumptech.glide.request.RequestOptions
 | 
			
		||||
import kotlinx.android.synthetic.main.fragment_image.view.*
 | 
			
		||||
 | 
			
		||||
class ImageFragment : Fragment() {
 | 
			
		||||
 | 
			
		||||
    private lateinit var imageUrl : String
 | 
			
		||||
    private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
 | 
			
		||||
 | 
			
		||||
    override fun onCreate(savedInstanceState: Bundle?) {
 | 
			
		||||
        super.onCreate(savedInstanceState)
 | 
			
		||||
 | 
			
		||||
        imageUrl = arguments!!.getString("imageUrl")
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 | 
			
		||||
        val view : View = inflater.inflate(R.layout.fragment_image, container, false)
 | 
			
		||||
 | 
			
		||||
        view.photoView.visibility = View.VISIBLE
 | 
			
		||||
        Glide.with(activity)
 | 
			
		||||
                .asBitmap()
 | 
			
		||||
                .apply(glideOptions)
 | 
			
		||||
                .load(imageUrl)
 | 
			
		||||
                .into(view.photoView)
 | 
			
		||||
 | 
			
		||||
        return view
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    companion object {
 | 
			
		||||
        private const val ARG_IMAGE = "imageUrl"
 | 
			
		||||
 | 
			
		||||
        fun newInstance(
 | 
			
		||||
                imageUrl : String
 | 
			
		||||
        ): ImageFragment {
 | 
			
		||||
            val fragment = ImageFragment()
 | 
			
		||||
            val args = Bundle()
 | 
			
		||||
            args.putString(ARG_IMAGE, imageUrl)
 | 
			
		||||
            fragment.arguments = args
 | 
			
		||||
            return fragment
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -20,9 +20,9 @@ data class ItemEntity(
 | 
			
		||||
    @ColumnInfo(name = "starred")
 | 
			
		||||
    var starred: Boolean,
 | 
			
		||||
    @ColumnInfo(name = "thumbnail")
 | 
			
		||||
    val thumbnail: String,
 | 
			
		||||
    val thumbnail: String?,
 | 
			
		||||
    @ColumnInfo(name = "icon")
 | 
			
		||||
    val icon: String,
 | 
			
		||||
    val icon: String?,
 | 
			
		||||
    @ColumnInfo(name = "link")
 | 
			
		||||
    val link: String,
 | 
			
		||||
    @ColumnInfo(name = "sourcetitle")
 | 
			
		||||
 
 | 
			
		||||
@@ -8,6 +8,7 @@ import android.content.Context;
 | 
			
		||||
import android.content.Intent;
 | 
			
		||||
import android.content.SharedPreferences;
 | 
			
		||||
import android.content.res.Configuration;
 | 
			
		||||
import android.content.res.Resources;
 | 
			
		||||
import android.net.Uri;
 | 
			
		||||
import android.os.Build;
 | 
			
		||||
import android.os.Bundle;
 | 
			
		||||
@@ -24,6 +25,7 @@ import android.text.Editable;
 | 
			
		||||
import android.text.InputFilter;
 | 
			
		||||
import android.text.Spanned;
 | 
			
		||||
import android.text.TextWatcher;
 | 
			
		||||
import android.util.Log;
 | 
			
		||||
import android.view.Menu;
 | 
			
		||||
import android.view.MenuInflater;
 | 
			
		||||
import android.view.MenuItem;
 | 
			
		||||
@@ -124,6 +126,27 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 | 
			
		||||
    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
 | 
			
		||||
    public void onBuildHeaders(List<Header> target) {
 | 
			
		||||
        loadHeadersFromResource(R.xml.pref_headers, target);
 | 
			
		||||
 | 
			
		||||
        AppColors appColors = new AppColors(this);
 | 
			
		||||
        if (appColors != null && appColors.isDarkTheme()) {
 | 
			
		||||
            for (Header header : target) {
 | 
			
		||||
                tryLoadIconDark(header);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private void tryLoadIconDark(Header header){
 | 
			
		||||
        try{
 | 
			
		||||
            if (header.fragmentArguments != null) {
 | 
			
		||||
                String iconDark = header.fragmentArguments.getString("iconDark");
 | 
			
		||||
                int iconDarkId = getResources().getIdentifier(iconDark, "drawable", getPackageName());
 | 
			
		||||
                if (iconDarkId != 0) {
 | 
			
		||||
                    header.iconRes = iconDarkId;
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        } catch (Exception e) {
 | 
			
		||||
            Log.e("SettingsActivity", "Can not load dark icon", e);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
@@ -136,7 +159,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 | 
			
		||||
                || GeneralPreferenceFragment.class.getName().equals(fragmentName)
 | 
			
		||||
                || ArticleViewerPreferenceFragment.class.getName().equals(fragmentName)
 | 
			
		||||
                || OfflinePreferenceFragment.class.getName().equals(fragmentName)
 | 
			
		||||
                || DebugPreferenceFragment.class.getName().equals(fragmentName)
 | 
			
		||||
                || ExperimentalPreferenceFragment.class.getName().equals(fragmentName)
 | 
			
		||||
                || LinksPreferenceFragment.class.getName().equals(fragmentName)
 | 
			
		||||
                || ThemePreferenceFragment.class.getName().equals(fragmentName);
 | 
			
		||||
    }
 | 
			
		||||
@@ -172,16 +195,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 | 
			
		||||
            });
 | 
			
		||||
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        @Override
 | 
			
		||||
        public boolean onOptionsItemSelected(MenuItem item) {
 | 
			
		||||
            int id = item.getItemId();
 | 
			
		||||
            if (id == android.R.id.home) {
 | 
			
		||||
                getActivity().finish();
 | 
			
		||||
                return true;
 | 
			
		||||
            }
 | 
			
		||||
            return super.onOptionsItemSelected(item);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
 | 
			
		||||
@@ -222,58 +235,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 | 
			
		||||
                    }
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        @Override
 | 
			
		||||
        public boolean onOptionsItemSelected(MenuItem item) {
 | 
			
		||||
            int id = item.getItemId();
 | 
			
		||||
            if (id == android.R.id.home) {
 | 
			
		||||
                getActivity().finish();
 | 
			
		||||
                return true;
 | 
			
		||||
            }
 | 
			
		||||
            return super.onOptionsItemSelected(item);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
 | 
			
		||||
    public static class DebugPreferenceFragment extends PreferenceFragment {
 | 
			
		||||
        @Override
 | 
			
		||||
        public void onCreate(Bundle savedInstanceState) {
 | 
			
		||||
            super.onCreate(savedInstanceState);
 | 
			
		||||
            addPreferencesFromResource(R.xml.pref_debug);
 | 
			
		||||
            setHasOptionsMenu(true);
 | 
			
		||||
 | 
			
		||||
            SharedPreferences pref = getActivity().getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE);
 | 
			
		||||
            final String id = pref.getString("unique_id", "...");
 | 
			
		||||
 | 
			
		||||
            final Preference identifier = findPreference("debug_identifier");
 | 
			
		||||
            final ClipboardManager clipboard = (ClipboardManager)
 | 
			
		||||
                    getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
 | 
			
		||||
 | 
			
		||||
            identifier.setOnPreferenceClickListener(new OnPreferenceClickListener() {
 | 
			
		||||
                @Override
 | 
			
		||||
                public boolean onPreferenceClick(Preference preference) {
 | 
			
		||||
                    if (clipboard != null) {
 | 
			
		||||
                        ClipData clip = ClipData.newPlainText("Selfoss unique id", id);
 | 
			
		||||
                        clipboard.setPrimaryClip(clip);
 | 
			
		||||
 | 
			
		||||
                        Toast.makeText(getActivity(), R.string.unique_id_to_clipboard, Toast.LENGTH_LONG).show();
 | 
			
		||||
                        return true;
 | 
			
		||||
                    }
 | 
			
		||||
                    return false;
 | 
			
		||||
                }
 | 
			
		||||
            });
 | 
			
		||||
            identifier.setTitle(id);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        @Override
 | 
			
		||||
        public boolean onOptionsItemSelected(MenuItem item) {
 | 
			
		||||
            int id = item.getItemId();
 | 
			
		||||
            if (id == android.R.id.home) {
 | 
			
		||||
                getActivity().finish();
 | 
			
		||||
                return true;
 | 
			
		||||
            }
 | 
			
		||||
            return super.onOptionsItemSelected(item);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
@@ -317,16 +278,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 | 
			
		||||
                }
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        @Override
 | 
			
		||||
        public boolean onOptionsItemSelected(MenuItem item) {
 | 
			
		||||
            int id = item.getItemId();
 | 
			
		||||
            if (id == android.R.id.home) {
 | 
			
		||||
                getActivity().finish();
 | 
			
		||||
                return true;
 | 
			
		||||
            }
 | 
			
		||||
            return super.onOptionsItemSelected(item);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
 | 
			
		||||
@@ -341,10 +292,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 | 
			
		||||
        @Override
 | 
			
		||||
        public boolean onOptionsItemSelected(MenuItem item) {
 | 
			
		||||
            int id = item.getItemId();
 | 
			
		||||
            if (id == android.R.id.home) {
 | 
			
		||||
                getActivity().finish();
 | 
			
		||||
                return true;
 | 
			
		||||
            } else if (id == R.id.clear) {
 | 
			
		||||
            if (id == R.id.clear) {
 | 
			
		||||
                SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getActivity());
 | 
			
		||||
                SharedPreferences.Editor editor = pref.edit();
 | 
			
		||||
                editor.remove("color_primary");
 | 
			
		||||
@@ -353,7 +301,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 | 
			
		||||
                editor.remove("color_accent_dark");
 | 
			
		||||
                editor.remove("dark_theme");
 | 
			
		||||
                editor.apply();
 | 
			
		||||
                getActivity().finish();
 | 
			
		||||
                getActivity().recreate();
 | 
			
		||||
            }
 | 
			
		||||
            return super.onOptionsItemSelected(item);
 | 
			
		||||
        }
 | 
			
		||||
@@ -372,15 +320,15 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 | 
			
		||||
            addPreferencesFromResource(R.xml.pref_offline);
 | 
			
		||||
            setHasOptionsMenu(true);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
 | 
			
		||||
    public static class ExperimentalPreferenceFragment extends PreferenceFragment {
 | 
			
		||||
        @Override
 | 
			
		||||
        public boolean onOptionsItemSelected(MenuItem item) {
 | 
			
		||||
            int id = item.getItemId();
 | 
			
		||||
            if (id == android.R.id.home) {
 | 
			
		||||
                getActivity().finish();
 | 
			
		||||
                return true;
 | 
			
		||||
            }
 | 
			
		||||
            return super.onOptionsItemSelected(item);
 | 
			
		||||
        public void onCreate(Bundle savedInstanceState) {
 | 
			
		||||
            super.onCreate(savedInstanceState);
 | 
			
		||||
            addPreferencesFromResource(R.xml.pref_experimental);
 | 
			
		||||
            setHasOptionsMenu(true);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -389,7 +337,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 | 
			
		||||
    public boolean onOptionsItemSelected(MenuItem item) {
 | 
			
		||||
        int id = item.getItemId();
 | 
			
		||||
        if (id == android.R.id.home) {
 | 
			
		||||
            finish();
 | 
			
		||||
            super.onBackPressed();
 | 
			
		||||
            return true;
 | 
			
		||||
        }
 | 
			
		||||
        return super.onOptionsItemSelected(item);
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +0,0 @@
 | 
			
		||||
package apps.amine.bou.readerforselfoss.utils
 | 
			
		||||
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import android.preference.PreferenceManager
 | 
			
		||||
import org.acra.ErrorReporter
 | 
			
		||||
 | 
			
		||||
fun ErrorReporter.maybeHandleSilentException(throwable: Throwable, ctx: Context) {
 | 
			
		||||
    val sharedPref = PreferenceManager.getDefaultSharedPreferences(ctx)
 | 
			
		||||
    if (sharedPref.getBoolean("acra_should_log", false)) {
 | 
			
		||||
        this.handleSilentException(throwable)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -25,11 +25,12 @@ fun String.toStringUriWithHttp(): String =
 | 
			
		||||
        this
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
fun Context.shareLink(itemUrl: String) {
 | 
			
		||||
fun Context.shareLink(itemUrl: String, itemTitle: String) {
 | 
			
		||||
    val sendIntent = Intent()
 | 
			
		||||
    sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
 | 
			
		||||
    sendIntent.action = Intent.ACTION_SEND
 | 
			
		||||
    sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl.toStringUriWithHttp())
 | 
			
		||||
    sendIntent.putExtra(Intent.EXTRA_SUBJECT, itemTitle)
 | 
			
		||||
    sendIntent.type = "text/plain"
 | 
			
		||||
    startActivity(
 | 
			
		||||
        Intent.createChooser(
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,6 @@ import android.content.Context
 | 
			
		||||
import android.text.format.DateUtils
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.Item
 | 
			
		||||
import apps.amine.bou.readerforselfoss.api.selfoss.SelfossTagType
 | 
			
		||||
import org.acra.ACRA
 | 
			
		||||
import java.text.ParseException
 | 
			
		||||
import java.text.SimpleDateFormat
 | 
			
		||||
import java.util.*
 | 
			
		||||
@@ -15,7 +14,6 @@ fun String.toTextDrawableString(c: Context): String {
 | 
			
		||||
        try {
 | 
			
		||||
            textDrawable.append(s[0])
 | 
			
		||||
        } catch (e: StringIndexOutOfBoundsException) {
 | 
			
		||||
            ACRA.getErrorReporter().maybeHandleSilentException(e, c)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    return textDrawable.toString()
 | 
			
		||||
 
 | 
			
		||||
@@ -2,6 +2,7 @@ package apps.amine.bou.readerforselfoss.utils
 | 
			
		||||
 | 
			
		||||
import android.app.Activity
 | 
			
		||||
import android.app.PendingIntent
 | 
			
		||||
import android.content.ActivityNotFoundException
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import android.content.Intent
 | 
			
		||||
import android.graphics.BitmapFactory
 | 
			
		||||
@@ -128,13 +129,17 @@ fun Context.openItemUrl(
 | 
			
		||||
private fun openInBrowser(linkDecoded: String, app: Activity) {
 | 
			
		||||
    val intent = Intent(Intent.ACTION_VIEW)
 | 
			
		||||
    intent.data = Uri.parse(linkDecoded)
 | 
			
		||||
    app.startActivity(intent)
 | 
			
		||||
    try {
 | 
			
		||||
        app.startActivity(intent)
 | 
			
		||||
    } catch (e: ActivityNotFoundException) {
 | 
			
		||||
        Toast.makeText(app.baseContext, e.message, Toast.LENGTH_LONG).show()
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun String.isUrlValid(): Boolean =
 | 
			
		||||
    HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
 | 
			
		||||
 | 
			
		||||
fun String.isBaseUrlValid(): Boolean {
 | 
			
		||||
fun String.isBaseUrlValid(ctx: Context): Boolean {
 | 
			
		||||
    val baseUrl = HttpUrl.parse(this)
 | 
			
		||||
    var existsAndEndsWithSlash = false
 | 
			
		||||
    if (baseUrl != null) {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,112 +0,0 @@
 | 
			
		||||
/* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomUrlBasePrimaryDrawerItem.java */
 | 
			
		||||
package apps.amine.bou.readerforselfoss.utils.drawer
 | 
			
		||||
 | 
			
		||||
import android.net.Uri
 | 
			
		||||
import androidx.annotation.ColorInt
 | 
			
		||||
import androidx.annotation.ColorRes
 | 
			
		||||
import androidx.annotation.StringRes
 | 
			
		||||
import androidx.recyclerview.widget.RecyclerView
 | 
			
		||||
 | 
			
		||||
import com.mikepenz.materialdrawer.holder.ColorHolder
 | 
			
		||||
import com.mikepenz.materialdrawer.holder.ImageHolder
 | 
			
		||||
import com.mikepenz.materialdrawer.holder.StringHolder
 | 
			
		||||
import com.mikepenz.materialdrawer.model.BaseDrawerItem
 | 
			
		||||
import com.mikepenz.materialdrawer.util.DrawerImageLoader
 | 
			
		||||
import com.mikepenz.materialdrawer.util.DrawerUIUtils
 | 
			
		||||
import com.mikepenz.materialize.util.UIUtils
 | 
			
		||||
 | 
			
		||||
abstract class CustomUrlBasePrimaryDrawerItem<T, VH : RecyclerView.ViewHolder> :
 | 
			
		||||
    BaseDrawerItem<T, VH>() {
 | 
			
		||||
    fun withIcon(url: String): T {
 | 
			
		||||
        this.icon = ImageHolder(url)
 | 
			
		||||
        return this as T
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun withIcon(uri: Uri): T {
 | 
			
		||||
        this.icon = ImageHolder(uri)
 | 
			
		||||
        return this as T
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    var description: StringHolder? = null
 | 
			
		||||
        private set
 | 
			
		||||
    var descriptionTextColor: ColorHolder? = null
 | 
			
		||||
        private set
 | 
			
		||||
 | 
			
		||||
    fun withDescription(description: String): T {
 | 
			
		||||
        this.description = StringHolder(description)
 | 
			
		||||
        return this as T
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun withDescription(@StringRes descriptionRes: Int): T {
 | 
			
		||||
        this.description = StringHolder(descriptionRes)
 | 
			
		||||
        return this as T
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun withDescriptionTextColor(@ColorInt color: Int): T {
 | 
			
		||||
        this.descriptionTextColor = ColorHolder.fromColor(color)
 | 
			
		||||
        return this as T
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun withDescriptionTextColorRes(@ColorRes colorRes: Int): T {
 | 
			
		||||
        this.descriptionTextColor = ColorHolder.fromColorRes(colorRes)
 | 
			
		||||
        return this as T
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * a helper method to have the logic for all secondaryDrawerItems only once
 | 
			
		||||
 | 
			
		||||
     * @param viewHolder
 | 
			
		||||
     */
 | 
			
		||||
    protected fun bindViewHelper(viewHolder: CustomBaseViewHolder) {
 | 
			
		||||
        val ctx = viewHolder.itemView.context
 | 
			
		||||
 | 
			
		||||
        //set the identifier from the drawerItem here. It can be used to run tests
 | 
			
		||||
        viewHolder.itemView.id = hashCode()
 | 
			
		||||
 | 
			
		||||
        //set the item selected if it is
 | 
			
		||||
        viewHolder.itemView.isSelected = isSelected
 | 
			
		||||
 | 
			
		||||
        //get the correct color for the background
 | 
			
		||||
        val selectedColor = getSelectedColor(ctx)
 | 
			
		||||
        //get the correct color for the text
 | 
			
		||||
        val color = getColor(ctx)
 | 
			
		||||
        val selectedTextColor = getSelectedTextColor(ctx)
 | 
			
		||||
        //get the correct color for the icon
 | 
			
		||||
        val iconColor = getIconColor(ctx)
 | 
			
		||||
        val selectedIconColor = getSelectedIconColor(ctx)
 | 
			
		||||
 | 
			
		||||
        //set the background for the item
 | 
			
		||||
        UIUtils.setBackground(
 | 
			
		||||
            viewHolder.view,
 | 
			
		||||
            UIUtils.getSelectableBackground(ctx, selectedColor, true)
 | 
			
		||||
        )
 | 
			
		||||
        //set the text for the name
 | 
			
		||||
        StringHolder.applyTo(this.getName(), viewHolder.name)
 | 
			
		||||
        //set the text for the description or hide
 | 
			
		||||
        StringHolder.applyToOrHide(this.description, viewHolder.description)
 | 
			
		||||
 | 
			
		||||
        //set the colors for textViews
 | 
			
		||||
        viewHolder.name.setTextColor(getTextColorStateList(color, selectedTextColor))
 | 
			
		||||
        //set the description text color
 | 
			
		||||
        ColorHolder.applyToOr(
 | 
			
		||||
            descriptionTextColor,
 | 
			
		||||
            viewHolder.description,
 | 
			
		||||
            getTextColorStateList(color, selectedTextColor)
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
        //define the typeface for our textViews
 | 
			
		||||
        if (getTypeface() != null) {
 | 
			
		||||
            viewHolder.name.typeface = getTypeface()
 | 
			
		||||
            viewHolder.description.typeface = getTypeface()
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        //we make sure we reset the image first before setting the new one in case there is an empty one
 | 
			
		||||
        DrawerImageLoader.getInstance().cancelImage(viewHolder.icon)
 | 
			
		||||
        viewHolder.icon.setImageBitmap(null)
 | 
			
		||||
        //get the drawables for our icon and set it
 | 
			
		||||
        ImageHolder.applyTo(icon, viewHolder.icon, "customUrlItem")
 | 
			
		||||
 | 
			
		||||
        //for android API 17 --> Padding not applied via xml
 | 
			
		||||
        DrawerUIUtils.setDrawerVerticalPadding(viewHolder.view)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,94 +0,0 @@
 | 
			
		||||
/* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomUrlPrimaryDrawerItem.java */
 | 
			
		||||
package apps.amine.bou.readerforselfoss.utils.drawer
 | 
			
		||||
 | 
			
		||||
import androidx.annotation.LayoutRes
 | 
			
		||||
import androidx.annotation.StringRes
 | 
			
		||||
import android.view.View
 | 
			
		||||
import android.widget.TextView
 | 
			
		||||
import apps.amine.bou.readerforselfoss.R
 | 
			
		||||
import com.mikepenz.materialdrawer.holder.BadgeStyle
 | 
			
		||||
import com.mikepenz.materialdrawer.holder.StringHolder
 | 
			
		||||
import com.mikepenz.materialdrawer.model.interfaces.ColorfulBadgeable
 | 
			
		||||
 | 
			
		||||
class CustomUrlPrimaryDrawerItem :
 | 
			
		||||
    CustomUrlBasePrimaryDrawerItem<CustomUrlPrimaryDrawerItem, CustomUrlPrimaryDrawerItem.ViewHolder>(),
 | 
			
		||||
    ColorfulBadgeable<CustomUrlPrimaryDrawerItem> {
 | 
			
		||||
    protected var mBadge: StringHolder = StringHolder("")
 | 
			
		||||
    protected var mBadgeStyle = BadgeStyle()
 | 
			
		||||
 | 
			
		||||
    override fun withBadge(badge: StringHolder): CustomUrlPrimaryDrawerItem {
 | 
			
		||||
        this.mBadge = badge
 | 
			
		||||
        return this
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun withBadge(badge: String): CustomUrlPrimaryDrawerItem {
 | 
			
		||||
        this.mBadge = StringHolder(badge)
 | 
			
		||||
        return this
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun withBadge(@StringRes badgeRes: Int): CustomUrlPrimaryDrawerItem {
 | 
			
		||||
        this.mBadge = StringHolder(badgeRes)
 | 
			
		||||
        return this
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun withBadgeStyle(badgeStyle: BadgeStyle): CustomUrlPrimaryDrawerItem {
 | 
			
		||||
        this.mBadgeStyle = badgeStyle
 | 
			
		||||
        return this
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun getBadge(): StringHolder {
 | 
			
		||||
        return mBadge
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun getBadgeStyle(): BadgeStyle {
 | 
			
		||||
        return mBadgeStyle
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun getType(): Int {
 | 
			
		||||
        return R.id.material_drawer_item_custom_url_item
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @LayoutRes
 | 
			
		||||
    override fun getLayoutRes(): Int {
 | 
			
		||||
        return R.layout.material_drawer_item_primary
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun bindView(viewHolder: ViewHolder, payloads: List<*>?) {
 | 
			
		||||
        super.bindView(viewHolder, payloads)
 | 
			
		||||
 | 
			
		||||
        val ctx = viewHolder.itemView.context
 | 
			
		||||
 | 
			
		||||
        //bind the basic view parts
 | 
			
		||||
        bindViewHelper(viewHolder)
 | 
			
		||||
 | 
			
		||||
        //set the text for the badge or hide
 | 
			
		||||
        val badgeVisible = StringHolder.applyToOrHide(mBadge, viewHolder.badge)
 | 
			
		||||
        //style the badge if it is visible
 | 
			
		||||
        if (badgeVisible) {
 | 
			
		||||
            mBadgeStyle.style(
 | 
			
		||||
                viewHolder.badge,
 | 
			
		||||
                getTextColorStateList(getColor(ctx), getSelectedTextColor(ctx))
 | 
			
		||||
            )
 | 
			
		||||
            viewHolder.badgeContainer.visibility = View.VISIBLE
 | 
			
		||||
        } else {
 | 
			
		||||
            viewHolder.badgeContainer.visibility = View.GONE
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        //define the typeface for our textViews
 | 
			
		||||
        if (getTypeface() != null) {
 | 
			
		||||
            viewHolder.badge.typeface = getTypeface()
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        //call the onPostBindView method to trigger post bind view actions (like the listener to modify the item if required)
 | 
			
		||||
        onPostBindView(this, viewHolder.itemView)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    override fun getViewHolder(v: View): ViewHolder {
 | 
			
		||||
        return ViewHolder(v)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    class ViewHolder(view: View) : CustomBaseViewHolder(view) {
 | 
			
		||||
        val badgeContainer: View = view.findViewById(R.id.material_drawer_badge_container)
 | 
			
		||||
        val badge: TextView = view.findViewById(R.id.material_drawer_badge)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -2,30 +2,33 @@ package apps.amine.bou.readerforselfoss.utils.glide
 | 
			
		||||
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import android.graphics.Bitmap
 | 
			
		||||
import android.graphics.drawable.Drawable
 | 
			
		||||
import android.util.Base64
 | 
			
		||||
import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 | 
			
		||||
import android.widget.ImageView
 | 
			
		||||
import apps.amine.bou.readerforselfoss.utils.Config
 | 
			
		||||
import com.bumptech.glide.Glide
 | 
			
		||||
import com.bumptech.glide.RequestBuilder
 | 
			
		||||
import com.bumptech.glide.RequestManager
 | 
			
		||||
import com.bumptech.glide.load.model.GlideUrl
 | 
			
		||||
import com.bumptech.glide.load.model.LazyHeaders
 | 
			
		||||
import com.bumptech.glide.request.RequestOptions
 | 
			
		||||
import com.bumptech.glide.request.target.BitmapImageViewTarget
 | 
			
		||||
import java.io.ByteArrayInputStream
 | 
			
		||||
import java.io.ByteArrayOutputStream
 | 
			
		||||
import java.io.InputStream
 | 
			
		||||
 | 
			
		||||
fun Context.bitmapCenterCrop(url: String, iv: ImageView) =
 | 
			
		||||
fun Context.bitmapCenterCrop(config: Config, url: String, iv: ImageView) =
 | 
			
		||||
    Glide.with(this)
 | 
			
		||||
        .asBitmap()
 | 
			
		||||
        .load(url)
 | 
			
		||||
        .loadMaybeBasicAuth(config, url)
 | 
			
		||||
        .apply(RequestOptions.centerCropTransform())
 | 
			
		||||
        .into(iv)
 | 
			
		||||
 | 
			
		||||
fun Context.bitmapFitCenter(url: String, iv: ImageView) =
 | 
			
		||||
fun Context.circularBitmapDrawable(config: Config, url: String, iv: ImageView) =
 | 
			
		||||
    Glide.with(this)
 | 
			
		||||
        .asBitmap()
 | 
			
		||||
        .load(url)
 | 
			
		||||
        .apply(RequestOptions.fitCenterTransform())
 | 
			
		||||
        .into(iv)
 | 
			
		||||
 | 
			
		||||
fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
 | 
			
		||||
    Glide.with(this)
 | 
			
		||||
        .asBitmap()
 | 
			
		||||
        .load(url)
 | 
			
		||||
        .loadMaybeBasicAuth(config, url)
 | 
			
		||||
        .apply(RequestOptions.centerCropTransform())
 | 
			
		||||
        .into(object : BitmapImageViewTarget(iv) {
 | 
			
		||||
            override fun setResource(resource: Bitmap?) {
 | 
			
		||||
@@ -36,4 +39,31 @@ fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
 | 
			
		||||
                circularBitmapDrawable.isCircular = true
 | 
			
		||||
                iv.setImageDrawable(circularBitmapDrawable)
 | 
			
		||||
            }
 | 
			
		||||
        })
 | 
			
		||||
        })
 | 
			
		||||
 | 
			
		||||
fun RequestBuilder<Bitmap>.loadMaybeBasicAuth(config: Config, url: String): RequestBuilder<Bitmap> {
 | 
			
		||||
    val builder: LazyHeaders.Builder = LazyHeaders.Builder()
 | 
			
		||||
    if (config.httpUserLogin.isNotEmpty() || config.httpUserPassword.isNotEmpty()) {
 | 
			
		||||
        val basicAuth = "Basic " + Base64.encodeToString("${config.httpUserLogin}:${config.httpUserPassword}".toByteArray(), Base64.NO_WRAP)
 | 
			
		||||
        builder.addHeader("Authorization", basicAuth)
 | 
			
		||||
    }
 | 
			
		||||
    val glideUrl = GlideUrl(url, builder.build())
 | 
			
		||||
    return this.load(glideUrl)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun RequestManager.loadMaybeBasicAuth(config: Config, url: String): RequestBuilder<Drawable> {
 | 
			
		||||
    val builder: LazyHeaders.Builder = LazyHeaders.Builder()
 | 
			
		||||
    if (config.httpUserLogin.isNotEmpty() || config.httpUserPassword.isNotEmpty()) {
 | 
			
		||||
        val basicAuth = "Basic " + Base64.encodeToString("${config.httpUserLogin}:${config.httpUserPassword}".toByteArray(), Base64.NO_WRAP)
 | 
			
		||||
        builder.addHeader("Authorization", basicAuth)
 | 
			
		||||
    }
 | 
			
		||||
    val glideUrl = GlideUrl(url, builder.build())
 | 
			
		||||
    return this.load(glideUrl)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun getBitmapInputStream(bitmap:Bitmap,compressFormat: Bitmap.CompressFormat): InputStream {
 | 
			
		||||
    val byteArrayOutputStream = ByteArrayOutputStream()
 | 
			
		||||
    bitmap.compress(compressFormat, 80, byteArrayOutputStream)
 | 
			
		||||
    val bitmapData: ByteArray = byteArrayOutputStream.toByteArray()
 | 
			
		||||
    return ByteArrayInputStream(bitmapData)
 | 
			
		||||
}
 | 
			
		||||
@@ -11,15 +11,16 @@ import com.google.android.material.snackbar.Snackbar
 | 
			
		||||
 | 
			
		||||
var snackBarShown = false
 | 
			
		||||
var view: View? = null
 | 
			
		||||
lateinit var s: Snackbar
 | 
			
		||||
 | 
			
		||||
fun Context.isNetworkAccessible(v: View?): Boolean {
 | 
			
		||||
fun Context.isNetworkAccessible(v: View?, overrideOffline: Boolean = false): Boolean {
 | 
			
		||||
    val cm = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 | 
			
		||||
    val activeNetwork: NetworkInfo? = cm.activeNetworkInfo
 | 
			
		||||
    val networkIsAccessible = activeNetwork != null && activeNetwork.isConnectedOrConnecting
 | 
			
		||||
 | 
			
		||||
    if (v != null && !networkIsAccessible && (!snackBarShown || v != view)) {
 | 
			
		||||
    if (v != null && (!networkIsAccessible || overrideOffline) && (!snackBarShown || v != view)) {
 | 
			
		||||
        view = v
 | 
			
		||||
        val s = Snackbar
 | 
			
		||||
        s = Snackbar
 | 
			
		||||
            .make(
 | 
			
		||||
                v,
 | 
			
		||||
                R.string.no_network_connectivity,
 | 
			
		||||
@@ -37,5 +38,8 @@ fun Context.isNetworkAccessible(v: View?): Boolean {
 | 
			
		||||
        s.show()
 | 
			
		||||
        snackBarShown = true
 | 
			
		||||
    }
 | 
			
		||||
    return networkIsAccessible
 | 
			
		||||
    if (snackBarShown && networkIsAccessible && !overrideOffline) {
 | 
			
		||||
        s.dismiss()
 | 
			
		||||
    }
 | 
			
		||||
    return if(overrideOffline) overrideOffline else networkIsAccessible
 | 
			
		||||
}
 | 
			
		||||
@@ -61,7 +61,7 @@ fun Item.toEntity(): ItemEntity =
 | 
			
		||||
    ItemEntity(
 | 
			
		||||
        this.id,
 | 
			
		||||
        this.datetime,
 | 
			
		||||
        this.title,
 | 
			
		||||
        this.getTitleDecoded(),
 | 
			
		||||
        this.content,
 | 
			
		||||
        this.unread,
 | 
			
		||||
        this.starred,
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,9 @@
 | 
			
		||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
 | 
			
		||||
        android:width="24dp"
 | 
			
		||||
        android:height="24dp"
 | 
			
		||||
        android:viewportWidth="24.0"
 | 
			
		||||
        android:viewportHeight="24.0">
 | 
			
		||||
    <path
 | 
			
		||||
        android:fillColor="#FFFFFFFF"
 | 
			
		||||
        android:pathData="M3,21h18v-2L3,19v2zM3,17h18v-2L3,15v2zM3,13h18v-2L3,11v2zM3,9h18L21,7L3,7v2zM3,3v2h18L21,3L3,3z"/>
 | 
			
		||||
</vector>
 | 
			
		||||
@@ -0,0 +1,9 @@
 | 
			
		||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
 | 
			
		||||
        android:width="24dp"
 | 
			
		||||
        android:height="24dp"
 | 
			
		||||
        android:viewportWidth="24.0"
 | 
			
		||||
        android:viewportHeight="24.0">
 | 
			
		||||
    <path
 | 
			
		||||
        android:fillColor="#FFFFFFFF"
 | 
			
		||||
        android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z"/>
 | 
			
		||||
</vector>
 | 
			
		||||
| 
		 Before Width: | Height: | Size: 680 B  | 
| 
		 Before Width: | Height: | Size: 134 B  | 
| 
		 Before Width: | Height: | Size: 239 B  | 
| 
		 Before Width: | Height: | Size: 271 B  | 
| 
		 Before Width: | Height: | Size: 216 B  | 
| 
		 Before Width: | Height: | Size: 206 B  | 
| 
		 Before Width: | Height: | Size: 221 B  | 
| 
		 Before Width: | Height: | Size: 334 B  | 
| 
		 Before Width: | Height: | Size: 458 B  | 
| 
		 Before Width: | Height: | Size: 275 B  | 
| 
		 Before Width: | Height: | Size: 361 B  | 
| 
		 Before Width: | Height: | Size: 324 B  | 
| 
		 Before Width: | Height: | Size: 301 B  | 
| 
		 Before Width: | Height: | Size: 551 B  | 
| 
		 Before Width: | Height: | Size: 355 B  | 
| 
		 Before Width: | Height: | Size: 551 B  | 
| 
		 Before Width: | Height: | Size: 204 B  | 
| 
		 Before Width: | Height: | Size: 187 B  | 
| 
		 Before Width: | Height: | Size: 422 B  | 
| 
		 Before Width: | Height: | Size: 473 B  | 
| 
		 Before Width: | Height: | Size: 498 B  | 
| 
		 Before Width: | Height: | Size: 453 B  | 
| 
		 Before Width: | Height: | Size: 398 B  | 
| 
		 Before Width: | Height: | Size: 397 B  | 
| 
		 Before Width: | Height: | Size: 523 B  | 
| 
		 Before Width: | Height: | Size: 442 B  | 
| 
		 Before Width: | Height: | Size: 116 B  | 
| 
		 Before Width: | Height: | Size: 174 B  | 
| 
		 Before Width: | Height: | Size: 212 B  | 
| 
		 Before Width: | Height: | Size: 136 B  | 
| 
		 Before Width: | Height: | Size: 134 B  | 
| 
		 Before Width: | Height: | Size: 175 B  | 
| 
		 Before Width: | Height: | Size: 228 B  | 
| 
		 Before Width: | Height: | Size: 268 B  | 
| 
		 Before Width: | Height: | Size: 213 B  | 
| 
		 Before Width: | Height: | Size: 247 B  | 
| 
		 Before Width: | Height: | Size: 215 B  | 
| 
		 Before Width: | Height: | Size: 208 B  | 
| 
		 Before Width: | Height: | Size: 352 B  | 
| 
		 Before Width: | Height: | Size: 241 B  | 
| 
		 Before Width: | Height: | Size: 355 B  | 
| 
		 Before Width: | Height: | Size: 157 B  | 
| 
		 Before Width: | Height: | Size: 144 B  | 
| 
		 Before Width: | Height: | Size: 276 B  | 
| 
		 Before Width: | Height: | Size: 309 B  | 
| 
		 Before Width: | Height: | Size: 339 B  | 
| 
		 Before Width: | Height: | Size: 322 B  | 
| 
		 Before Width: | Height: | Size: 262 B  | 
| 
		 Before Width: | Height: | Size: 268 B  | 
| 
		 Before Width: | Height: | Size: 361 B  | 
| 
		 Before Width: | Height: | Size: 634 B  | 
| 
		 Before Width: | Height: | Size: 168 B  | 
| 
		 Before Width: | Height: | Size: 261 B  | 
| 
		 Before Width: | Height: | Size: 312 B  | 
| 
		 Before Width: | Height: | Size: 171 B  | 
| 
		 Before Width: | Height: | Size: 174 B  | 
| 
		 Before Width: | Height: | Size: 257 B  | 
| 
		 Before Width: | Height: | Size: 380 B  | 
| 
		 Before Width: | Height: | Size: 504 B  | 
| 
		 Before Width: | Height: | Size: 300 B  | 
| 
		 Before Width: | Height: | Size: 437 B  | 
| 
		 Before Width: | Height: | Size: 327 B  | 
| 
		 Before Width: | Height: | Size: 308 B  | 
| 
		 Before Width: | Height: | Size: 684 B  | 
| 
		 Before Width: | Height: | Size: 464 B  |