Compare commits

..
94 Commits
Author SHA1 Message Date
Amine Louveauandaminecmi f4db02521d drone-sign (#57)
## Types of changes

- [ ] I have read the **CONTRIBUTING** document.
- [ ] My code follows the code style of this project.
- [ ] I have updated the documentation accordingly.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
- [ ] This is **NOT** translation related.

This closes issue #XXX

This is implements feature #YYY

This finishes chore #ZZZ

Co-authored-by: aminecmi <aminecmi@gmail.com>
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/57
2022-09-14 10:32:00 +00:00
aminecmi 01763556b1 Fixed release build issues. 2022-09-13 09:00:54 +02:00
aminecmi e2411c00d8 Shorter description. 2022-09-08 19:00:19 +02:00
aminecmi 0473a5f7bc Changelog. 2022-09-07 21:43:46 +02:00
aminecmi d0d6a4378c Trying to fix fdroid build. 2022-09-07 21:24:38 +02:00
aminecmi 1dfa3c9f07 Version scripts. 2022-09-07 20:24:19 +02:00
Amine Louveau 815f00e764 Merge pull request 'Correctly handle the back button in settings' (#48) from davidoskky/ReaderForSelfoss-multiplatform:Settings_back into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/48
2022-09-06 18:20:38 +00:00
davidoskky bdc77ab8ef Remove unused lambda 2022-09-06 12:36:37 +02:00
davidoskky 6bd06cb458 Correctly handle the back button in settings 2022-09-06 12:28:31 +02:00
aminecmi e9e8bee6c9 Disable all the backups. 2022-08-29 15:37:43 +02:00
aminecmi ff6038dbd4 Removing the backup function for security reasons. 2022-08-28 13:41:48 +02:00
Amine Louveau 8146cff011 Merge pull request 'Closes #44' (#46) from chore/cleaning_drawer_data into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/46
2022-08-28 11:41:16 +00:00
aminecmi fc4c48dd12 Closes #44 2022-08-28 10:30:03 +02:00
aminecmi 94f1ec943c Cleaning. 2022-08-27 15:09:25 +02:00
Amine Louveau 0278540fb2 Merge pull request 'feature/api_timeout_and_settings_cleaning' (#45) from feature/api_timeout_and_settings_cleaning into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/45
2022-08-27 12:20:54 +00:00
aminecmi 109050d0cf Fixing a todo. 2022-08-27 13:06:16 +02:00
aminecmi 0392e1b406 Typo fix. 2022-08-27 13:00:19 +02:00
aminecmi 8b2be5c55c Refreshing settings. 2022-08-26 23:39:30 +02:00
aminecmi e6afb4702d Cleaning code. 2022-08-26 23:37:02 +02:00
aminecmi 8cf462a755 Fixing api version issue on login. 2022-08-26 23:37:02 +02:00
aminecmi 17293e5574 Removing self signed certificate (Closes #43) and removing http login (Closes #37) 2022-08-26 23:37:02 +02:00
aminecmi a99286a9b7 Really big settings cleaning. 2022-08-26 23:37:02 +02:00
aminecmi 5531034086 WIP: Big settings cleaning. 2022-08-26 23:37:01 +02:00
Amine Louveau fbcb428e96 Merge pull request 'Fetch api version on login' (#39) from davidoskky/ReaderForSelfoss-multiplatform:loginApi into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/39
2022-08-25 02:25:27 +00:00
davidoskky e281751bb0 Fetch api version on login 2022-08-24 23:26:49 +02:00
aminecmi 0eed9a8d07 Translations. 2022-08-24 14:41:57 +02:00
Amine Louveau 9603860bae Merge pull request 'chore/sonarqube-fixes' (#35) from chore/sonarqube-fixes into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/35
2022-08-24 12:37:37 +00:00
aminecmi 75b566a38d Some cleaning to handle actions on connection restore. 2022-08-24 13:58:24 +02:00
aminecmi fb572dbb27 Closes #36 2022-08-24 13:34:05 +02:00
aminecmi 34028949d7 More code cleaning. 2022-08-23 22:52:36 +02:00
aminecmi 44a0469b17 Fixes #25; 2022-08-23 22:46:48 +02:00
aminecmi c87473e8f1 Cache from settings. 2022-08-23 22:45:19 +02:00
aminecmi de43abf019 Fixed mercury issues. 2022-08-23 22:45:19 +02:00
aminecmi e60f3a9d91 Push everywhere ? 2022-08-23 22:45:19 +02:00
aminecmi 255fbcb12f Added build cache. 2022-08-23 22:45:19 +02:00
aminecmi 0caeb94e64 Translations. 2022-08-23 22:43:02 +02:00
Amine Louveau 6f6a42b878 Merge pull request 'DB caching.' (#33) from feature/sqldelight into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/33
2022-08-23 20:39:19 +00:00
aminecmi 67d54f0dd7 Big code cleaning. 2022-08-23 22:16:54 +02:00
aminecmi 437aa0abec Big code cleaning. 2022-08-23 22:03:33 +02:00
aminecmi 216c639a23 Closes #23 2022-08-23 20:47:07 +02:00
aminecmi 7258452625 Closes #23 2022-08-23 20:38:53 +02:00
aminecmi d0d82751e2 Filtering DB items. 2022-08-23 20:34:20 +02:00
aminecmi 3b8f4991e9 Inserting items in the DB. 2022-08-23 16:56:04 +02:00
aminecmi 2547ce824a Repository should be DB ok. 2022-08-23 16:19:24 +02:00
aminecmi 59eb399cfa File renaming. 2022-08-23 15:17:47 +02:00
aminecmi 495b101355 Replacing room with sqldelight. Big cleaning. 2022-08-23 15:12:01 +02:00
aminecmi afcc55e907 Urls. 2022-08-22 22:07:52 +02:00
aminecmi 0c570efc47 Urls. 2022-08-22 22:04:07 +02:00
aminecmi a23a4cea0e Translation. 2022-08-22 21:58:15 +02:00
aminecmi 78cb5d047f Translations. 2022-08-22 21:53:31 +02:00
Amine Louveau a9caaefb4d Merge pull request 'network' (#28) from davidoskky/ReaderForSelfoss-multiplatform:network into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/28
2022-08-22 19:01:15 +00:00
davidoskky 4c78b22614 Use the connectivity-status library from the repository rather than the local copy 2022-08-22 19:33:58 +02:00
davidoskky 1d5ab3205e Localize strings 2022-08-21 23:34:47 +02:00
davidoskky df4903cae5 Include the connectivity status library as a aar file 2022-08-21 23:34:47 +02:00
davidoskky 2a78be69b5 Send toast messages at the application level and not on a per activity basis 2022-08-21 23:34:45 +02:00
davidoskky 8c69bb8c3c Send a message regarding connectivity loss/retrieval on all activities 2022-08-21 23:34:17 +02:00
davidoskky 9203012a97 Include a local copy of the connectivity-status library to solve a bug 2022-08-21 23:34:17 +02:00
davidoskky 2a44162c5a Send toast messages to the home activity on connectivity changes 2022-08-21 23:34:17 +02:00
davidoskky 20588aab81 Add comment to remember the problem with the connectivity-status library 2022-08-21 23:34:17 +02:00
davidoskky 0c8e49214f Don't reset offline override before updating remote 2022-08-21 23:34:17 +02:00
davidoskky 97d5063339 Consider offline override before updating remote 2022-08-21 23:34:17 +02:00
davidoskky 7c37b183d7 Refactor functions 2022-08-21 23:34:17 +02:00
davidoskky 82c4a5a1f9 Don't send toast messages from the repository 2022-08-21 23:34:17 +02:00
davidoskky 47b7062e16 Remove unused function 2022-08-21 23:34:17 +02:00
davidoskky b9497ca939 Prepare the repository functions for DB implementation 2022-08-21 23:34:17 +02:00
davidoskky 1258ed3ad3 Don't create the mercury api if not connection is available 2022-08-21 23:34:17 +02:00
davidoskky d838f509d4 Stop monitoring the network when the app goes in background 2022-08-21 23:34:17 +02:00
davidoskky 3c5b606a02 Do not change the network override from within the repository 2022-08-21 23:34:17 +02:00
davidoskky d1481a1db6 Reintroduce network checks where required 2022-08-21 23:34:17 +02:00
davidoskky d654b1b0bd Refactor connectivity check 2022-08-21 23:34:17 +02:00
davidoskky f56861a3c2 Show a message when the network connection is lost 2022-08-21 23:34:17 +02:00
davidoskky 492e7e4aed Update todo comments 2022-08-21 23:34:17 +02:00
davidoskky 551a3e3caa Remove all connectivity checks outside the repository 2022-08-21 23:34:17 +02:00
davidoskky c224b8a0b3 Remove network checks from the home activity 2022-08-21 23:34:17 +02:00
davidoskky 13ea7a693b Do not fake offline mode when updating remote 2022-08-21 23:34:17 +02:00
davidoskky 0f3c48dd8e Handle the offline override in the repository 2022-08-21 23:34:17 +02:00
davidoskky d4c2373bac Simplify network connectivity status check 2022-08-21 23:34:17 +02:00
davidoskky 4f32097821 Perform network connectivity checks in the repository 2022-08-21 23:34:17 +02:00
davidoskky 37fa4a1a8e Add multiplatform connectivity check 2022-08-21 23:34:17 +02:00
Amine Louveau 112194dd4f Merge pull request 'Implement logging in the android application' (#32) from davidoskky/ReaderForSelfoss-multiplatform:logging into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/32
2022-08-20 18:18:48 +00:00
davidoskky 72d9ef92d2 Implement logging in the android application 2022-08-20 12:29:04 +02:00
Amine Louveau 1392e2a571 Merge pull request 'Fixing some sonarqube issues.' (#30) from chore/sonarqube-fixes into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/30
2022-08-17 19:10:47 +00:00
aminecmi e9cb3d2f37 Fixing some sonarqube issues. 2022-08-17 21:00:58 +02:00
Amine Louveau dec620a409 Merge pull request 'Changed ids to items.' (#29) from id-to-int into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/29
2022-08-17 14:31:11 +00:00
aminecmi 4d29ee0b92 Last fixes. 2022-08-17 16:16:11 +02:00
aminecmi 33333ca998 This may work. 2022-08-17 14:52:03 +02:00
aminecmi 8d87eef0fc More fixes. 2022-08-17 14:24:28 +02:00
aminecmi 5a26513ed7 These params need to be here too. 2022-08-17 14:06:56 +02:00
aminecmi 5b7f5225d8 Can't be detached because of a lock file. 2022-08-17 14:03:32 +02:00
aminecmi 03f53bf9c9 Detached scan 2022-08-17 11:04:44 +02:00
aminecmi e06e6d580d Detached scan. 2022-08-17 11:00:02 +02:00
aminecmi 63e8649512 Fixing issues with build. 2022-08-17 10:50:04 +02:00
aminecmi 6260c3fc06 Fixes and drone build should work. 2022-08-17 10:43:56 +02:00
Amine Louveau 77917dd940 Merge pull request 'drone' (#26) from drone into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/26
2022-08-16 19:10:52 +00:00
127 changed files with 2217 additions and 4149 deletions
+105 -8
View File
@@ -1,20 +1,117 @@
kind: pipeline
type: docker
name: test
steps:
- name: build
image: mingc/android-build-box:latest
commands:
- ./gradlew build
- name: code-analysis
- name: AnylyseBuildTest
image: mingc/android-build-box:latest
failure: ignore
commands:
- ls -la
- ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.sources=. -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN
- echo "---------------------------------------------------------"
- echo "Analysing..."
- ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\""
- echo "---------------------------------------------------------"
- echo "Building..."
- ./gradlew :androidApp:build -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false
- echo "---------------------------------------------------------"
- echo "Testing..."
- echo "---------------------------------------------------------"
environment:
SONAR_HOST_URL:
from_secret: sonarScannerHostUrl
SONAR_LOGIN:
from_secret: sonarScannerLogin
trigger:
event:
- push
- pull_request
---
kind: pipeline
type: docker
name: Publish
steps:
- name: createTag
image: ubuntu:latest
commands:
- apt-get update && apt-get install -y git
- ./build.sh --publish --from-ci
- git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
- git push pushing --tags
environment:
GITEA_USR:
from_secret: giteaUsr
GITEA_PASS:
from_secret: giteaPass
- name: scpFiles
image: appleboy/drone-scp
settings:
host: amine-louveau.fr
username: ubuntu
key:
from_secret: privateKey
port: 22
target: /home/ubuntu/
source: version.txt
- name: deploy
image: appleboy/drone-ssh
settings:
host: amine-louveau.fr
user: ubuntu
key:
from_secret: privateKey
command_timeout: 2m
script:
- cd /home/ubuntu
- sudo rm -rf /var/www/amine/version.txt
- sudo chown www-data:www-data ./version.txt
- sudo mv version.txt /var/www/amine/
trigger:
event:
- promote
target:
- production
---
kind: pipeline
type: docker
name: Release
steps:
- name: build
image: mingc/android-build-box:latest
commands:
- echo "Generate APK"
- ./gradlew :androidApp:assembleGithubConfigRelease -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false
- echo "---------------------------------------------------------"
- echo "Get Key"
- wget https://amine-louveau.fr/key
- echo "---------------------------------------------------------"
- echo "Zipalign"
- $ANDROID_HOME/build-tools/31.0.0/zipalign -f -v 4 androidApp/build/outputs/apk/githubConfig/release/androidApp-githubConfig-release-unsigned.apk androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
- echo "---------------------------------------------------------"
- echo "Sign"
- $ANDROID_HOME/build-tools/31.0.0/apksigner sign -v --out signed.apk --ks ./key --ks-key-alias $YOUR_KEY_ALIAS --ks-pass pass:$YOUR_KEYSTORE_PASSWORD --v1-signing-enabled true --v2-signing-enabled true androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
- echo "---------------------------------------------------------"
- echo "Verify"
- $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
environment:
YOUR_KEYSTORE_PASSWORD:
from_secret: keyPass
YOUR_KEY_ALIAS:
from_secret: keyAlias
- name: gitea_release
image: plugins/gitea-release
settings:
api_key:
from_secret: giteaAPI
base_url: https://gitea.amine-louveau.fr
files: signed.apk
trigger:
event:
- tag
+2 -2
View File
@@ -10,7 +10,7 @@ Please read the guidelines before contributing, and follow them (or try to) when
There are many ways to contribute to this project, you could [translate the app](https://crowdin.com/project/readerforselfoss), report bugs, request missing features, suggest enhancements and changes to existing ones. You also can improve the README with useful tips that could help the other users.
You can fork the repository, and [help me solve some issues](https://github.com/aminecmi/ReaderforSelfoss/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://github.com/aminecmi/ReaderforSelfoss/issues)
You can fork the repository, and [help me solve some issues](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
### What I can't help you with.
@@ -28,7 +28,7 @@ Always check if the web version of your instance is working.
### Pull requests
* Don't create a PR for translations. See [here](https://github.com/aminecmi/ReaderforSelfoss/pull/170#issuecomment-355715654) for an explanation why.
* Don't create a PR for translations.
* Please ask before starting to work on an issue. I may be working on it, or someone else could be doing so.
* Each pull request should implement **ONE** feature or bugfix. Keep in mind that you can submit as many PR as you want.
* Your code must be simple and clear enough to avoid using comments to explain what it does.
Internal Server Error - Amine's git
500 Internal Server Error

Gitea Version: 1.28.0+dev-215-g805697089e