Compare commits
	
		
			14 Commits
		
	
	
		
			29d33687b4
			...
			v124010032
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 750c7758bd | ||
|  | 22f8b14ecd | ||
|  | 6e27d6d4e6 | ||
|  | 14ff4dbd05 | ||
|  | 390c2d0cf3 | ||
|  | e58914ef58 | ||
|  | a03f08fca1 | ||
|  | 8e9b87f00c | ||
|  | f765224a86 | ||
|  | 14d2219eb8 | ||
|  | 137580ccf9 | ||
|  | f101d22f54 | ||
|  | 68aedb7641 | ||
|  | 754d526b49 | 
							
								
								
									
										30
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								.drone.yml
									
									
									
									
									
								
							| @@ -13,10 +13,10 @@ steps: | ||||
|       - curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.1/detekt-cli-1.23.1.zip && unzip detekt-cli-1.23.1.zip | ||||
|       - echo "---------------------------------------------------------" | ||||
|       - echo "Linting..." | ||||
|       - ktlint || true | ||||
|       - ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build' || true | ||||
|       - echo "---------------------------------------------------------" | ||||
|       - echo "Detecting..." | ||||
|       - ./detekt-cli-1.23.1/bin/detekt-cli --all-rules || true | ||||
|       - ./detekt-cli-1.23.1/bin/detekt-cli --all-rules --excludes '**/shared/build/**/*.kt' || true | ||||
|       - echo "---------------------------------------------------------" | ||||
|     command_timeout: 1m | ||||
|   - name: BuildAndTest | ||||
| @@ -53,25 +53,29 @@ steps: | ||||
|       - git fetch --tags -p | ||||
|       - PREV=$(git describe --tags --abbrev=0) | ||||
|       - ./build.sh --publish --from-ci | ||||
|       - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git | ||||
|       - VER=$(git describe --tags --abbrev=0) | ||||
|       - CHANGELOG=$(git log $PREV..HEAD --pretty="- %s") | ||||
|       - echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md | ||||
|       - git add CHANGELOG.md | ||||
|       - git commit -m "Changelog for $VER [CI SKIP]" | ||||
|       - git push pushing master | ||||
|       - git push pushing --tags | ||||
|     environment: | ||||
|       TZ: Europe/Paris | ||||
|       GITEA_USR: | ||||
|         from_secret: giteaUsr | ||||
|       GITEA_PASS: | ||||
|         from_secret: giteaPass | ||||
|  | ||||
|   - name: git-push | ||||
|     image: appleboy/drone-git-push | ||||
|     settings: | ||||
|       branch: master | ||||
|       remote: | ||||
|         from_secret: remoteUrl | ||||
|       followtags: true | ||||
|       ssh_key: | ||||
|         from_secret: privateKey | ||||
|       skip_verify: true | ||||
|  | ||||
|   - name: scpFiles | ||||
|     image: appleboy/drone-scp | ||||
|     settings: | ||||
|       host: amine-louveau.fr | ||||
|       host: amine-bouabdallaoui.fr | ||||
|       username: ubuntu | ||||
|       key: | ||||
|         from_secret: privateKey | ||||
| @@ -82,7 +86,7 @@ steps: | ||||
|   - name: deploy | ||||
|     image: appleboy/drone-ssh | ||||
|     settings: | ||||
|       host: amine-louveau.fr | ||||
|       host: amine-bouabdallaoui.fr | ||||
|       user: ubuntu | ||||
|       key: | ||||
|         from_secret: privateKey | ||||
| @@ -116,7 +120,7 @@ steps: | ||||
|       - ./gradlew :androidApp:assembleGithubConfigRelease | ||||
|       - echo "---------------------------------------------------------" | ||||
|       - echo "Get Key" | ||||
|       - wget https://amine-louveau.fr/key | ||||
|       - wget https://amine-bouabdallaoui.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 | ||||
| @@ -138,7 +142,7 @@ steps: | ||||
|     settings: | ||||
|       api_key: | ||||
|         from_secret: giteaAPI | ||||
|       base_url: https://gitea.amine-louveau.fr | ||||
|       base_url: https://gitea.amine-bouabdallaoui.fr | ||||
|       files: signed.apk | ||||
|  | ||||
|   - name: notify | ||||
|   | ||||
							
								
								
									
										2
									
								
								.github/CONTRIBUTING.md
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/CONTRIBUTING.md
									
									
									
									
										vendored
									
									
								
							| @@ -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://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) | ||||
| You can fork the repository, and [help me solve some issues](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues) | ||||
|  | ||||
| ### What I can't help you with. | ||||
|  | ||||
|   | ||||
							
								
								
									
										38
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										38
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,3 +1,41 @@ | ||||
| **v124010031** | ||||
|  | ||||
| - fix: Checking if selfoss instance. | ||||
| - fix: handle three characters lenght hexcode colors. | ||||
| - Changelog for v123113311 [CI SKIP] | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v123113311** | ||||
|  | ||||
| - chore: Source tracker url in the menu. | ||||
| - fix: Handle kodein proguard rules. | ||||
| - Changelog for v123102961 [CI SKIP] | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v123102961** | ||||
|  | ||||
| - chore: domain changes. | ||||
| - Changelog for v123102852 [CI SKIP] | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v123102852** | ||||
|  | ||||
| - chore: lint cleaning. | ||||
| - Changelog for v123102841 [CI SKIP] | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v123102841** | ||||
|  | ||||
| - chore: cleaning ci steps and upgrading dependencies. | ||||
| - feat: Self signed ssl support. | ||||
| - Changelog for v123061811 [CI SKIP] | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v123061811** | ||||
|  | ||||
| - feat: Added confirmation dialog for disconnect item menu. | ||||
|   | ||||
							
								
								
									
										12
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								README.md
									
									
									
									
									
								
							| @@ -1,4 +1,4 @@ | ||||
| # ReaderForSelfoss-multiplatform [](https://build.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform) | ||||
| # ReaderForSelfoss-multiplatform [](https://build.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform) | ||||
|  | ||||
| [](https://crowdin.com/project/readerforselfoss) | ||||
|  | ||||
| @@ -22,15 +22,15 @@ If you are a user, you can still create new issues. I'll fix them when I can. | ||||
|  | ||||
| 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://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md). | ||||
| 2. Check the [Contribution guide](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md). | ||||
|  | ||||
| 3. Build the project by following [these steps](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide) | ||||
| 3. Build the project by following [these steps](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide) | ||||
|  | ||||
| ## Useful links | ||||
|  | ||||
| - [Check what changed](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md) | ||||
| - [See what I'm doing](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1) | ||||
| - [Create an issue, or request a new feature](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/issues) | ||||
| - [Check what changed](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md) | ||||
| - [See what I'm doing](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1) | ||||
| - [Create an issue, or request a new feature](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/issues) | ||||
| - [Help translation the app](https://crowdin.com/project/readerforselfoss) | ||||
|  | ||||
| ## Contributors (V1) (Alphabetical order) ❤️ | ||||
|   | ||||
							
								
								
									
										9
									
								
								androidApp/proguard-rules.pro
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								androidApp/proguard-rules.pro
									
									
									
									
										vendored
									
									
								
							| @@ -86,3 +86,12 @@ | ||||
|  | ||||
| -dontwarn io.mockk.** | ||||
| -keep class io.mockk.** { *; } | ||||
|  | ||||
|  | ||||
|  | ||||
| # Kodein | ||||
| -keep, allowobfuscation, allowoptimization class org.kodein.type.TypeReference | ||||
| -keep, allowobfuscation, allowoptimization class org.kodein.type.JVMAbstractTypeToken$Companion$WrappingTest | ||||
|  | ||||
| -keep, allowobfuscation, allowoptimization class * extends org.kodein.type.TypeReference | ||||
| -keep, allowobfuscation, allowoptimization class * extends org.kodein.type.JVMAbstractTypeToken$Companion$WrappingTest | ||||
| @@ -1,6 +1,7 @@ | ||||
| package bou.amine.apps.readerforselfossv2.android | ||||
|  | ||||
| import android.content.Intent | ||||
| import android.net.Uri | ||||
| import android.os.Bundle | ||||
| import android.view.Menu | ||||
| import android.view.MenuItem | ||||
| @@ -43,9 +44,7 @@ import org.kodein.di.instance | ||||
| import java.security.MessageDigest | ||||
| import java.util.concurrent.TimeUnit | ||||
|  | ||||
|  | ||||
| class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAware { | ||||
|  | ||||
|     private var items: ArrayList<SelfossModel.Item> = ArrayList() | ||||
|  | ||||
|     private var elementsShown: ItemType = ItemType.UNREAD | ||||
| @@ -63,7 +62,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|  | ||||
|     private var fromTabShortcut: Boolean = false | ||||
|  | ||||
|     private val settingsLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { | ||||
|     private val settingsLauncher = | ||||
|         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { | ||||
|             appSettingsService.refreshUserSettings() | ||||
|         } | ||||
|  | ||||
| @@ -71,7 +71,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|     private val repository: Repository by instance() | ||||
|     private val appSettingsService: AppSettingsService by instance() | ||||
|  | ||||
|  | ||||
|     override fun onCreate(savedInstanceState: Bundle?) { | ||||
|         super.onCreate(savedInstanceState) | ||||
|         binding = ActivityHomeBinding.inflate(layoutInflater) | ||||
| @@ -92,7 +91,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|  | ||||
|         handleSwipeRefreshLayout() | ||||
|  | ||||
|  | ||||
|         if (appSettingsService.isItemCachingEnabled()) { | ||||
|             CoroutineScope(Dispatchers.Main).launch { | ||||
|                 repository.tryToCacheItemsAndGetNewOnes() | ||||
| @@ -104,7 +102,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|         binding.swipeRefreshLayout.setColorSchemeResources( | ||||
|             R.color.refresh_progress_1, | ||||
|             R.color.refresh_progress_2, | ||||
|             R.color.refresh_progress_3 | ||||
|             R.color.refresh_progress_3, | ||||
|         ) | ||||
|         binding.swipeRefreshLayout.setOnRefreshListener { | ||||
|             repository.offlineOverride = false | ||||
| @@ -115,7 +113,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         val swipeDirs = if (appSettingsService.getPublicAccess()) { | ||||
|         val swipeDirs = | ||||
|             if (appSettingsService.getPublicAccess()) { | ||||
|                 0 | ||||
|             } else { | ||||
|                 ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT | ||||
| @@ -124,28 +123,31 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|         val simpleItemTouchCallback = | ||||
|             object : ItemTouchHelper.SimpleCallback( | ||||
|                 0, | ||||
|                 swipeDirs | ||||
|                 swipeDirs, | ||||
|             ) { | ||||
|                 override fun getSwipeDirs( | ||||
|                     recyclerView: RecyclerView, | ||||
|                     viewHolder: RecyclerView.ViewHolder | ||||
|                     viewHolder: RecyclerView.ViewHolder, | ||||
|                 ): Int = | ||||
|                     if (elementsShown == ItemType.STARRED) { | ||||
|                         0 | ||||
|                     } else { | ||||
|                         super.getSwipeDirs( | ||||
|                             recyclerView, | ||||
|                             viewHolder | ||||
|                             viewHolder, | ||||
|                         ) | ||||
|                     } | ||||
|  | ||||
|                 override fun onMove( | ||||
|                     recyclerView: RecyclerView, | ||||
|                     viewHolder: RecyclerView.ViewHolder, | ||||
|                     target: RecyclerView.ViewHolder | ||||
|                     target: RecyclerView.ViewHolder, | ||||
|                 ): Boolean = false | ||||
|  | ||||
|                 override fun onSwiped(viewHolder: RecyclerView.ViewHolder, swipeDir: Int) { | ||||
|                 override fun onSwiped( | ||||
|                     viewHolder: RecyclerView.ViewHolder, | ||||
|                     swipeDir: Int, | ||||
|                 ) { | ||||
|                     val position = viewHolder.bindingAdapterPosition | ||||
|                     val i = items.elementAtOrNull(position) | ||||
|  | ||||
| @@ -162,7 +164,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|                         Toast.makeText( | ||||
|                             this@HomeActivity, | ||||
|                             "Found null when swiping at positon $position.", | ||||
|                             Toast.LENGTH_LONG | ||||
|                             Toast.LENGTH_LONG, | ||||
|                         ).show() | ||||
|                     } | ||||
|                 } | ||||
| @@ -171,7 +173,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|         ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(binding.recyclerView) | ||||
|     } | ||||
|  | ||||
|     private fun updateBottomBarBadgeCount(badge: TextBadgeItem, count: Int) { | ||||
|     private fun updateBottomBarBadgeCount( | ||||
|         badge: TextBadgeItem, | ||||
|         count: Int, | ||||
|     ) { | ||||
|         if (count > 0) { | ||||
|             badge | ||||
|                 .setText(count.toString()) | ||||
| @@ -182,14 +187,16 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|     } | ||||
|  | ||||
|     private fun handleBottomBar() { | ||||
|  | ||||
|         tabNewBadge = TextBadgeItem() | ||||
|         tabNewBadge = | ||||
|             TextBadgeItem() | ||||
|                 .setText("") | ||||
|                 .setHideOnSelect(false).hide(false) | ||||
|         tabArchiveBadge = TextBadgeItem() | ||||
|         tabArchiveBadge = | ||||
|             TextBadgeItem() | ||||
|                 .setText("") | ||||
|                 .setHideOnSelect(false).hide(false) | ||||
|         tabStarredBadge = TextBadgeItem() | ||||
|         tabStarredBadge = | ||||
|             TextBadgeItem() | ||||
|                 .setText("") | ||||
|                 .setHideOnSelect(false).hide(false) | ||||
|  | ||||
| @@ -218,19 +225,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|         val tabNew = | ||||
|             BottomNavigationItem( | ||||
|                 R.drawable.ic_tab_fiber_new_black_24dp, | ||||
|                 getString(R.string.tab_new) | ||||
|                 getString(R.string.tab_new), | ||||
|             ) | ||||
|                 .setBadgeItem(tabNewBadge) | ||||
|         val tabArchive = | ||||
|             BottomNavigationItem( | ||||
|                 R.drawable.ic_tab_archive_black_24dp, | ||||
|                 getString(R.string.tab_read) | ||||
|                 getString(R.string.tab_read), | ||||
|             ) | ||||
|                 .setBadgeItem(tabArchiveBadge) | ||||
|         val tabStarred = | ||||
|             BottomNavigationItem( | ||||
|                 R.drawable.ic_tab_favorite_black_24dp, | ||||
|                 getString(R.string.tab_favs) | ||||
|                 getString(R.string.tab_favs), | ||||
|             ).setActiveColorResource(R.color.pink) | ||||
|                 .setBadgeItem(tabStarredBadge) | ||||
|  | ||||
| @@ -271,7 +278,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|         getElementsAccordingToTab() | ||||
|     } | ||||
|  | ||||
|  | ||||
|     private fun handleGDPRDialog(GDPRShown: Boolean) { | ||||
|         val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256") | ||||
|         messageDigest.update(appSettingsService.getBaseUrl().toByteArray()) | ||||
| @@ -281,7 +287,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|             alertDialog.setMessage(getString(R.string.gdpr_dialog_message)) | ||||
|             alertDialog.setButton( | ||||
|                 AlertDialog.BUTTON_NEUTRAL, | ||||
|                 "OK" | ||||
|                 "OK", | ||||
|             ) { dialog, _ -> | ||||
|                 appSettingsService.settings.putBoolean("GDPR_shown", true) | ||||
|                 dialog.dismiss() | ||||
| @@ -298,17 +304,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|         when (currentManager) { | ||||
|             is StaggeredGridLayoutManager -> | ||||
|                 if (!appSettingsService.isCardViewEnabled()) { | ||||
|                     layoutManager = GridLayoutManager( | ||||
|                     layoutManager = | ||||
|                         GridLayoutManager( | ||||
|                             this, | ||||
|                         calculateNoOfColumns() | ||||
|                             calculateNoOfColumns(), | ||||
|                         ) | ||||
|                     binding.recyclerView.layoutManager = layoutManager | ||||
|                 } | ||||
|             is GridLayoutManager -> | ||||
|                 if (appSettingsService.isCardViewEnabled()) { | ||||
|                     layoutManager = StaggeredGridLayoutManager( | ||||
|                     layoutManager = | ||||
|                         StaggeredGridLayoutManager( | ||||
|                             calculateNoOfColumns(), | ||||
|                         StaggeredGridLayoutManager.VERTICAL | ||||
|                             StaggeredGridLayoutManager.VERTICAL, | ||||
|                         ) | ||||
|                     layoutManager.gapStrategy = | ||||
|                         StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS | ||||
| @@ -317,15 +325,17 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|             else -> | ||||
|                 if (currentManager == null) { | ||||
|                     if (!appSettingsService.isCardViewEnabled()) { | ||||
|                         layoutManager = GridLayoutManager( | ||||
|                         layoutManager = | ||||
|                             GridLayoutManager( | ||||
|                                 this, | ||||
|                             calculateNoOfColumns() | ||||
|                                 calculateNoOfColumns(), | ||||
|                             ) | ||||
|                         binding.recyclerView.layoutManager = layoutManager | ||||
|                     } else { | ||||
|                         layoutManager = StaggeredGridLayoutManager( | ||||
|                         layoutManager = | ||||
|                             StaggeredGridLayoutManager( | ||||
|                                 calculateNoOfColumns(), | ||||
|                             StaggeredGridLayoutManager.VERTICAL | ||||
|                                 StaggeredGridLayoutManager.VERTICAL, | ||||
|                             ) | ||||
|                         layoutManager.gapStrategy = | ||||
|                             StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS | ||||
| @@ -336,11 +346,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|     } | ||||
|  | ||||
|     private fun handleBottomBarActions() { | ||||
|         binding.bottomBar.setTabSelectedListener(object : BottomNavigationBar.OnTabSelectedListener { | ||||
|         binding.bottomBar.setTabSelectedListener( | ||||
|             object : BottomNavigationBar.OnTabSelectedListener { | ||||
|                 override fun onTabUnselected(position: Int) = Unit | ||||
|  | ||||
|                 override fun onTabReselected(position: Int) { | ||||
|  | ||||
|                     when (val layoutManager = binding.recyclerView.adapter) { | ||||
|                         is StaggeredGridLayoutManager -> | ||||
|                             if (layoutManager.findFirstCompletelyVisibleItemPositions(null)[0] == 0) { | ||||
| @@ -368,7 +378,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|  | ||||
|                     fetchOnEmptyList() | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|     } | ||||
|  | ||||
|     fun fetchOnEmptyList() { | ||||
| @@ -378,8 +389,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|     } | ||||
|  | ||||
|     private fun handleInfiniteScroll() { | ||||
|         recyclerViewScrollListener = object : RecyclerView.OnScrollListener() { | ||||
|             override fun onScrolled(localRecycler: RecyclerView, dx: Int, dy: Int) { | ||||
|         recyclerViewScrollListener = | ||||
|             object : RecyclerView.OnScrollListener() { | ||||
|                 override fun onScrolled( | ||||
|                     localRecycler: RecyclerView, | ||||
|                     dx: Int, | ||||
|                     dy: Int, | ||||
|                 ) { | ||||
|                     if (dy > 0) { | ||||
|                         val lastVisibleItem = getLastVisibleItem() | ||||
|  | ||||
| @@ -396,8 +412,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|  | ||||
|     private fun getLastVisibleItem(): Int { | ||||
|         return when (val manager = binding.recyclerView.layoutManager) { | ||||
|             is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions( | ||||
|                 null | ||||
|             is StaggeredGridLayoutManager -> | ||||
|                 manager.findLastCompletelyVisibleItemPositions( | ||||
|                     null, | ||||
|                 ).last() | ||||
|             is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition() | ||||
|             else -> 0 | ||||
| @@ -411,10 +428,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|             binding.emptyText.visibility = View.GONE | ||||
|         } | ||||
|  | ||||
|     fun getElementsAccordingToTab( | ||||
|         appendResults: Boolean = false | ||||
|     ) { | ||||
|         offset = if (appendResults && items.size > 0) { | ||||
|     fun getElementsAccordingToTab(appendResults: Boolean = false) { | ||||
|         offset = | ||||
|             if (appendResults && items.size > 0) { | ||||
|                 items.size - 1 | ||||
|             } else { | ||||
|                 0 | ||||
| @@ -424,11 +440,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|         getItems(appendResults, elementsShown) | ||||
|     } | ||||
|  | ||||
|     private fun getItems(appendResults: Boolean, itemType: ItemType) { | ||||
|     private fun getItems( | ||||
|         appendResults: Boolean, | ||||
|         itemType: ItemType, | ||||
|     ) { | ||||
|         CoroutineScope(Dispatchers.Main).launch { | ||||
|             binding.swipeRefreshLayout.isRefreshing = true | ||||
|             repository.displayedItems = itemType | ||||
|             items = if (appendResults) { | ||||
|             items = | ||||
|                 if (appendResults) { | ||||
|                     repository.getOlderItems() | ||||
|                 } else { | ||||
|                     repository.getNewerItems() | ||||
| @@ -441,7 +461,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|     private fun handleListResult(appendResults: Boolean = false) { | ||||
|         if (appendResults) { | ||||
|             val oldManager = binding.recyclerView.layoutManager | ||||
|             firstVisible = when (oldManager) { | ||||
|             firstVisible = | ||||
|                 when (oldManager) { | ||||
|                     is StaggeredGridLayoutManager -> | ||||
|                         oldManager.findFirstCompletelyVisibleItemPositions(null).last() | ||||
|                     is GridLayoutManager -> | ||||
| @@ -471,8 +492,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|                 binding.recyclerView.addItemDecoration( | ||||
|                     DividerItemDecoration( | ||||
|                         this@HomeActivity, | ||||
|                         DividerItemDecoration.VERTICAL | ||||
|                     ) | ||||
|                         DividerItemDecoration.VERTICAL, | ||||
|                     ), | ||||
|                 ) | ||||
|             } | ||||
|             binding.recyclerView.adapter = recyclerAdapter | ||||
| @@ -529,7 +550,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|         return true | ||||
|     } | ||||
|  | ||||
|     private fun needsConfirmation(titleRes: Int, messageRes: Int, doFn: () -> Unit) { | ||||
|     private fun needsConfirmation( | ||||
|         titleRes: Int, | ||||
|         messageRes: Int, | ||||
|         doFn: () -> Unit, | ||||
|     ) { | ||||
|         AlertDialog.Builder(this@HomeActivity) | ||||
|             .setMessage(messageRes) | ||||
|             .setTitle(titleRes) | ||||
| @@ -541,6 +566,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|  | ||||
|     override fun onOptionsItemSelected(item: MenuItem): Boolean { | ||||
|         when (item.itemId) { | ||||
|             R.id.issue_tracker -> { | ||||
|                 val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl)) | ||||
|                 startActivity(browserIntent) | ||||
|                 return true | ||||
|             } | ||||
|             R.id.action_filter -> { | ||||
|                 val filterSheetFragment = FilterSheetFragment() | ||||
|                 filterSheetFragment.show(supportFragmentManager, FilterSheetFragment.TAG) | ||||
| @@ -554,14 +584,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|                         if (updatedRemote) { | ||||
|                             Toast.makeText( | ||||
|                                 this@HomeActivity, | ||||
|                                 R.string.refresh_success_response, Toast.LENGTH_LONG | ||||
|                                 R.string.refresh_success_response, | ||||
|                                 Toast.LENGTH_LONG, | ||||
|                             ) | ||||
|                                 .show() | ||||
|                         } else { | ||||
|                             Toast.makeText( | ||||
|                                 this@HomeActivity, | ||||
|                                 R.string.refresh_failer_message, | ||||
|                                 Toast.LENGTH_SHORT | ||||
|                                 Toast.LENGTH_SHORT, | ||||
|                             ).show() | ||||
|                         } | ||||
|                     } | ||||
| @@ -579,7 +610,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|                                 Toast.makeText( | ||||
|                                     this@HomeActivity, | ||||
|                                     R.string.all_posts_read, | ||||
|                                     Toast.LENGTH_SHORT | ||||
|                                     Toast.LENGTH_SHORT, | ||||
|                                 ).show() | ||||
|                                 tabNewBadge.removeBadge() | ||||
|  | ||||
| @@ -588,7 +619,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|                                 Toast.makeText( | ||||
|                                     this@HomeActivity, | ||||
|                                     R.string.all_posts_not_read, | ||||
|                                     Toast.LENGTH_SHORT | ||||
|                                     Toast.LENGTH_SHORT, | ||||
|                                 ).show() | ||||
|                             } | ||||
|                             handleListResult() | ||||
| @@ -635,7 +666,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|  | ||||
|     private fun handleRecurringTask() { | ||||
|         if (appSettingsService.isPeriodicRefreshEnabled()) { | ||||
|             val myConstraints = Constraints.Builder() | ||||
|             val myConstraints = | ||||
|                 Constraints.Builder() | ||||
|                     .setRequiresBatteryNotLow(true) | ||||
|                     .setRequiresCharging(appSettingsService.isRefreshWhenChargingOnlyEnabled()) | ||||
|                     .setRequiresStorageNotLow(true) | ||||
| @@ -647,8 +679,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar | ||||
|                     .addTag("selfoss-loading") | ||||
|                     .build() | ||||
|  | ||||
|             WorkManager.getInstance(baseContext).enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork) | ||||
|             WorkManager.getInstance( | ||||
|                 baseContext, | ||||
|             ).enqueueUniquePeriodicWork("selfoss-loading", ExistingPeriodicWorkPolicy.KEEP, backgroundWork) | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -32,24 +32,41 @@ class ImageActivity : AppCompatActivity() { | ||||
|         binding.pager.adapter = ScreenSlidePagerAdapter(this) | ||||
|         binding.pager.setCurrentItem(position, false) | ||||
|  | ||||
|         val transitionListener = object : MotionLayout.TransitionListener { | ||||
|             override fun onTransitionStarted(motionLayout: MotionLayout?, startId: Int, endId: Int) { | ||||
|                 // Nothing | ||||
|             } | ||||
|  | ||||
|             override fun onTransitionChange(motionLayout: MotionLayout?, startId: Int, endId: Int, progress: Float | ||||
|         val transitionListener = | ||||
|             object : MotionLayout.TransitionListener { | ||||
|                 override fun onTransitionStarted( | ||||
|                     motionLayout: MotionLayout?, | ||||
|                     startId: Int, | ||||
|                     endId: Int, | ||||
|                 ) { | ||||
|                     // Nothing | ||||
|                 } | ||||
|  | ||||
|             override fun onTransitionCompleted(motionLayout: MotionLayout?, currentId: Int) { | ||||
|                 override fun onTransitionChange( | ||||
|                     motionLayout: MotionLayout?, | ||||
|                     startId: Int, | ||||
|                     endId: Int, | ||||
|                     progress: Float, | ||||
|                 ) { | ||||
|                     // Nothing | ||||
|                 } | ||||
|  | ||||
|                 override fun onTransitionCompleted( | ||||
|                     motionLayout: MotionLayout?, | ||||
|                     currentId: Int, | ||||
|                 ) { | ||||
|                     if (motionLayout?.currentState == binding.root.endState) { | ||||
|                         onBackPressedDispatcher.onBackPressed() | ||||
|                         overridePendingTransition(0, 0) | ||||
|                     } | ||||
|                 } | ||||
|  | ||||
|             override fun onTransitionTrigger(motionLayout: MotionLayout?, triggerId: Int, positive: Boolean, progress: Float) { | ||||
|                 override fun onTransitionTrigger( | ||||
|                     motionLayout: MotionLayout?, | ||||
|                     triggerId: Int, | ||||
|                     positive: Boolean, | ||||
|                     progress: Float, | ||||
|                 ) { | ||||
|                     // Nothing | ||||
|                 } | ||||
|             } | ||||
| @@ -68,7 +85,6 @@ class ImageActivity : AppCompatActivity() { | ||||
|     } | ||||
|  | ||||
|     private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) { | ||||
|  | ||||
|         override fun getItemCount(): Int = allImages.size | ||||
|  | ||||
|         override fun createFragment(position: Int): Fragment = ImageFragment.newInstance(allImages[position]) | ||||
|   | ||||
| @@ -4,6 +4,7 @@ import android.animation.Animator | ||||
| import android.animation.AnimatorListenerAdapter | ||||
| import android.annotation.SuppressLint | ||||
| import android.content.Intent | ||||
| import android.net.Uri | ||||
| import android.os.Bundle | ||||
| import android.text.TextUtils | ||||
| import android.view.Menu | ||||
| @@ -28,9 +29,7 @@ import org.kodein.di.DIAware | ||||
| import org.kodein.di.android.closestDI | ||||
| import org.kodein.di.instance | ||||
|  | ||||
|  | ||||
| class LoginActivity : AppCompatActivity(), DIAware { | ||||
|  | ||||
|     private var inValidCount: Int = 0 | ||||
|     private var isWithLogin = false | ||||
|  | ||||
| @@ -40,7 +39,6 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|     private val repository: Repository by instance() | ||||
|     private val appSettingsService: AppSettingsService by instance() | ||||
|  | ||||
|  | ||||
|     override fun onCreate(savedInstanceState: Bundle?) { | ||||
|         super.onCreate(savedInstanceState) | ||||
|  | ||||
| @@ -69,7 +67,6 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|     } | ||||
|  | ||||
|     private fun handleActions() { | ||||
|  | ||||
|         binding.passwordView.setOnEditorActionListener( | ||||
|             TextView.OnEditorActionListener { _, id, _ -> | ||||
|                 if (id == R.id.loginView || id == EditorInfo.IME_NULL) { | ||||
| @@ -77,7 +74,7 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|                     return@OnEditorActionListener true | ||||
|                 } | ||||
|                 false | ||||
|             } | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|         binding.signInButton.setOnClickListener { attemptLogin() } | ||||
| @@ -98,7 +95,7 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|             alertDialog.setMessage(getString(R.string.base_url_error)) | ||||
|             alertDialog.setButton( | ||||
|                 AlertDialog.BUTTON_NEUTRAL, | ||||
|                 "OK" | ||||
|                 "OK", | ||||
|             ) { dialog, _ -> dialog.dismiss() } | ||||
|             alertDialog.show() | ||||
|         } | ||||
| @@ -123,7 +120,6 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|     } | ||||
|  | ||||
|     private fun attemptLogin() { | ||||
|  | ||||
|         // Reset errors. | ||||
|         binding.urlView.error = null | ||||
|         binding.loginView.error = null | ||||
| @@ -144,20 +140,25 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|         repository.refreshLoginInformation(url, login, password) | ||||
|  | ||||
|         CoroutineScope(Dispatchers.Main).launch { | ||||
|             try { | ||||
|                 repository.updateApiInformation() | ||||
|             val result = repository.login() | ||||
|             if (result) { | ||||
|                 val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance() | ||||
|                 if (!errorFetching && !displaySelfossOnly) { | ||||
|                     goToMain() | ||||
|                 } else { | ||||
|                     if (displaySelfossOnly) { | ||||
|             } catch (e: Exception) { | ||||
|                 if (e.message?.startsWith("No transformation found") == true) { | ||||
|                     Toast.makeText( | ||||
|                         applicationContext, | ||||
|                         R.string.application_selfoss_only, | ||||
|                             Toast.LENGTH_LONG | ||||
|                         Toast.LENGTH_LONG, | ||||
|                     ).show() | ||||
|                     preferenceError() | ||||
|                     showProgress(false) | ||||
|                 } | ||||
|             } | ||||
|             val result = repository.login() | ||||
|             if (result) { | ||||
|                 val errorFetching = repository.checkIfFetchFails() | ||||
|                 if (!errorFetching) { | ||||
|                     goToMain() | ||||
|                 } else { | ||||
|                     preferenceError() | ||||
|                 } | ||||
|             } else { | ||||
| @@ -169,7 +170,7 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|  | ||||
|     private fun failLoginDetails( | ||||
|         password: String, | ||||
|         login: String | ||||
|         login: String, | ||||
|     ) { | ||||
|         var lastFocusedView: View? = null | ||||
|         var cancel = false | ||||
| @@ -202,7 +203,7 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|                 alertDialog.setMessage(getString(R.string.text_wrong_url)) | ||||
|                 alertDialog.setButton( | ||||
|                     AlertDialog.BUTTON_NEUTRAL, | ||||
|                     "OK" | ||||
|                     "OK", | ||||
|                 ) { dialog, _ -> dialog.dismiss() } | ||||
|                 alertDialog.show() | ||||
|                 inValidCount = 0 | ||||
| @@ -211,7 +212,10 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|         maybeCancelAndFocusView(cancel, focusView) | ||||
|     } | ||||
|  | ||||
|     private fun maybeCancelAndFocusView(cancel: Boolean, focusView: View?) { | ||||
|     private fun maybeCancelAndFocusView( | ||||
|         cancel: Boolean, | ||||
|         focusView: View?, | ||||
|     ) { | ||||
|         if (cancel) { | ||||
|             focusView?.requestFocus() | ||||
|         } | ||||
| @@ -225,12 +229,13 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|             .animate() | ||||
|             .setDuration(shortAnimTime.toLong()) | ||||
|             .alpha( | ||||
|                 if (show) 0F else 1F | ||||
|             ).setListener(object : AnimatorListenerAdapter() { | ||||
|                 if (show) 0F else 1F, | ||||
|             ).setListener( | ||||
|                 object : AnimatorListenerAdapter() { | ||||
|                     override fun onAnimationEnd(animation: Animator) { | ||||
|                         binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE | ||||
|                     } | ||||
|             } | ||||
|                 }, | ||||
|             ) | ||||
|  | ||||
|         binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE | ||||
| @@ -238,12 +243,13 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|             .animate() | ||||
|             .setDuration(shortAnimTime.toLong()) | ||||
|             .alpha( | ||||
|                 if (show) 1F else 0F | ||||
|             ).setListener(object : AnimatorListenerAdapter() { | ||||
|                 if (show) 1F else 0F, | ||||
|             ).setListener( | ||||
|                 object : AnimatorListenerAdapter() { | ||||
|                     override fun onAnimationEnd(animation: Animator) { | ||||
|                         binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE | ||||
|                     } | ||||
|             } | ||||
|                 }, | ||||
|             ) | ||||
|     } | ||||
|  | ||||
| @@ -254,10 +260,17 @@ class LoginActivity : AppCompatActivity(), DIAware { | ||||
|  | ||||
|     override fun onOptionsItemSelected(item: MenuItem): Boolean { | ||||
|         return when (item.itemId) { | ||||
|             R.id.issue_tracker -> { | ||||
|                 val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl)) | ||||
|                 startActivity(browserIntent) | ||||
|                 return true | ||||
|             } | ||||
|             R.id.about -> { | ||||
|                 LibsBuilder() | ||||
|                     .withAboutIconShown(true) | ||||
|                     .withAboutVersionShown(true) | ||||
|                     .withAboutSpecial2("Bug reports").withAboutSpecial2Description(AppSettingsService.trackerUrl) | ||||
|                     .withAboutSpecial1("Project Page").withAboutSpecial1Description(AppSettingsService.sourceUrl) | ||||
|                     .start(this) | ||||
|                 true | ||||
|             } | ||||
|   | ||||
| @@ -8,7 +8,6 @@ import bou.amine.apps.readerforselfossv2.android.databinding.ActivityMainBinding | ||||
| class MainActivity : AppCompatActivity() { | ||||
|     private lateinit var binding: ActivityMainBinding | ||||
|  | ||||
|  | ||||
|     override fun onCreate(savedInstanceState: Bundle?) { | ||||
|         super.onCreate(savedInstanceState) | ||||
|         binding = ActivityMainBinding.inflate(layoutInflater) | ||||
|   | ||||
| @@ -32,18 +32,18 @@ import org.acra.sender.HttpSender | ||||
| import org.kodein.di.* | ||||
|  | ||||
| class MyApp : MultiDexApplication(), DIAware { | ||||
|  | ||||
|     override val di by DI.lazy { | ||||
|         bind<AppSettingsService>() with singleton { AppSettingsService(ACRA.isACRASenderServiceProcess()) } | ||||
|         import(networkModule) | ||||
|         bind<DriverFactory>() with singleton { DriverFactory(applicationContext) } | ||||
|         bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) } | ||||
|         bind<Repository>() with singleton { | ||||
|         bind<Repository>() with | ||||
|             singleton { | ||||
|                 Repository( | ||||
|                     instance(), | ||||
|                     instance(), | ||||
|                     isConnectionAvailable, | ||||
|                 instance() | ||||
|                     instance(), | ||||
|                 ) | ||||
|             } | ||||
|         bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) } | ||||
| @@ -70,13 +70,14 @@ class MyApp : MultiDexApplication(), DIAware { | ||||
|             ProcessLifecycleOwner.get().lifecycle.addObserver( | ||||
|                 AppLifeCycleObserver( | ||||
|                     connectivityStatus, | ||||
|                     repository | ||||
|                 ) | ||||
|                     repository, | ||||
|                 ), | ||||
|             ) | ||||
|  | ||||
|             CoroutineScope(Dispatchers.Main).launch { | ||||
|                 viewModel.networkAvailableProvider.collect { networkAvailable -> | ||||
|                     val toastMessage = if (networkAvailable) { | ||||
|                     val toastMessage = | ||||
|                         if (networkAvailable) { | ||||
|                             repository.handleDBActions() | ||||
|                             R.string.network_connectivity_retrieved | ||||
|                         } else { | ||||
| @@ -86,7 +87,7 @@ class MyApp : MultiDexApplication(), DIAware { | ||||
|                     Toast.makeText( | ||||
|                         applicationContext, | ||||
|                         toastMessage, | ||||
|                         Toast.LENGTH_SHORT | ||||
|                         Toast.LENGTH_SHORT, | ||||
|                     ).show() | ||||
|                 } | ||||
|             } | ||||
| @@ -100,7 +101,8 @@ class MyApp : MultiDexApplication(), DIAware { | ||||
|  | ||||
|         initAcra { | ||||
|             reportFormat = StringFormat.JSON | ||||
|             reportContent = listOf( | ||||
|             reportContent = | ||||
|                 listOf( | ||||
|                     ReportField.REPORT_ID, | ||||
|                     ReportField.INSTALLATION_ID, | ||||
|                     ReportField.APP_VERSION_CODE, | ||||
| @@ -121,7 +123,7 @@ class MyApp : MultiDexApplication(), DIAware { | ||||
|                     ReportField.USER_COMMENT, | ||||
|                     ReportField.USER_CRASH_DATE, | ||||
|                     ReportField.USER_EMAIL, | ||||
|                 ReportField.CUSTOM_DATA | ||||
|                     ReportField.CUSTOM_DATA, | ||||
|                 ) | ||||
|             toast { | ||||
|                 // required | ||||
| @@ -130,7 +132,7 @@ class MyApp : MultiDexApplication(), DIAware { | ||||
|             } | ||||
|             httpSender { | ||||
|                 uri = | ||||
|                     "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/ | ||||
|                     "https://bugs.amine-bouabdallaoui.fr/report" // best guess, you may need to adjust this | ||||
|                 basicAuthLogin = "qMEscjj89Gwt6cPR" | ||||
|                 basicAuthPassword = "Yo58QFlGzFaWlBzP" | ||||
|                 httpMethod = HttpSender.Method.POST | ||||
| @@ -148,10 +150,11 @@ class MyApp : MultiDexApplication(), DIAware { | ||||
|  | ||||
|             val newItemsChannelname = getString(R.string.new_items_channel_sync) | ||||
|             val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT | ||||
|             val newItemsChannelmChannel = NotificationChannel( | ||||
|             val newItemsChannelmChannel = | ||||
|                 NotificationChannel( | ||||
|                     AppSettingsService.newItemsChannelId, | ||||
|                     newItemsChannelname, | ||||
|                 newItemsChannelimportance | ||||
|                     newItemsChannelimportance, | ||||
|                 ) | ||||
|  | ||||
|             notificationManager.createNotificationChannel(mChannel) | ||||
| @@ -163,9 +166,11 @@ class MyApp : MultiDexApplication(), DIAware { | ||||
|         val oldHandler = Thread.getDefaultUncaughtExceptionHandler() | ||||
|  | ||||
|         Thread.setDefaultUncaughtExceptionHandler { thread, e -> | ||||
|             if (e is NoClassDefFoundError && e.stackTrace.asList().any { | ||||
|             if (e is NoClassDefFoundError && | ||||
|                 e.stackTrace.asList().any { | ||||
|                     it.toString().contains("android.view.ViewDebug") | ||||
|                 }) { | ||||
|                 } | ||||
|             ) { | ||||
|                 // Nothing | ||||
|             } else { | ||||
|                 oldHandler.uncaughtException(thread, e) | ||||
| @@ -175,9 +180,8 @@ class MyApp : MultiDexApplication(), DIAware { | ||||
|  | ||||
|     class AppLifeCycleObserver( | ||||
|         val connectivityStatus: ConnectivityStatus, | ||||
|         val repository: Repository | ||||
|         val repository: Repository, | ||||
|     ) : DefaultLifecycleObserver { | ||||
|  | ||||
|         override fun onResume(owner: LifecycleOwner) { | ||||
|             super.onResume(owner) | ||||
|             repository.connectionMonitored = true | ||||
|   | ||||
| @@ -23,7 +23,6 @@ import org.kodein.di.android.closestDI | ||||
| import org.kodein.di.instance | ||||
|  | ||||
| class ReaderActivity : AppCompatActivity(), DIAware { | ||||
|  | ||||
|     private var currentItem: Int = 0 | ||||
|  | ||||
|     private lateinit var toolbarMenu: Menu | ||||
| @@ -102,15 +101,15 @@ class ReaderActivity : AppCompatActivity(), DIAware { | ||||
|  | ||||
|     private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : | ||||
|         FragmentStateAdapter(fa) { | ||||
|  | ||||
|         override fun getItemCount(): Int = allItems.size | ||||
|  | ||||
|         override fun createFragment(position: Int): Fragment = | ||||
|             ArticleFragment.newInstance(allItems[position]) | ||||
|  | ||||
|         override fun createFragment(position: Int): Fragment = ArticleFragment.newInstance(allItems[position]) | ||||
|     } | ||||
|  | ||||
|     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { | ||||
|     override fun onKeyDown( | ||||
|         keyCode: Int, | ||||
|         event: KeyEvent?, | ||||
|     ): Boolean { | ||||
|         return when (keyCode) { | ||||
|             KeyEvent.KEYCODE_VOLUME_DOWN -> { | ||||
|                 val currentFragment = | ||||
| @@ -152,10 +151,8 @@ class ReaderActivity : AppCompatActivity(), DIAware { | ||||
|                 canFavorite() | ||||
|             } | ||||
|  | ||||
|  | ||||
|             binding.pager.registerOnPageChangeCallback( | ||||
|                 object : ViewPager2.OnPageChangeCallback() { | ||||
|  | ||||
|                     override fun onPageSelected(position: Int) { | ||||
|                         super.onPageSelected(position) | ||||
|  | ||||
| @@ -166,7 +163,7 @@ class ReaderActivity : AppCompatActivity(), DIAware { | ||||
|                         } | ||||
|                         readItem(allItems[position]) | ||||
|                     } | ||||
|                 } | ||||
|                 }, | ||||
|             ) | ||||
|         } | ||||
|  | ||||
|   | ||||
| @@ -18,7 +18,6 @@ import org.kodein.di.android.closestDI | ||||
| import org.kodein.di.instance | ||||
|  | ||||
| class SourcesActivity : AppCompatActivity(), DIAware { | ||||
|  | ||||
|     private lateinit var binding: ActivitySourcesBinding | ||||
|  | ||||
|     override val di by closestDI() | ||||
| @@ -58,8 +57,10 @@ class SourcesActivity : AppCompatActivity(), DIAware { | ||||
|             val response = repository.getSourcesDetails() | ||||
|             if (response.isNotEmpty()) { | ||||
|                 items = response | ||||
|                 val mAdapter = SourcesListAdapter( | ||||
|                     this@SourcesActivity, items | ||||
|                 val mAdapter = | ||||
|                     SourcesListAdapter( | ||||
|                         this@SourcesActivity, | ||||
|                         items, | ||||
|                     ) | ||||
|                 binding.recyclerView.adapter = mAdapter | ||||
|                 mAdapter.notifyDataSetChanged() | ||||
| @@ -67,7 +68,7 @@ class SourcesActivity : AppCompatActivity(), DIAware { | ||||
|                 Toast.makeText( | ||||
|                     this@SourcesActivity, | ||||
|                     R.string.cant_get_sources, | ||||
|                     Toast.LENGTH_SHORT | ||||
|                     Toast.LENGTH_SHORT, | ||||
|                 ).show() | ||||
|             } | ||||
|         } | ||||
|   | ||||
| @@ -21,9 +21,7 @@ import org.kodein.di.DIAware | ||||
| import org.kodein.di.android.closestDI | ||||
| import org.kodein.di.instance | ||||
|  | ||||
|  | ||||
| class UpsertSourceActivity : AppCompatActivity(), DIAware { | ||||
|  | ||||
|     private var existingSource: SelfossModel.SourceDetail? = null | ||||
|     private var mSpoutsValue: String? = null | ||||
|  | ||||
| @@ -58,7 +56,6 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware { | ||||
|         supportActionBar?.setDisplayShowHomeEnabled(true) | ||||
|         supportActionBar?.title = resources.getString(title) | ||||
|  | ||||
|  | ||||
|         maybeGetDetailsFromIntentSharing(intent) | ||||
|  | ||||
|         binding.saveBtn.setOnClickListener { | ||||
| @@ -88,8 +85,14 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware { | ||||
|  | ||||
|     private fun handleSpoutsSpinner() { | ||||
|         val spoutsKV = HashMap<String, String>() | ||||
|         binding.spoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { | ||||
|             override fun onItemSelected(adapterView: AdapterView<*>, view: View?, i: Int, l: Long) { | ||||
|         binding.spoutsSpinner.onItemSelectedListener = | ||||
|             object : AdapterView.OnItemSelectedListener { | ||||
|                 override fun onItemSelected( | ||||
|                     adapterView: AdapterView<*>, | ||||
|                     view: View?, | ||||
|                     i: Int, | ||||
|                     l: Long, | ||||
|                 ) { | ||||
|                     if (view != null) { | ||||
|                         val spoutName = (view as TextView).text.toString() | ||||
|                         mSpoutsValue = spoutsKV[spoutName] | ||||
| @@ -101,12 +104,11 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware { | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|  | ||||
|         fun handleSpoutFailure(networkIssue: Boolean = false) { | ||||
|             Toast.makeText( | ||||
|                 this@UpsertSourceActivity, | ||||
|                 if (networkIssue) R.string.cant_get_spouts_no_network else R.string.cant_get_spouts, | ||||
|                 Toast.LENGTH_SHORT | ||||
|                 Toast.LENGTH_SHORT, | ||||
|             ).show() | ||||
|             binding.progress.visibility = View.GONE | ||||
|         } | ||||
| @@ -127,7 +129,7 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware { | ||||
|                         ArrayAdapter( | ||||
|                             this@UpsertSourceActivity, | ||||
|                             android.R.layout.simple_spinner_item, | ||||
|                             itemsStrings | ||||
|                             itemsStrings, | ||||
|                         ) | ||||
|                     spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||||
|                     binding.spoutsSpinner.adapter = spinnerArrayAdapter | ||||
| @@ -144,9 +146,7 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware { | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private fun maybeGetDetailsFromIntentSharing( | ||||
|         intent: Intent | ||||
|     ) { | ||||
|     private fun maybeGetDetailsFromIntentSharing(intent: Intent) { | ||||
|         if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) { | ||||
|             binding.sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT)) | ||||
|             binding.nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE)) | ||||
| @@ -172,13 +172,14 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware { | ||||
|             } | ||||
|             else -> { | ||||
|                 CoroutineScope(Dispatchers.Main).launch { | ||||
|                     val successfullyAddedSource = if (existingSource != null) { | ||||
|                     val successfullyAddedSource = | ||||
|                         if (existingSource != null) { | ||||
|                             repository.updateSource( | ||||
|                                 existingSource!!.id, | ||||
|                                 binding.nameInput.text.toString(), | ||||
|                                 url, | ||||
|                                 mSpoutsValue!!, | ||||
|                             binding.tags.text.toString() | ||||
|                                 binding.tags.text.toString(), | ||||
|                             ) | ||||
|                         } else { | ||||
|                             repository.createSource( | ||||
| @@ -194,7 +195,7 @@ class UpsertSourceActivity : AppCompatActivity(), DIAware { | ||||
|                         Toast.makeText( | ||||
|                             this@UpsertSourceActivity, | ||||
|                             R.string.cant_create_source, | ||||
|                             Toast.LENGTH_SHORT | ||||
|                             Toast.LENGTH_SHORT, | ||||
|                         ).show() | ||||
|                     } | ||||
|                 } | ||||
|   | ||||
| @@ -32,7 +32,7 @@ import org.kodein.di.instance | ||||
| class ItemCardAdapter( | ||||
|     override val app: Activity, | ||||
|     override var items: ArrayList<SelfossModel.Item>, | ||||
|     override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit | ||||
|     override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit, | ||||
| ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() { | ||||
|     private val c: Context = app.baseContext | ||||
|     private val imageMaxHeight: Int = | ||||
| @@ -42,12 +42,18 @@ class ItemCardAdapter( | ||||
|     override val repository: Repository by instance() | ||||
|     override val appSettingsService: AppSettingsService by instance() | ||||
|  | ||||
|     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { | ||||
|     override fun onCreateViewHolder( | ||||
|         parent: ViewGroup, | ||||
|         viewType: Int, | ||||
|     ): ViewHolder { | ||||
|         val binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) | ||||
|         return ViewHolder(binding) | ||||
|     } | ||||
|  | ||||
|     override fun onBindViewHolder(holder: ViewHolder, position: Int) { | ||||
|     override fun onBindViewHolder( | ||||
|         holder: ViewHolder, | ||||
|         position: Int, | ||||
|     ) { | ||||
|         with(holder) { | ||||
|             val itm = items[position] | ||||
|  | ||||
| @@ -97,7 +103,6 @@ class ItemCardAdapter( | ||||
|         } | ||||
|  | ||||
|         private fun handleClickListeners() { | ||||
|  | ||||
|             binding.favButton.setOnClickListener { | ||||
|                 val item = items[bindingAdapterPosition] | ||||
|                 if (item.starred) { | ||||
| @@ -130,7 +135,7 @@ class ItemCardAdapter( | ||||
|                     bindingAdapterPosition, | ||||
|                     items[bindingAdapterPosition].getLinkDecoded(), | ||||
|                     appSettingsService.isArticleViewerEnabled(), | ||||
|                     app | ||||
|                     app, | ||||
|                 ) | ||||
|             } | ||||
|         } | ||||
|   | ||||
| @@ -23,7 +23,7 @@ import org.kodein.di.instance | ||||
| class ItemListAdapter( | ||||
|     override val app: Activity, | ||||
|     override var items: ArrayList<SelfossModel.Item>, | ||||
|     override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit | ||||
|     override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit, | ||||
| ) : ItemsAdapter<ItemListAdapter.ViewHolder>() { | ||||
|     private val c: Context = app.baseContext | ||||
|  | ||||
| @@ -31,12 +31,18 @@ class ItemListAdapter( | ||||
|     override val repository: Repository by instance() | ||||
|     override val appSettingsService: AppSettingsService by instance() | ||||
|  | ||||
|     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { | ||||
|     override fun onCreateViewHolder( | ||||
|         parent: ViewGroup, | ||||
|         viewType: Int, | ||||
|     ): ViewHolder { | ||||
|         val binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) | ||||
|         return ViewHolder(binding) | ||||
|     } | ||||
|  | ||||
|     override fun onBindViewHolder(holder: ViewHolder, position: Int) { | ||||
|     override fun onBindViewHolder( | ||||
|         holder: ViewHolder, | ||||
|         position: Int, | ||||
|     ) { | ||||
|         with(holder) { | ||||
|             val itm = items[position] | ||||
|  | ||||
| @@ -49,7 +55,6 @@ class ItemListAdapter( | ||||
|             binding.sourceTitleAndDate.text = itm.sourceAuthorAndDate() | ||||
|  | ||||
|             if (itm.getThumbnail(repository.baseUrl).isEmpty()) { | ||||
|  | ||||
|                 if (itm.getIcon(repository.baseUrl).isEmpty()) { | ||||
|                     binding.itemImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded()) | ||||
|                 } else { | ||||
| @@ -64,7 +69,6 @@ class ItemListAdapter( | ||||
|     override fun getItemCount(): Int = items.size | ||||
|  | ||||
|     inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root) { | ||||
|  | ||||
|         init { | ||||
|             handleLinkOpening() | ||||
|         } | ||||
| @@ -76,7 +80,7 @@ class ItemListAdapter( | ||||
|                     bindingAdapterPosition, | ||||
|                     items[bindingAdapterPosition].getLinkDecoded(), | ||||
|                     appSettingsService.isArticleViewerEnabled(), | ||||
|                     app | ||||
|                     app, | ||||
|                 ) | ||||
|             } | ||||
|         } | ||||
|   | ||||
| @@ -28,12 +28,16 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte | ||||
|         updateItems(this.items) | ||||
|     } | ||||
|  | ||||
|     private fun unmarkSnackbar(item: SelfossModel.Item, position: Int) { | ||||
|         val s = Snackbar | ||||
|     private fun unmarkSnackbar( | ||||
|         item: SelfossModel.Item, | ||||
|         position: Int, | ||||
|     ) { | ||||
|         val s = | ||||
|             Snackbar | ||||
|                 .make( | ||||
|                     app.findViewById(R.id.coordLayout), | ||||
|                     R.string.marked_as_read, | ||||
|                 Snackbar.LENGTH_LONG | ||||
|                     Snackbar.LENGTH_LONG, | ||||
|                 ) | ||||
|                 .setAction(R.string.undo_string) { | ||||
|                     unreadItemAtIndex(item, position, false) | ||||
| @@ -45,12 +49,16 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte | ||||
|         s.show() | ||||
|     } | ||||
|  | ||||
|     private fun markSnackbar(item: SelfossModel.Item, position: Int) { | ||||
|         val s = Snackbar | ||||
|     private fun markSnackbar( | ||||
|         item: SelfossModel.Item, | ||||
|         position: Int, | ||||
|     ) { | ||||
|         val s = | ||||
|             Snackbar | ||||
|                 .make( | ||||
|                     app.findViewById(R.id.coordLayout), | ||||
|                     R.string.marked_as_unread, | ||||
|                 Snackbar.LENGTH_LONG | ||||
|                     Snackbar.LENGTH_LONG, | ||||
|                 ) | ||||
|                 .setAction(R.string.undo_string) { | ||||
|                     readItemAtIndex(item, position, false) | ||||
| @@ -70,7 +78,11 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private fun readItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) { | ||||
|     private fun readItemAtIndex( | ||||
|         item: SelfossModel.Item, | ||||
|         position: Int, | ||||
|         showSnackbar: Boolean = true, | ||||
|     ) { | ||||
|         CoroutineScope(Dispatchers.IO).launch { | ||||
|             repository.markAsRead(item) | ||||
|         } | ||||
| @@ -86,10 +98,13 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private fun unreadItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) { | ||||
|     private fun unreadItemAtIndex( | ||||
|         item: SelfossModel.Item, | ||||
|         position: Int, | ||||
|         showSnackbar: Boolean = true, | ||||
|     ) { | ||||
|         CoroutineScope(Dispatchers.IO).launch { | ||||
|             repository.unmarkAsRead(item) | ||||
|  | ||||
|         } | ||||
|         notifyItemChanged(position) | ||||
|         if (showSnackbar) { | ||||
| @@ -97,11 +112,13 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     fun addItemAtIndex(item: SelfossModel.Item, position: Int) { | ||||
|     fun addItemAtIndex( | ||||
|         item: SelfossModel.Item, | ||||
|         position: Int, | ||||
|     ) { | ||||
|         items.add(position, item) | ||||
|         notifyItemInserted(position) | ||||
|         updateItems(items) | ||||
|  | ||||
|     } | ||||
|  | ||||
|     fun addItemsAtEnd(newItems: List<SelfossModel.Item>) { | ||||
| @@ -109,6 +126,5 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte | ||||
|         items.addAll(newItems) | ||||
|         notifyItemRangeInserted(oldSize, newItems.size) | ||||
|         updateItems(items) | ||||
|  | ||||
|     } | ||||
| } | ||||
| @@ -28,7 +28,7 @@ import org.kodein.di.instance | ||||
|  | ||||
| class SourcesListAdapter( | ||||
|     private val app: Activity, | ||||
|     private val items: ArrayList<SelfossModel.SourceDetail> | ||||
|     private val items: ArrayList<SelfossModel.SourceDetail>, | ||||
| ) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>(), DIAware { | ||||
|     private val c: Context = app.baseContext | ||||
|     private lateinit var binding: SourceListItemBinding | ||||
| @@ -36,12 +36,18 @@ class SourcesListAdapter( | ||||
|     override val di: DI by closestDI(app) | ||||
|     private val repository: Repository by instance() | ||||
|  | ||||
|     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { | ||||
|     override fun onCreateViewHolder( | ||||
|         parent: ViewGroup, | ||||
|         viewType: Int, | ||||
|     ): ViewHolder { | ||||
|         binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) | ||||
|         return ViewHolder(binding.root) | ||||
|     } | ||||
|  | ||||
|     override fun onBindViewHolder(holder: ViewHolder, position: Int) { | ||||
|     override fun onBindViewHolder( | ||||
|         holder: ViewHolder, | ||||
|         position: Int, | ||||
|     ) { | ||||
|         val itm = items[position] | ||||
|  | ||||
|         if (itm.getIcon(repository.baseUrl).isEmpty()) { | ||||
| @@ -67,13 +73,11 @@ class SourcesListAdapter( | ||||
|     override fun getItemCount(): Int = items.size | ||||
|  | ||||
|     inner class ViewHolder(private val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) { | ||||
|  | ||||
|         init { | ||||
|             handleClickListeners() | ||||
|         } | ||||
|  | ||||
|         private fun handleClickListeners() { | ||||
|  | ||||
|             val deleteBtn: Button = mView.findViewById(R.id.deleteBtn) | ||||
|  | ||||
|             deleteBtn.setOnClickListener { | ||||
| @@ -88,7 +92,7 @@ class SourcesListAdapter( | ||||
|                         Toast.makeText( | ||||
|                             app, | ||||
|                             R.string.can_delete_source, | ||||
|                             Toast.LENGTH_SHORT | ||||
|                             Toast.LENGTH_SHORT, | ||||
|                         ).show() | ||||
|                     } | ||||
|                 } | ||||
| @@ -99,7 +103,6 @@ class SourcesListAdapter( | ||||
|  | ||||
|                 repository.setSelectedSource(source) | ||||
|                 app.startActivity(Intent(app, UpsertSourceActivity::class.java)) | ||||
|  | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -26,16 +26,15 @@ import org.kodein.di.instance | ||||
| import java.util.* | ||||
| import kotlin.concurrent.schedule | ||||
|  | ||||
| class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params), | ||||
| class LoadingWorker(val context: Context, params: WorkerParameters) : | ||||
|     Worker(context, params), | ||||
|     DIAware { | ||||
|  | ||||
|     override val di by lazy { (applicationContext as MyApp).di } | ||||
|     private val repository: Repository by instance() | ||||
|     private val appSettingsService: AppSettingsService by instance() | ||||
|  | ||||
|     override fun doWork(): Result { | ||||
|         if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) { | ||||
|  | ||||
|             CoroutineScope(Dispatchers.IO).launch { | ||||
|                 val notificationManager = | ||||
|                     applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager | ||||
| @@ -67,19 +66,19 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con | ||||
|  | ||||
|     private fun handleNewItemsNotification( | ||||
|         newItems: List<SelfossModel.Item>?, | ||||
|         notificationManager: NotificationManager | ||||
|         notificationManager: NotificationManager, | ||||
|     ) { | ||||
|         CoroutineScope(Dispatchers.IO).launch { | ||||
|             val apiItems = newItems.orEmpty() | ||||
|  | ||||
|  | ||||
|             val newSize = apiItems.filter { it.unread }.size | ||||
|             if (newSize > 0) { | ||||
|  | ||||
|                 val intent = Intent(context, MainActivity::class.java).apply { | ||||
|                 val intent = | ||||
|                     Intent(context, MainActivity::class.java).apply { | ||||
|                         flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK | ||||
|                     } | ||||
|                 val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { | ||||
|                 val pflags = | ||||
|                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { | ||||
|                         PendingIntent.FLAG_IMMUTABLE | ||||
|                     } else { | ||||
|                         0 | ||||
| @@ -90,14 +89,14 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con | ||||
|                 val newItemsNotification = | ||||
|                     NotificationCompat.Builder( | ||||
|                         applicationContext, | ||||
|                         AppSettingsService.newItemsChannelId | ||||
|                         AppSettingsService.newItemsChannelId, | ||||
|                     ) | ||||
|                         .setContentTitle(context.getString(R.string.new_items_notification_title)) | ||||
|                         .setContentText( | ||||
|                             context.getString( | ||||
|                                 R.string.new_items_notification_text, | ||||
|                                 newSize | ||||
|                             ) | ||||
|                                 newSize, | ||||
|                             ), | ||||
|                         ) | ||||
|                         .setPriority(PRIORITY_DEFAULT) | ||||
|                         .setChannelId(AppSettingsService.newItemsChannelId) | ||||
|   | ||||
| @@ -57,7 +57,6 @@ import java.net.URL | ||||
| import java.util.* | ||||
| import java.util.concurrent.ExecutionException | ||||
|  | ||||
|  | ||||
| private const val IMAGE_JPG = "image/jpg" | ||||
|  | ||||
| class ArticleFragment : Fragment(), DIAware { | ||||
| @@ -84,7 +83,6 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|  | ||||
|     private val mercuryApi: MercuryApi by instance() | ||||
|  | ||||
|  | ||||
|     override fun onCreate(savedInstanceState: Bundle?) { | ||||
|         super.onCreate(savedInstanceState) | ||||
|  | ||||
| @@ -96,7 +94,7 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|     override fun onCreateView( | ||||
|         inflater: LayoutInflater, | ||||
|         container: ViewGroup?, | ||||
|         savedInstanceState: Bundle? | ||||
|         savedInstanceState: Bundle?, | ||||
|     ): View { | ||||
|         try { | ||||
|             binding = FragmentArticleBinding.inflate(inflater, container, false) | ||||
| @@ -146,9 +144,8 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                             if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show() | ||||
|                         } | ||||
|                     } | ||||
|                 } | ||||
|                 }, | ||||
|             ) | ||||
|  | ||||
|         } catch (e: InflateException) { | ||||
|             e.sendSilentlyWithAcraWithName("webview not available") | ||||
|             if (context != null) { | ||||
| @@ -156,7 +153,7 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                     .setMessage(requireContext().getString(R.string.webview_dialog_issue_message)) | ||||
|                     .setTitle(requireContext().getString(R.string.webview_dialog_issue_title)) | ||||
|                     .setPositiveButton( | ||||
|                         android.R.string.ok | ||||
|                         android.R.string.ok, | ||||
|                     ) { _, _ -> | ||||
|                         appSettingsService.disableArticleViewer() | ||||
|                         requireActivity().finish() | ||||
| @@ -211,7 +208,8 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                     when (item.itemId) { | ||||
|                         R.id.share_action -> requireActivity().shareLink(url, contentTitle) | ||||
|                         R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item) | ||||
|                         R.id.unread_action -> if (context != null) { | ||||
|                         R.id.unread_action -> | ||||
|                             if (context != null) { | ||||
|                                 if (this@ArticleFragment.item.unread) { | ||||
|                                     CoroutineScope(Dispatchers.IO).launch { | ||||
|                                         repository.markAsRead(this@ArticleFragment.item) | ||||
| @@ -220,7 +218,7 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                                     Toast.makeText( | ||||
|                                         context, | ||||
|                                         R.string.marked_as_read, | ||||
|                                     Toast.LENGTH_LONG | ||||
|                                         Toast.LENGTH_LONG, | ||||
|                                     ).show() | ||||
|                                 } else { | ||||
|                                     CoroutineScope(Dispatchers.IO).launch { | ||||
| @@ -230,7 +228,7 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                                     Toast.makeText( | ||||
|                                         context, | ||||
|                                         R.string.marked_as_unread, | ||||
|                                     Toast.LENGTH_LONG | ||||
|                                         Toast.LENGTH_LONG, | ||||
|                                     ).show() | ||||
|                                 } | ||||
|                             } | ||||
| @@ -241,13 +239,14 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                 override fun onItemLongClick(item: MenuItem?) { | ||||
|                     // We do nothing | ||||
|                 } | ||||
|             } | ||||
|             }, | ||||
|         ) | ||||
|         return floatingToolbar | ||||
|     } | ||||
|  | ||||
|     private fun refreshAlignment() { | ||||
|         textAlignment = when (appSettingsService.getActiveAllignment()) { | ||||
|         textAlignment = | ||||
|             when (appSettingsService.getActiveAllignment()) { | ||||
|                 1 -> "justify" | ||||
|                 2 -> "left" | ||||
|                 else -> "justify" | ||||
| @@ -302,7 +301,7 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                 .with(requireContext()) | ||||
|                 .asBitmap() | ||||
|                 .load( | ||||
|                     lead_image_url | ||||
|                     lead_image_url, | ||||
|                 ) | ||||
|                 .apply(RequestOptions.fitCenterTransform()) | ||||
|                 .into(binding.imageView) | ||||
| @@ -312,9 +311,13 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|     } | ||||
|  | ||||
|     private fun handleImageLoading() { | ||||
|         binding.webcontent.webViewClient = object : WebViewClient() { | ||||
|         binding.webcontent.webViewClient = | ||||
|             object : WebViewClient() { | ||||
|                 @Deprecated("Deprecated in Java") | ||||
|             override fun shouldOverrideUrlLoading(view: WebView?, url: String): Boolean { | ||||
|                 override fun shouldOverrideUrlLoading( | ||||
|                     view: WebView?, | ||||
|                     url: String, | ||||
|                 ): Boolean { | ||||
|                     return if (context != null && url.isUrlValid() && binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) { | ||||
|                         try { | ||||
|                             requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url))) | ||||
| @@ -328,9 +331,13 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                 } | ||||
|  | ||||
|                 @Deprecated("Deprecated in Java") | ||||
|             override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? { | ||||
|                 override fun shouldInterceptRequest( | ||||
|                     view: WebView, | ||||
|                     url: String, | ||||
|                 ): WebResourceResponse? { | ||||
|                     val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL) | ||||
|                 if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US) | ||||
|                     if (url.lowercase(Locale.US).contains(".jpg") || | ||||
|                         url.lowercase(Locale.US) | ||||
|                             .contains(".jpeg") | ||||
|                     ) { | ||||
|                         try { | ||||
| @@ -339,7 +346,7 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                             return WebResourceResponse( | ||||
|                                 IMAGE_JPG, | ||||
|                                 "UTF-8", | ||||
|                             getBitmapInputStream(image, Bitmap.CompressFormat.JPEG) | ||||
|                                 getBitmapInputStream(image, Bitmap.CompressFormat.JPEG), | ||||
|                             ) | ||||
|                         } catch (e: ExecutionException) { | ||||
|                             // Do nothing | ||||
| @@ -351,7 +358,7 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                             return WebResourceResponse( | ||||
|                                 IMAGE_JPG, | ||||
|                                 "UTF-8", | ||||
|                             getBitmapInputStream(image, Bitmap.CompressFormat.PNG) | ||||
|                                 getBitmapInputStream(image, Bitmap.CompressFormat.PNG), | ||||
|                             ) | ||||
|                         } catch (e: ExecutionException) { | ||||
|                             // Do nothing | ||||
| @@ -363,7 +370,7 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                             return WebResourceResponse( | ||||
|                                 IMAGE_JPG, | ||||
|                                 "UTF-8", | ||||
|                             getBitmapInputStream(image, Bitmap.CompressFormat.WEBP) | ||||
|                                 getBitmapInputStream(image, Bitmap.CompressFormat.WEBP), | ||||
|                             ) | ||||
|                         } catch (e: ExecutionException) { | ||||
|                             // Do nothing | ||||
| @@ -380,7 +387,6 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|             val attrs: IntArray = intArrayOf(android.R.attr.fontFamily) | ||||
|             val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs) | ||||
|  | ||||
|  | ||||
|             binding.webcontent.settings.standardFontFamily = a.getString(0) | ||||
|             binding.webcontent.visibility = View.VISIBLE | ||||
|  | ||||
| @@ -397,11 +403,14 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|             handleImageLoading() | ||||
|  | ||||
|             val gestureDetector = | ||||
|                 GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() { | ||||
|                 GestureDetector( | ||||
|                     activity, | ||||
|                     object : GestureDetector.SimpleOnGestureListener() { | ||||
|                         override fun onSingleTapUp(e: MotionEvent): Boolean { | ||||
|                             return performClick() | ||||
|                         } | ||||
|                 }) | ||||
|                     }, | ||||
|                 ) | ||||
|  | ||||
|             binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) } | ||||
|  | ||||
| @@ -417,18 +426,20 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                 e.sendSilentlyWithAcraWithName("htmlToWebview > $url") | ||||
|             } | ||||
|  | ||||
|             val fontName = when (font) { | ||||
|             val fontName = | ||||
|                 when (font) { | ||||
|                     getString(R.string.open_sans_font_id) -> "Open Sans" | ||||
|                     getString(R.string.roboto_font_id) -> "Roboto" | ||||
|                     getString(R.string.source_code_pro_font_id) -> "Source Code Pro" | ||||
|                     else -> "" | ||||
|                 } | ||||
|  | ||||
|             val fontLinkAndStyle = if (font.isNotEmpty()) { | ||||
|             val fontLinkAndStyle = | ||||
|                 if (font.isNotEmpty()) { | ||||
|                     """<link href="https://fonts.googleapis.com/css?family=${ | ||||
|                         fontName.replace( | ||||
|                             " ", | ||||
|                         "+" | ||||
|                             "+", | ||||
|                         ) | ||||
|                     }" rel="stylesheet"> | ||||
|                 |<style> | ||||
| @@ -457,7 +468,7 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                 |        color: ${ | ||||
|                     String.format( | ||||
|                         "#%06X", | ||||
|                         0xFFFFFF and resources.getColor(R.color.colorAccent) | ||||
|                         0xFFFFFF and resources.getColor(R.color.colorAccent), | ||||
|                     ) | ||||
|                 } !important; | ||||
|                 |      } | ||||
| @@ -473,7 +484,7 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                 |        background-color: ${ | ||||
|                     String.format( | ||||
|                         "#%06X", | ||||
|                         0xFFFFFF and colorSurface.data | ||||
|                         0xFFFFFF and colorSurface.data, | ||||
|                     ) | ||||
|                 }; | ||||
|                 |      } | ||||
| @@ -481,13 +492,13 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                 |        background-color: ${ | ||||
|                     String.format( | ||||
|                         "#%06X", | ||||
|                         0xFFFFFF and colorSurface.data | ||||
|                         0xFFFFFF and colorSurface.data, | ||||
|                     ) | ||||
|                 } !important; | ||||
|                 |        border-color: ${ | ||||
|                     String.format( | ||||
|                         "#%06X", | ||||
|                         0xFFFFFF and colorSurface.data | ||||
|                         0xFFFFFF and colorSurface.data, | ||||
|                     ) | ||||
|                 }  !important; | ||||
|                 |        padding: 0 !important; | ||||
| @@ -502,7 +513,7 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                 |        background-color: ${ | ||||
|                     String.format( | ||||
|                         "#%06X", | ||||
|                         0xFFFFFF and colorSurface.data | ||||
|                         0xFFFFFF and colorSurface.data, | ||||
|                     ) | ||||
|                 }; | ||||
|                 |      } | ||||
| @@ -511,10 +522,11 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|                 |</head> | ||||
|                 |<body> | ||||
|                 |   $contentText | ||||
|                 |</body>""".trimMargin(), | ||||
|                 |</body> | ||||
|                 """.trimMargin(), | ||||
|                 "text/html", | ||||
|                 "utf-8", | ||||
|                 null | ||||
|                 null, | ||||
|             ) | ||||
|         } | ||||
|     } | ||||
| @@ -535,16 +547,13 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|             requireContext().openInBrowserAsNewTask(this@ArticleFragment.item) | ||||
|         } else { | ||||
|             Exception("openInBrowserAfterFailing context is null").sendSilentlyWithAcraWithName("openInBrowserAfterFailing > $context") | ||||
|  | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     companion object { | ||||
|         private const val ARG_ITEMS = "items" | ||||
|  | ||||
|         fun newInstance( | ||||
|             item: SelfossModel.Item | ||||
|         ): ArticleFragment { | ||||
|         fun newInstance(item: SelfossModel.Item): ArticleFragment { | ||||
|             val fragment = ArticleFragment() | ||||
|             val args = Bundle() | ||||
|             args.putParcelable(ARG_ITEMS, item.toParcelable()) | ||||
| @@ -554,10 +563,11 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|     } | ||||
|  | ||||
|     fun performClick(): Boolean { | ||||
|         if (allImages != null && (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE || | ||||
|             binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) | ||||
|         if (allImages != null && ( | ||||
|                 binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE || | ||||
|                     binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE | ||||
|             ) | ||||
|         ) { | ||||
|  | ||||
|             val position: Int = allImages.indexOf(binding.webcontent.hitTestResult.extra) | ||||
|  | ||||
|             val intent = Intent(activity, ImageActivity::class.java) | ||||
| @@ -568,6 +578,4 @@ class ArticleFragment : Fragment(), DIAware { | ||||
|         } | ||||
|         return false | ||||
|     } | ||||
|  | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -17,6 +17,7 @@ import bou.amine.apps.readerforselfossv2.android.R | ||||
| import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding | ||||
| import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName | ||||
| import bou.amine.apps.readerforselfossv2.repository.Repository | ||||
| import bou.amine.apps.readerforselfossv2.utils.getColorHexCode | ||||
| import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded | ||||
| import bou.amine.apps.readerforselfossv2.utils.getIcon | ||||
| import com.bumptech.glide.Glide | ||||
| @@ -32,9 +33,7 @@ import org.kodein.di.DIAware | ||||
| import org.kodein.di.android.x.closestDI | ||||
| import org.kodein.di.instance | ||||
|  | ||||
|  | ||||
| class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { | ||||
|  | ||||
|     private lateinit var binding: FilterFragmentBinding | ||||
|     override val di: DI by closestDI() | ||||
|     private val repository: Repository by instance() | ||||
| @@ -44,18 +43,17 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { | ||||
|     override fun onCreateView( | ||||
|         inflater: LayoutInflater, | ||||
|         container: ViewGroup?, | ||||
|         savedInstanceState: Bundle? | ||||
|         savedInstanceState: Bundle?, | ||||
|     ): View { | ||||
|         binding = | ||||
|             FilterFragmentBinding.inflate( | ||||
|                 inflater, | ||||
|                 container, | ||||
|                 false | ||||
|                 false, | ||||
|             ) | ||||
|  | ||||
|         val context: Context? = context | ||||
|  | ||||
|  | ||||
|         if (context == null) { | ||||
|             dismiss() | ||||
|             Exception("FilterSheetFragment context is null").sendSilentlyWithAcraWithName("FilterSheetFragment > onCreateView") | ||||
| @@ -77,9 +75,7 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { | ||||
|         return binding.root | ||||
|     } | ||||
|  | ||||
|     private suspend fun handleSourceChips( | ||||
|         context: Context | ||||
|     ) { | ||||
|     private suspend fun handleSourceChips(context: Context) { | ||||
|         val sourceGroup = binding.sourcesGroup | ||||
|  | ||||
|         repository.getSourcesDetailsOrStats().forEachIndexed { _, source -> | ||||
| @@ -88,10 +84,11 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { | ||||
|  | ||||
|             Glide.with(context) | ||||
|                 .load(source.getIcon(repository.baseUrl)) | ||||
|                 .into(object : ViewTarget<Chip?, Drawable?>(c) { | ||||
|                 .into( | ||||
|                     object : ViewTarget<Chip?, Drawable?>(c) { | ||||
|                         override fun onResourceReady( | ||||
|                             resource: Drawable, | ||||
|                         transition: Transition<in Drawable?>? | ||||
|                             transition: Transition<in Drawable?>?, | ||||
|                         ) { | ||||
|                             try { | ||||
|                                 c.chipIcon = resource | ||||
| @@ -99,8 +96,8 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { | ||||
|                                 e.sendSilentlyWithAcraWithName("sources > onResourceReady") | ||||
|                             } | ||||
|                         } | ||||
|  | ||||
|                 }) | ||||
|                     }, | ||||
|                 ) | ||||
|  | ||||
|             c.text = source.title.getHtmlDecoded() | ||||
|  | ||||
| @@ -121,7 +118,6 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { | ||||
|                 repository.setTagFilter(null) | ||||
|             } | ||||
|  | ||||
|  | ||||
|             if (repository.sourceFilter.value?.equals(source) == true) { | ||||
|                 c.isCloseIconVisible = true | ||||
|                 selectedChip = c | ||||
| @@ -137,9 +133,7 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private suspend fun handleTagChips( | ||||
|         context: Context, | ||||
|     ) { | ||||
|     private suspend fun handleTagChips(context: Context) { | ||||
|         val tagGroup = binding.tagsGroup | ||||
|  | ||||
|         val tags = repository.getTags() | ||||
| @@ -152,10 +146,11 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { | ||||
|             if (tag.color.isNotEmpty()) { | ||||
|                 try { | ||||
|                     val gd = GradientDrawable() | ||||
|                     val gdColor = try { | ||||
|                         Color.parseColor(tag.color) | ||||
|                     val gdColor = | ||||
|                         try { | ||||
|                             Color.parseColor(tag.getColorHexCode()) | ||||
|                         } catch (e: IllegalArgumentException) { | ||||
|                         e.sendSilentlyWithAcraWithName("color issue " + tag.color) | ||||
|                             e.sendSilentlyWithAcraWithName("color issue " + tag.color + " / " + tag.getColorHexCode()) | ||||
|                             resources.getColor(R.color.colorPrimary) | ||||
|                         } | ||||
|                     gd.setColor(gdColor) | ||||
| @@ -197,6 +192,4 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware { | ||||
|     companion object { | ||||
|         const val TAG = "FilterModalBottomSheet" | ||||
|     } | ||||
|  | ||||
|  | ||||
| } | ||||
| @@ -11,7 +11,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy | ||||
| import com.bumptech.glide.request.RequestOptions | ||||
|  | ||||
| class ImageFragment : Fragment() { | ||||
|  | ||||
|     private lateinit var imageUrl: String | ||||
|     private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL) | ||||
|     private var _binding: FragmentImageBinding? = null | ||||
| @@ -23,7 +22,11 @@ class ImageFragment : Fragment() { | ||||
|         imageUrl = requireArguments().getString("imageUrl")!! | ||||
|     } | ||||
|  | ||||
|     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { | ||||
|     override fun onCreateView( | ||||
|         inflater: LayoutInflater, | ||||
|         container: ViewGroup?, | ||||
|         savedInstanceState: Bundle?, | ||||
|     ): View? { | ||||
|         _binding = FragmentImageBinding.inflate(inflater, container, false) | ||||
|         val view = binding?.root | ||||
|  | ||||
| @@ -45,9 +48,7 @@ class ImageFragment : Fragment() { | ||||
|     companion object { | ||||
|         private const val ARG_IMAGE = "imageUrl" | ||||
|  | ||||
|         fun newInstance( | ||||
|                 imageUrl : String | ||||
|         ): ImageFragment { | ||||
|         fun newInstance(imageUrl: String): ImageFragment { | ||||
|             val fragment = ImageFragment() | ||||
|             val args = Bundle() | ||||
|             args.putString(ARG_IMAGE, imageUrl) | ||||
|   | ||||
| @@ -14,7 +14,6 @@ fun SelfossModel.Item.preloadImages(context: Context) : Boolean { | ||||
|  | ||||
|     val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000) | ||||
|  | ||||
|  | ||||
|     try { | ||||
|         for (url in imageUrls) { | ||||
|             if (URLUtil.isValidUrl(url)) { | ||||
|   | ||||
| @@ -17,8 +17,9 @@ fun SelfossModel.Item.toParcelable() : ParecelableItem = | ||||
|         this.link, | ||||
|         this.sourcetitle, | ||||
|         this.tags.joinToString(","), | ||||
|         this.author | ||||
|         this.author, | ||||
|     ) | ||||
|  | ||||
| fun ParecelableItem.toModel(): SelfossModel.Item = | ||||
|     SelfossModel.Item( | ||||
|         this.id, | ||||
| @@ -32,8 +33,9 @@ fun ParecelableItem.toModel() : SelfossModel.Item = | ||||
|         this.link, | ||||
|         this.sourcetitle, | ||||
|         this.tags.split(","), | ||||
|         this.author | ||||
|         this.author, | ||||
|     ) | ||||
|  | ||||
| data class ParecelableItem( | ||||
|     val id: Int, | ||||
|     val datetime: String, | ||||
| @@ -46,13 +48,14 @@ data class ParecelableItem( | ||||
|     val link: String, | ||||
|     val sourcetitle: String, | ||||
|     val tags: String, | ||||
|     val author: String? | ||||
|     val author: String?, | ||||
| ) : Parcelable { | ||||
|  | ||||
|     companion object { | ||||
|         @JvmField | ||||
|         val CREATOR: Parcelable.Creator<ParecelableItem> = object : Parcelable.Creator<ParecelableItem> { | ||||
|         val CREATOR: Parcelable.Creator<ParecelableItem> = | ||||
|             object : Parcelable.Creator<ParecelableItem> { | ||||
|                 override fun createFromParcel(source: Parcel): ParecelableItem = ParecelableItem(source) | ||||
|  | ||||
|                 override fun newArray(size: Int): Array<ParecelableItem?> = arrayOfNulls(size) | ||||
|             } | ||||
|     } | ||||
| @@ -69,12 +72,15 @@ data class ParecelableItem( | ||||
|         link = source.readString().orEmpty(), | ||||
|         sourcetitle = source.readString().orEmpty(), | ||||
|         tags = source.readString().orEmpty(), | ||||
|         author = source.readString().orEmpty() | ||||
|         author = source.readString().orEmpty(), | ||||
|     ) | ||||
|  | ||||
|     override fun describeContents() = 0 | ||||
|  | ||||
|     override fun writeToParcel(dest: Parcel, flags: Int) { | ||||
|     override fun writeToParcel( | ||||
|         dest: Parcel, | ||||
|         flags: Int, | ||||
|     ) { | ||||
|         dest.writeInt(id) | ||||
|         dest.writeString(datetime) | ||||
|         dest.writeString(title) | ||||
|   | ||||
| @@ -24,8 +24,10 @@ import org.kodein.di.android.closestDI | ||||
|  | ||||
| private const val TITLE_TAG = "settingsActivityTitle" | ||||
|  | ||||
| class SettingsActivity : AppCompatActivity(), | ||||
|         PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, DIAware { | ||||
| class SettingsActivity : | ||||
|     AppCompatActivity(), | ||||
|     PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, | ||||
|     DIAware { | ||||
|     override val di by closestDI() | ||||
|  | ||||
|     override fun onCreate(savedInstanceState: Bundle?) { | ||||
| @@ -72,13 +74,14 @@ class SettingsActivity : AppCompatActivity(), | ||||
|  | ||||
|     override fun onPreferenceStartFragment( | ||||
|         caller: PreferenceFragmentCompat, | ||||
|             pref: Preference | ||||
|         pref: Preference, | ||||
|     ): Boolean { | ||||
|         // Instantiate the new Fragment | ||||
|         val args = pref.extras | ||||
|         val fragment = supportFragmentManager.fragmentFactory.instantiate( | ||||
|         val fragment = | ||||
|             supportFragmentManager.fragmentFactory.instantiate( | ||||
|                 classLoader, | ||||
|             pref.fragment.toString() | ||||
|                 pref.fragment.toString(), | ||||
|             ).apply { | ||||
|                 arguments = args | ||||
|                 setTargetFragment(caller, 0) | ||||
| @@ -94,15 +97,20 @@ class SettingsActivity : AppCompatActivity(), | ||||
|     } | ||||
|  | ||||
|     class MainPreferenceFragment : PreferenceFragmentCompat() { | ||||
|         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { | ||||
|         override fun onCreatePreferences( | ||||
|             savedInstanceState: Bundle?, | ||||
|             rootKey: String?, | ||||
|         ) { | ||||
|             setPreferencesFromResource(R.xml.pref_main, rootKey) | ||||
|  | ||||
|             preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue -> | ||||
|             preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = | ||||
|                 Preference.OnPreferenceChangeListener { _, newValue -> | ||||
|                     AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯ | ||||
|                     true | ||||
|                 } | ||||
|  | ||||
|             preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ -> | ||||
|             preferenceManager.findPreference<Preference>("action_about")?.onPreferenceClickListener = | ||||
|                 Preference.OnPreferenceClickListener { _ -> | ||||
|                     context?.let { | ||||
|                         LibsBuilder() | ||||
|                             .withAboutIconShown(true) | ||||
| @@ -115,13 +123,17 @@ class SettingsActivity : AppCompatActivity(), | ||||
|     } | ||||
|  | ||||
|     class GeneralPreferenceFragment : PreferenceFragmentCompat() { | ||||
|         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { | ||||
|         override fun onCreatePreferences( | ||||
|             savedInstanceState: Bundle?, | ||||
|             rootKey: String?, | ||||
|         ) { | ||||
|             setPreferencesFromResource(R.xml.pref_general, rootKey) | ||||
|  | ||||
|             val editTextPreference = preferenceManager.findPreference<EditTextPreference>("prefer_api_items_number") | ||||
|             editTextPreference?.setOnBindEditTextListener { editText -> | ||||
|                 editText.inputType = InputType.TYPE_CLASS_NUMBER | ||||
|                 editText.filters = arrayOf( | ||||
|                 editText.filters = | ||||
|                     arrayOf( | ||||
|                         InputFilter { source, _, _, dest, _, _ -> | ||||
|                             try { | ||||
|                                 val input: Int = (dest.toString() + source.toString()).toInt() | ||||
| @@ -131,26 +143,42 @@ class SettingsActivity : AppCompatActivity(), | ||||
|                                 Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show() | ||||
|                             } | ||||
|                             "" | ||||
|                         } | ||||
|                         }, | ||||
|                     ) | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     class ArticleViewerPreferenceFragment : PreferenceFragmentCompat() { | ||||
|         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { | ||||
|         override fun onCreatePreferences( | ||||
|             savedInstanceState: Bundle?, | ||||
|             rootKey: String?, | ||||
|         ) { | ||||
|             setPreferencesFromResource(R.xml.pref_viewer, rootKey) | ||||
|  | ||||
|             val fontSize = preferenceManager.findPreference<EditTextPreference>("reader_font_size") | ||||
|             fontSize?.setOnBindEditTextListener { editText -> | ||||
|                 editText.inputType = InputType.TYPE_CLASS_NUMBER | ||||
|                 editText.addTextChangedListener { object : TextWatcher { | ||||
|                     override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) { | ||||
|                 editText.addTextChangedListener { | ||||
|                     object : TextWatcher { | ||||
|                         override fun beforeTextChanged( | ||||
|                             charSequence: CharSequence, | ||||
|                             i: Int, | ||||
|                             i1: Int, | ||||
|                             i2: Int, | ||||
|                         ) { | ||||
|                             // We do nothing | ||||
|                         } | ||||
|                     override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) { | ||||
|  | ||||
|                         override fun onTextChanged( | ||||
|                             charSequence: CharSequence, | ||||
|                             i: Int, | ||||
|                             i1: Int, | ||||
|                             i2: Int, | ||||
|                         ) { | ||||
|                             // We do nothing | ||||
|                         } | ||||
|  | ||||
|                         override fun afterTextChanged(editable: Editable) { | ||||
|                             try { | ||||
|                                 editText.textSize = editable.toString().toInt().toFloat() | ||||
| @@ -158,8 +186,10 @@ class SettingsActivity : AppCompatActivity(), | ||||
|                                 e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged") | ||||
|                             } | ||||
|                         } | ||||
|                 } } | ||||
|                 editText.filters = arrayOf( | ||||
|                     } | ||||
|                 } | ||||
|                 editText.filters = | ||||
|                     arrayOf( | ||||
|                         InputFilter { source, _, _, dest, _, _ -> | ||||
|                             try { | ||||
|                                 val input = (dest.toString() + source.toString()).toInt() | ||||
| @@ -168,23 +198,30 @@ class SettingsActivity : AppCompatActivity(), | ||||
|                                 nfe.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > filters") | ||||
|                             } | ||||
|                             "" | ||||
|                         } | ||||
|                         }, | ||||
|                     ) | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     class OfflinePreferenceFragment : PreferenceFragmentCompat() { | ||||
|         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { | ||||
|         override fun onCreatePreferences( | ||||
|             savedInstanceState: Bundle?, | ||||
|             rootKey: String?, | ||||
|         ) { | ||||
|             setPreferencesFromResource(R.xml.pref_offline, rootKey) | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     class ThemePreferenceFragment : PreferenceFragmentCompat() { | ||||
|         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { | ||||
|         override fun onCreatePreferences( | ||||
|             savedInstanceState: Bundle?, | ||||
|             rootKey: String?, | ||||
|         ) { | ||||
|             setPreferencesFromResource(R.xml.pref_theme, rootKey) | ||||
|  | ||||
|             preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue -> | ||||
|             preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = | ||||
|                 Preference.OnPreferenceChangeListener { _, newValue -> | ||||
|                     AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯ | ||||
|                     true | ||||
|                 } | ||||
| @@ -197,20 +234,26 @@ class SettingsActivity : AppCompatActivity(), | ||||
|             startActivity(browserIntent) | ||||
|         } | ||||
|  | ||||
|         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { | ||||
|         override fun onCreatePreferences( | ||||
|             savedInstanceState: Bundle?, | ||||
|             rootKey: String?, | ||||
|         ) { | ||||
|             setPreferencesFromResource(R.xml.pref_links, rootKey) | ||||
|  | ||||
|             preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener { | ||||
|             preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener = | ||||
|                 Preference.OnPreferenceClickListener { | ||||
|                     openUrl(Uri.parse(AppSettingsService.trackerUrl)) | ||||
|                     true | ||||
|                 } | ||||
|  | ||||
|             preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener { | ||||
|             preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener = | ||||
|                 Preference.OnPreferenceClickListener { | ||||
|                     openUrl(Uri.parse(AppSettingsService.sourceUrl)) | ||||
|                     false | ||||
|                 } | ||||
|  | ||||
|             preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener = Preference.OnPreferenceClickListener { | ||||
|             preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener = | ||||
|                 Preference.OnPreferenceClickListener { | ||||
|                     openUrl(Uri.parse(AppSettingsService.translationUrl)) | ||||
|                     false | ||||
|                 } | ||||
| @@ -218,7 +261,10 @@ class SettingsActivity : AppCompatActivity(), | ||||
|     } | ||||
|  | ||||
|     class ExperimentalPreferenceFragment : PreferenceFragmentCompat() { | ||||
|         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { | ||||
|         override fun onCreatePreferences( | ||||
|             savedInstanceState: Bundle?, | ||||
|             rootKey: String?, | ||||
|         ) { | ||||
|             setPreferencesFromResource(R.xml.pref_experimental, rootKey) | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -5,7 +5,10 @@ import android.content.Intent | ||||
| import bou.amine.apps.readerforselfossv2.android.R | ||||
| import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp | ||||
|  | ||||
| fun Context.shareLink(itemUrl: String, itemTitle: String) { | ||||
| fun Context.shareLink( | ||||
|     itemUrl: String, | ||||
|     itemTitle: String, | ||||
| ) { | ||||
|     val sendIntent = Intent() | ||||
|     sendIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK | ||||
|     sendIntent.action = Intent.ACTION_SEND | ||||
| @@ -15,7 +18,7 @@ fun Context.shareLink(itemUrl: String, itemTitle: String) { | ||||
|     startActivity( | ||||
|         Intent.createChooser( | ||||
|             sendIntent, | ||||
|             getString(R.string.share) | ||||
|         ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) | ||||
|             getString(R.string.share), | ||||
|         ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK), | ||||
|     ) | ||||
| } | ||||
| @@ -12,16 +12,19 @@ import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString | ||||
| import com.google.android.material.imageview.ShapeableImageView | ||||
| import kotlin.math.abs | ||||
|  | ||||
| class CircleImageView @JvmOverloads constructor( | ||||
| class CircleImageView | ||||
|     @JvmOverloads | ||||
|     constructor( | ||||
|         context: Context, | ||||
|         attrs: AttributeSet? = null, | ||||
|     defStyleAttr: Int = 0 | ||||
|         defStyleAttr: Int = 0, | ||||
|     ) : RelativeLayout(context, attrs, defStyleAttr) { | ||||
|         val view: View | ||||
|         val imageView: ShapeableImageView | ||||
|         val textView: TextView | ||||
|  | ||||
|     private val colorScheme = listOf( | ||||
|         private val colorScheme = | ||||
|             listOf( | ||||
|                 -0x1a8c8d, | ||||
|                 -0xf9d6e, | ||||
|                 -0x459738, | ||||
| @@ -38,7 +41,7 @@ class CircleImageView @JvmOverloads constructor( | ||||
|                 -0x2ab1, | ||||
|                 -0x48b3, | ||||
|                 -0x5e7781, | ||||
|     -0x6f5b52 | ||||
|                 -0x6f5b52, | ||||
|             ) | ||||
|  | ||||
|         init { | ||||
|   | ||||
| @@ -21,14 +21,13 @@ fun Context.openItemUrl( | ||||
|     currentItem: Int, | ||||
|     linkDecoded: String, | ||||
|     articleViewer: Boolean, | ||||
|     app: Activity | ||||
|     app: Activity, | ||||
| ) { | ||||
|  | ||||
|     if (!linkDecoded.isUrlValid()) { | ||||
|         Toast.makeText( | ||||
|             this, | ||||
|             this.getString(R.string.cant_open_invalid_url), | ||||
|             Toast.LENGTH_LONG | ||||
|             Toast.LENGTH_LONG, | ||||
|         ).show() | ||||
|     } else { | ||||
|         if (articleViewer) { | ||||
| @@ -44,8 +43,7 @@ fun Context.openItemUrl( | ||||
|     } | ||||
| } | ||||
|  | ||||
| fun String.isUrlValid(): Boolean = | ||||
|     this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches() | ||||
| fun String.isUrlValid(): Boolean = this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches() | ||||
|  | ||||
| fun String.isBaseUrlInvalid(): Boolean { | ||||
|     val baseUrl = this.toHttpUrlOrNull() | ||||
| @@ -66,7 +64,10 @@ fun Context.openInBrowserAsNewTask(i: SelfossModel.Item) { | ||||
| } | ||||
|  | ||||
| class LinkOnTouchListener : View.OnTouchListener { | ||||
|     override fun onTouch(v: View?, event: MotionEvent?): Boolean { | ||||
|     override fun onTouch( | ||||
|         v: View?, | ||||
|         event: MotionEvent?, | ||||
|     ): Boolean { | ||||
|         var ret = false | ||||
|         val widget: TextView = v as TextView | ||||
|         val text: CharSequence = widget.text | ||||
|   | ||||
| @@ -8,5 +8,4 @@ fun TextBadgeItem.removeBadge(): TextBadgeItem { | ||||
|     return this | ||||
| } | ||||
|  | ||||
| fun TextBadgeItem.maybeShow(): TextBadgeItem = | ||||
|     if (this.isHidden) this.show() else this | ||||
| fun TextBadgeItem.maybeShow(): TextBadgeItem = if (this.isHidden) this.show() else this | ||||
|   | ||||
| @@ -10,14 +10,19 @@ import java.io.ByteArrayInputStream | ||||
| import java.io.ByteArrayOutputStream | ||||
| import java.io.InputStream | ||||
|  | ||||
| fun Context.bitmapCenterCrop(url: String, iv: ImageView) = | ||||
|     Glide.with(this) | ||||
| fun Context.bitmapCenterCrop( | ||||
|     url: String, | ||||
|     iv: ImageView, | ||||
| ) = Glide.with(this) | ||||
|     .asBitmap() | ||||
|     .load(url) | ||||
|     .apply(RequestOptions.centerCropTransform()) | ||||
|     .into(iv) | ||||
|  | ||||
| fun Context.circularDrawable(url: String, view: CircleImageView) { | ||||
| fun Context.circularDrawable( | ||||
|     url: String, | ||||
|     view: CircleImageView, | ||||
| ) { | ||||
|     view.textView.text = "" | ||||
|  | ||||
|     Glide.with(this) | ||||
| @@ -25,7 +30,10 @@ fun Context.circularDrawable(url: String, view: CircleImageView) { | ||||
|         .into(view.imageView) | ||||
| } | ||||
|  | ||||
| fun getBitmapInputStream(bitmap:Bitmap,compressFormat: Bitmap.CompressFormat): InputStream { | ||||
| fun getBitmapInputStream( | ||||
|     bitmap: Bitmap, | ||||
|     compressFormat: Bitmap.CompressFormat, | ||||
| ): InputStream { | ||||
|     val byteArrayOutputStream = ByteArrayOutputStream() | ||||
|     bitmap.compress(compressFormat, 80, byteArrayOutputStream) | ||||
|     val bitmapData: ByteArray = byteArrayOutputStream.toByteArray() | ||||
|   | ||||
| @@ -19,7 +19,8 @@ class AppViewModel(private val repository: Repository) : ViewModel() { | ||||
|                     if (isConnected && !wasConnected && repository.connectionMonitored) { | ||||
|                         _networkAvailableProvider.emit(true) | ||||
|                         wasConnected = true | ||||
|                     } else if (!isConnected && wasConnected && repository.connectionMonitored){ | ||||
|                     } else if (!isConnected && wasConnected && repository.connectionMonitored) | ||||
|                         { | ||||
|                             _networkAvailableProvider.emit(false) | ||||
|                             wasConnected = false | ||||
|                         } | ||||
|   | ||||
| @@ -36,6 +36,12 @@ | ||||
|         android:orderInCategory="101" | ||||
|         android:title="@string/menu_home_refresh" /> | ||||
|  | ||||
|     <item | ||||
|         android:id="@+id/issue_tracker" | ||||
|         app:showAsAction="never" | ||||
|         android:orderInCategory="103" | ||||
|         android:title="@string/issue_tracker_link" /> | ||||
|  | ||||
|     <item android:id="@+id/action_disconnect" | ||||
|           android:title="@string/action_disconnect" | ||||
|           android:orderInCategory="104" | ||||
|   | ||||
| @@ -3,6 +3,13 @@ | ||||
|       xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
|  | ||||
|  | ||||
|  | ||||
|     <item | ||||
|         android:id="@+id/issue_tracker" | ||||
|         app:showAsAction="never" | ||||
|         android:orderInCategory="101" | ||||
|         android:title="@string/issue_tracker_link" /> | ||||
|  | ||||
|     <item android:id="@+id/about" | ||||
|           android:title="@string/action_about" | ||||
|           android:orderInCategory="102" | ||||
|   | ||||
| @@ -8,12 +8,13 @@ import kotlinx.datetime.toInstant | ||||
| import org.junit.Test | ||||
|  | ||||
| class DatesTest { | ||||
|  | ||||
|     private val newVersionDateVariant = "2022-12-24T17:00:08+00" | ||||
|     private val newVersionDate = "2013-04-07T13:43:00+01:00" | ||||
|     private val oldVersionDate = "2013-05-07 13:46:00" | ||||
|     private val oldVersionDateVariant = "2021-03-21 10:32:00.000000" | ||||
|  | ||||
|     private val bugVersionDate = "2023-12-19T10:30:53-05:00" | ||||
|  | ||||
|     @Test | ||||
|     fun new_version_date_should_be_parsed() { | ||||
|         val date = DateUtils.parseDate(newVersionDate) | ||||
| @@ -54,4 +55,13 @@ class DatesTest { | ||||
|         assertEquals(expected, date) | ||||
|     } | ||||
|  | ||||
|     @Test | ||||
|     fun bug_version_variant_date_should_be_parsed() { | ||||
|         val date = DateUtils.parseDate(bugVersionDate) | ||||
|         val expected = | ||||
|             LocalDateTime(1991, 3, 18, 3, 0, 0, 0).toInstant(TimeZone.currentSystemDefault()) | ||||
|                 .toEpochMilliseconds() | ||||
|  | ||||
|         assertEquals(expected, date) | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -42,11 +42,11 @@ class RepositoryTest { | ||||
|     private val NUMBER_STARRED = 20 | ||||
|     private lateinit var repository: Repository | ||||
|  | ||||
|  | ||||
|     private fun initializeRepository( | ||||
|         isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow( | ||||
|             true | ||||
|         ) | ||||
|         isConnectionAvailable: MutableStateFlow<Boolean> = | ||||
|             MutableStateFlow( | ||||
|                 true, | ||||
|             ), | ||||
|     ) { | ||||
|         repository = Repository(api, appSettingsService, isConnectionAvailable, db) | ||||
|  | ||||
| @@ -64,13 +64,15 @@ class RepositoryTest { | ||||
|         every { appSettingsService.isItemCachingEnabled() } returns false | ||||
|         every { appSettingsService.isUpdateSourcesEnabled() } returns false | ||||
|  | ||||
|         coEvery { api.apiInformation() } returns StatusAndData( | ||||
|         coEvery { api.apiInformation() } returns | ||||
|             StatusAndData( | ||||
|                 success = true, | ||||
|             data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)) | ||||
|                 data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)), | ||||
|             ) | ||||
|         coEvery { api.stats() } returns StatusAndData( | ||||
|         coEvery { api.stats() } returns | ||||
|             StatusAndData( | ||||
|                 success = true, | ||||
|             data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED) | ||||
|                 data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED), | ||||
|             ) | ||||
|  | ||||
|         every { db.itemsQueries.deleteItemsWhereSource(any()) } returns Unit | ||||
| @@ -116,9 +118,10 @@ class RepositoryTest { | ||||
|     @Test | ||||
|     fun get_public_access() { | ||||
|         every { appSettingsService.updatePublicAccess(any()) } returns Unit | ||||
|         coEvery { api.apiInformation() } returns StatusAndData( | ||||
|         coEvery { api.apiInformation() } returns | ||||
|             StatusAndData( | ||||
|                 success = true, | ||||
|             data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)) | ||||
|                 data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)), | ||||
|             ) | ||||
|         every { appSettingsService.getUserName() } returns "" | ||||
|  | ||||
| @@ -131,9 +134,10 @@ class RepositoryTest { | ||||
|     @Test | ||||
|     fun get_public_access_username_not_empty() { | ||||
|         every { appSettingsService.updatePublicAccess(any()) } returns Unit | ||||
|         coEvery { api.apiInformation() } returns StatusAndData( | ||||
|         coEvery { api.apiInformation() } returns | ||||
|             StatusAndData( | ||||
|                 success = true, | ||||
|             data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)) | ||||
|                 data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)), | ||||
|             ) | ||||
|         every { appSettingsService.getUserName() } returns "username" | ||||
|  | ||||
| @@ -146,9 +150,10 @@ class RepositoryTest { | ||||
|     @Test | ||||
|     fun get_public_access_no_auth() { | ||||
|         every { appSettingsService.updatePublicAccess(any()) } returns Unit | ||||
|         coEvery { api.apiInformation() } returns StatusAndData( | ||||
|         coEvery { api.apiInformation() } returns | ||||
|             StatusAndData( | ||||
|                 success = true, | ||||
|             data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, false)) | ||||
|                 data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, false)), | ||||
|             ) | ||||
|         every { appSettingsService.getUserName() } returns "" | ||||
|  | ||||
| @@ -161,9 +166,10 @@ class RepositoryTest { | ||||
|     @Test | ||||
|     fun get_public_access_disabled() { | ||||
|         every { appSettingsService.updatePublicAccess(any()) } returns Unit | ||||
|         coEvery { api.apiInformation() } returns StatusAndData( | ||||
|         coEvery { api.apiInformation() } returns | ||||
|             StatusAndData( | ||||
|                 success = true, | ||||
|             data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)) | ||||
|                 data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)), | ||||
|             ) | ||||
|         every { appSettingsService.getUserName() } returns "" | ||||
|  | ||||
| @@ -182,7 +188,7 @@ class RepositoryTest { | ||||
|         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns | ||||
|             StatusAndData( | ||||
|                 success = true, | ||||
|                     data = generateTestApiItem(itemParameters) | ||||
|                 data = generateTestApiItem(itemParameters), | ||||
|             ) | ||||
|  | ||||
|         initializeRepository() | ||||
| @@ -264,7 +270,7 @@ class RepositoryTest { | ||||
|         itemParameter3.tags = "Other, Tag" | ||||
|         itemParameter3.id = "3" | ||||
|         coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems( | ||||
|             itemParameter1 | ||||
|             itemParameter1, | ||||
|         ) + | ||||
|             generateTestDBItems(itemParameter2) + | ||||
|             generateTestDBItems(itemParameter3) | ||||
| @@ -292,7 +298,7 @@ class RepositoryTest { | ||||
|         itemParameter3.sourcetitle = "Other" | ||||
|         itemParameter3.id = "3" | ||||
|         coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems( | ||||
|             itemParameter1 | ||||
|             itemParameter1, | ||||
|         ) + | ||||
|             generateTestDBItems(itemParameter2) + | ||||
|             generateTestDBItems(itemParameter3) | ||||
| @@ -300,7 +306,8 @@ class RepositoryTest { | ||||
|         every { appSettingsService.isItemCachingEnabled() } returns true | ||||
|  | ||||
|         initializeRepository(MutableStateFlow(false)) | ||||
|         repository.setSourceFilter(SelfossModel.SourceDetail( | ||||
|         repository.setSourceFilter( | ||||
|             SelfossModel.SourceDetail( | ||||
|                 1, | ||||
|                 "Test", | ||||
|                 null, | ||||
| @@ -308,8 +315,9 @@ class RepositoryTest { | ||||
|                 SPOUT, | ||||
|                 "", | ||||
|                 IMAGE_URL, | ||||
|             SelfossModel.SourceParams("url") | ||||
|         )) | ||||
|                 SelfossModel.SourceParams("url"), | ||||
|             ), | ||||
|         ) | ||||
|         runBlocking { | ||||
|             repository.getNewerItems() | ||||
|         } | ||||
| @@ -592,13 +600,15 @@ class RepositoryTest { | ||||
|     } | ||||
|  | ||||
|     private fun prepareTags(): Pair<List<SelfossModel.Tag>, List<TAG>> { | ||||
|         val tags = listOf( | ||||
|         val tags = | ||||
|             listOf( | ||||
|                 SelfossModel.Tag("test", "red", 6), | ||||
|             SelfossModel.Tag("second", "yellow", 0) | ||||
|                 SelfossModel.Tag("second", "yellow", 0), | ||||
|             ) | ||||
|         val tagsDB = listOf( | ||||
|         val tagsDB = | ||||
|             listOf( | ||||
|                 TAG("test_DB", "red", 6), | ||||
|             TAG("second_DB", "yellow", 0) | ||||
|                 TAG("second_DB", "yellow", 0), | ||||
|             ) | ||||
|  | ||||
|         coEvery { api.tags() } returns StatusAndData(success = true, data = tags) | ||||
| @@ -621,7 +631,8 @@ class RepositoryTest { | ||||
|     } | ||||
|  | ||||
|     private fun prepareSources(): Pair<ArrayList<SelfossModel.SourceDetail>, List<SOURCE>> { | ||||
|         val sources = arrayListOf( | ||||
|         val sources = | ||||
|             arrayListOf( | ||||
|                 SelfossModel.SourceDetail( | ||||
|                     1, | ||||
|                     "First source", | ||||
| @@ -630,7 +641,7 @@ class RepositoryTest { | ||||
|                     SPOUT, | ||||
|                     "", | ||||
|                     IMAGE_URL_2, | ||||
|                 SelfossModel.SourceParams("url") | ||||
|                     SelfossModel.SourceParams("url"), | ||||
|                 ), | ||||
|                 SelfossModel.SourceDetail( | ||||
|                     2, | ||||
| @@ -640,10 +651,11 @@ class RepositoryTest { | ||||
|                     SPOUT, | ||||
|                     "", | ||||
|                     IMAGE_URL, | ||||
|                 SelfossModel.SourceParams("url") | ||||
|                     SelfossModel.SourceParams("url"), | ||||
|                 ), | ||||
|             ) | ||||
|         ) | ||||
|         val sourcesDB = listOf( | ||||
|         val sourcesDB = | ||||
|             listOf( | ||||
|                 SOURCE( | ||||
|                     "1", | ||||
|                     "First DB source", | ||||
| @@ -651,7 +663,7 @@ class RepositoryTest { | ||||
|                     SPOUT, | ||||
|                     "", | ||||
|                     IMAGE_URL_2, | ||||
|                 "url" | ||||
|                     "url", | ||||
|                 ), | ||||
|                 SOURCE( | ||||
|                     "2", | ||||
| @@ -660,8 +672,8 @@ class RepositoryTest { | ||||
|                     SPOUT, | ||||
|                     "", | ||||
|                     IMAGE_URL, | ||||
|                 "url" | ||||
|             ) | ||||
|                     "url", | ||||
|                 ), | ||||
|             ) | ||||
|  | ||||
|         coEvery { api.sourcesDetailed() } returns StatusAndData(success = true, data = sources) | ||||
| @@ -796,7 +808,8 @@ class RepositoryTest { | ||||
|         initializeRepository() | ||||
|         var response: Boolean | ||||
|         runBlocking { | ||||
|             response = repository.createSource( | ||||
|             response = | ||||
|                 repository.createSource( | ||||
|                     "test", | ||||
|                     FEED_URL, | ||||
|                     SPOUT, | ||||
| @@ -823,11 +836,12 @@ class RepositoryTest { | ||||
|         initializeRepository() | ||||
|         var response: Boolean | ||||
|         runBlocking { | ||||
|             response = repository.createSource( | ||||
|             response = | ||||
|                 repository.createSource( | ||||
|                     "test", | ||||
|                     FEED_URL, | ||||
|                     SPOUT, | ||||
|                 TAGS | ||||
|                     TAGS, | ||||
|                 ) | ||||
|         } | ||||
|  | ||||
| @@ -836,7 +850,7 @@ class RepositoryTest { | ||||
|                 any(), | ||||
|                 any(), | ||||
|                 any(), | ||||
|                 any() | ||||
|                 any(), | ||||
|             ) | ||||
|         } | ||||
|         assertSame(false, response) | ||||
| @@ -850,11 +864,12 @@ class RepositoryTest { | ||||
|         initializeRepository(MutableStateFlow(false)) | ||||
|         var response: Boolean | ||||
|         runBlocking { | ||||
|             response = repository.createSource( | ||||
|             response = | ||||
|                 repository.createSource( | ||||
|                     "test", | ||||
|                     FEED_URL, | ||||
|                     SPOUT, | ||||
|                 TAGS | ||||
|                     TAGS, | ||||
|                 ) | ||||
|         } | ||||
|  | ||||
| @@ -916,9 +931,10 @@ class RepositoryTest { | ||||
|  | ||||
|     @Test | ||||
|     fun update_remote() { | ||||
|         coEvery { api.update() } returns StatusAndData( | ||||
|         coEvery { api.update() } returns | ||||
|             StatusAndData( | ||||
|                 success = true, | ||||
|             data = "finished" | ||||
|                 data = "finished", | ||||
|             ) | ||||
|  | ||||
|         initializeRepository() | ||||
| @@ -933,9 +949,10 @@ class RepositoryTest { | ||||
|  | ||||
|     @Test | ||||
|     fun update_remote_but_response_fails() { | ||||
|         coEvery { api.update() } returns StatusAndData( | ||||
|         coEvery { api.update() } returns | ||||
|             StatusAndData( | ||||
|                 success = false, | ||||
|             data = "unallowed access" | ||||
|                 data = "unallowed access", | ||||
|             ) | ||||
|  | ||||
|         initializeRepository() | ||||
| @@ -950,9 +967,10 @@ class RepositoryTest { | ||||
|  | ||||
|     @Test | ||||
|     fun update_remote_with_unallowed_access() { | ||||
|         coEvery { api.update() } returns StatusAndData( | ||||
|         coEvery { api.update() } returns | ||||
|             StatusAndData( | ||||
|                 success = true, | ||||
|             data = "unallowed access" | ||||
|                 data = "unallowed access", | ||||
|             ) | ||||
|  | ||||
|         initializeRepository() | ||||
| @@ -967,9 +985,10 @@ class RepositoryTest { | ||||
|  | ||||
|     @Test | ||||
|     fun update_remote_without_connection() { | ||||
|         coEvery { api.update() } returns StatusAndData( | ||||
|         coEvery { api.update() } returns | ||||
|             StatusAndData( | ||||
|                 success = true, | ||||
|             data = "undocumented..." | ||||
|                 data = "undocumented...", | ||||
|             ) | ||||
|  | ||||
|         initializeRepository(MutableStateFlow(false)) | ||||
| @@ -1037,7 +1056,7 @@ class RepositoryTest { | ||||
|             appSettingsService.refreshLoginInformation( | ||||
|                 BASE_URL, | ||||
|                 "login", | ||||
|                 "password" | ||||
|                 "password", | ||||
|             ) | ||||
|         } | ||||
|     } | ||||
| @@ -1057,9 +1076,10 @@ class RepositoryTest { | ||||
|                 any(), | ||||
|                 any(), | ||||
|                 any(), | ||||
|                 any() | ||||
|                 any(), | ||||
|             ) | ||||
|         } returnsMany listOf( | ||||
|         } returnsMany | ||||
|             listOf( | ||||
|                 StatusAndData(success = true, data = generateTestApiItem(itemParameter1)), | ||||
|                 StatusAndData(success = true, data = generateTestApiItem(itemParameter2)), | ||||
|                 StatusAndData(success = true, data = generateTestApiItem(itemParameter1)), | ||||
| @@ -1113,8 +1133,8 @@ class RepositoryTest { | ||||
|                 SPOUT, | ||||
|                 "", | ||||
|                 IMAGE_URL_2, | ||||
|                 SelfossModel.SourceParams("url") | ||||
|             ) | ||||
|                 SelfossModel.SourceParams("url"), | ||||
|             ), | ||||
|         ) | ||||
|         repository.searchFilter = "search" | ||||
|     } | ||||
|   | ||||
| @@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.repository | ||||
| import bou.amine.apps.readerforselfossv2.dao.ITEM | ||||
| import bou.amine.apps.readerforselfossv2.model.SelfossModel | ||||
|  | ||||
|  | ||||
| fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<ITEM> { | ||||
|     return listOf( | ||||
|         ITEM( | ||||
| @@ -18,8 +17,8 @@ fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<I | ||||
|             link = item.link, | ||||
|             sourcetitle = item.sourcetitle, | ||||
|             tags = item.tags, | ||||
|             author = item.author | ||||
|         ) | ||||
|             author = item.author, | ||||
|         ), | ||||
|     ) | ||||
| } | ||||
|  | ||||
| @@ -37,8 +36,8 @@ fun generateTestApiItem(item: FakeItemParameters = FakeItemParameters()): List<S | ||||
|             link = item.link, | ||||
|             sourcetitle = item.sourcetitle, | ||||
|             tags = item.tags.split(','), | ||||
|             author = item.author | ||||
|         ) | ||||
|             author = item.author, | ||||
|         ), | ||||
|     ) | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -17,7 +17,6 @@ plugins { | ||||
|  | ||||
| allprojects { | ||||
|     repositories { | ||||
|         // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")} | ||||
|         google() | ||||
|         mavenCentral() | ||||
|         maven { url = uri("https://www.jitpack.io") } | ||||
|   | ||||
| @@ -68,9 +68,9 @@ redirect_from: "/ReaderforSelfoss-multiplatform/" | ||||
|             <div id="links"> | ||||
|  | ||||
|  | ||||
|                 <a class="github-button" href="https://gitea.amine-louveau.fr/Louvorg/readerforselfoss-multiplatform" data-size="large" aria-label="Star aminecmi/readerforselfoss-multiplatform on GitHub">Star</a> | ||||
|                 <a class="github-button" href="https://gitea.amine-bouabdallaoui.fr/Louvorg/readerforselfoss-multiplatform" data-size="large" aria-label="Star aminecmi/readerforselfoss-multiplatform on GitHub">Star</a> | ||||
|             </div> | ||||
|             <meta itemprop="url" content="https://gitea.amine-louveau.fr/Louvorg/readerforselfoss-multiplatform"> | ||||
|             <meta itemprop="url" content="https://gitea.amine-bouabdallaoui.fr/Louvorg/readerforselfoss-multiplatform"> | ||||
|             <meta itemprop="applicationCategory" content="News & Magazines"> | ||||
|         </div> | ||||
|     </body> | ||||
|   | ||||
| @@ -1,6 +1,5 @@ | ||||
| pluginManagement { | ||||
|     repositories { | ||||
|         // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")} | ||||
|         google() | ||||
|         gradlePluginPortal() | ||||
|         mavenCentral() | ||||
| @@ -9,7 +8,6 @@ pluginManagement { | ||||
|  | ||||
| dependencyResolutionManagement { | ||||
|     repositories { | ||||
|         // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")} | ||||
|         google() | ||||
|         mavenCentral() | ||||
|     } | ||||
|   | ||||
| @@ -5,9 +5,15 @@ import java.security.cert.X509Certificate | ||||
| import javax.net.ssl.X509TrustManager | ||||
|  | ||||
| class NaiveTrustManager : X509TrustManager { | ||||
|     override fun checkClientTrusted(chain: Array<out X509Certificate>?, authType: String?) {} | ||||
|     override fun checkClientTrusted( | ||||
|         chain: Array<out X509Certificate>?, | ||||
|         authType: String?, | ||||
|     ) {} | ||||
|  | ||||
|     override fun checkServerTrusted(chain: Array<out X509Certificate>?, authType: String?) {} | ||||
|     override fun checkServerTrusted( | ||||
|         chain: Array<out X509Certificate>?, | ||||
|         authType: String?, | ||||
|     ) {} | ||||
|  | ||||
|     override fun getAcceptedIssuers(): Array<out X509Certificate> = arrayOf() | ||||
| } | ||||
|   | ||||
| @@ -1,41 +1,47 @@ | ||||
| package bou.amine.apps.readerforselfossv2.utils | ||||
|  | ||||
| import android.text.format.DateUtils | ||||
| import io.github.aakira.napier.Napier | ||||
| import kotlinx.datetime.* | ||||
|  | ||||
|  | ||||
| actual class DateUtils { | ||||
|     actual companion object { | ||||
|  | ||||
|         // Possible formats are | ||||
|         // yyyy-mm-dd hh:mm:ss format | ||||
|         private val oldVersionFormat = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}(.()\\d*)?".toRegex() | ||||
|  | ||||
|         // yyyy-MM-dd'T'HH:mm:ss[.SSS]XXX (RFC3339) | ||||
|         private val newVersionFormat = "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\+\\d{2}(:\\d{2})?".toRegex() | ||||
|  | ||||
|         // We may need to consider moving the formatting to platform specific code, even if the tests are doubled | ||||
|         // For now, we handle this in a hacky way, because kotlin only accepts iso formats | ||||
|         actual fun parseDate(dateString: String): Long { | ||||
|             var isoDateString: String = if (dateString.matches(oldVersionFormat)) { | ||||
|             var isoDateString: String = | ||||
|                 try { | ||||
|                     if (dateString.matches(oldVersionFormat)) { | ||||
|                         dateString.replace(" ", "T") | ||||
|                     } else if (dateString.matches(newVersionFormat)) { | ||||
|                         dateString.split("+")[0] | ||||
|                     } else { | ||||
|                         throw Exception("Unrecognized format for $dateString") | ||||
|                     } | ||||
|                 } catch (e: Exception) { | ||||
|                     Napier.e(e.stackTraceToString(), tag = "DateUtils.parseDate") | ||||
|                     "1991-03-18T03:00:00" | ||||
|                 } | ||||
|  | ||||
|             return LocalDateTime.parse(isoDateString).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds() | ||||
|         } | ||||
|  | ||||
|         actual fun parseRelativeDate(dateString: String): String { | ||||
|  | ||||
|             val date = parseDate(dateString) | ||||
|  | ||||
|             return " " + DateUtils.getRelativeTimeSpanString( | ||||
|             return " " + | ||||
|                 DateUtils.getRelativeTimeSpanString( | ||||
|                     date, | ||||
|                     Clock.System.now().toEpochMilliseconds(), | ||||
|                     DateUtils.MINUTE_IN_MILLIS, | ||||
|                 DateUtils.FORMAT_ABBREV_RELATIVE | ||||
|                     DateUtils.FORMAT_ABBREV_RELATIVE, | ||||
|                 ) | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -26,8 +26,8 @@ actual fun SelfossModel.Item.getImages(): ArrayList<String> { | ||||
|         if (url.lowercase(Locale.US).contains(".jpg") || | ||||
|             url.lowercase(Locale.US).contains(".jpeg") || | ||||
|             url.lowercase(Locale.US).contains(".png") || | ||||
|             url.lowercase(Locale.US).contains(".webp")) | ||||
|         { | ||||
|             url.lowercase(Locale.US).contains(".webp") | ||||
|         ) { | ||||
|             allImages.add(url) | ||||
|         } | ||||
|     } | ||||
| @@ -38,7 +38,11 @@ actual fun SelfossModel.Source.getIcon(baseUrl: String): String { | ||||
|     return constructUrl(baseUrl, "favicons", icon) | ||||
| } | ||||
|  | ||||
| actual fun constructUrl(baseUrl: String, path: String, file: String?): String { | ||||
| actual fun constructUrl( | ||||
|     baseUrl: String, | ||||
|     path: String, | ||||
|     file: String?, | ||||
| ): String { | ||||
|     return if (file == null || file == "null" || file.isEmpty()) { | ||||
|         "" | ||||
|     } else { | ||||
|   | ||||
| @@ -2,7 +2,6 @@ package bou.amine.apps.readerforselfossv2.DI | ||||
|  | ||||
| import bou.amine.apps.readerforselfossv2.rest.MercuryApi | ||||
| import bou.amine.apps.readerforselfossv2.rest.SelfossApi | ||||
| import bou.amine.apps.readerforselfossv2.service.AppSettingsService | ||||
| import org.kodein.di.DI | ||||
| import org.kodein.di.bind | ||||
| import org.kodein.di.instance | ||||
|   | ||||
| @@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.model | ||||
| import kotlinx.serialization.Serializable | ||||
|  | ||||
| class MercuryModel { | ||||
|  | ||||
|     @Serializable | ||||
|     class ParsedContent( | ||||
|         val title: String? = null, | ||||
| @@ -12,6 +11,6 @@ class MercuryModel { | ||||
|         val url: String? = null, | ||||
|         val error: Boolean? = null, | ||||
|         val message: String? = null, | ||||
|         val failed: Boolean? = null | ||||
|         val failed: Boolean? = null, | ||||
|     ) | ||||
| } | ||||
|   | ||||
| @@ -13,32 +13,31 @@ import kotlinx.serialization.encoding.encodeCollection | ||||
| import kotlinx.serialization.json.* | ||||
|  | ||||
| class SelfossModel { | ||||
|  | ||||
|     @Serializable | ||||
|     data class Tag( | ||||
|         val tag: String, | ||||
|         val color: String, | ||||
|         val unread: Int | ||||
|         val unread: Int, | ||||
|     ) | ||||
|  | ||||
|     @Serializable | ||||
|     class Stats( | ||||
|         val total: Int, | ||||
|         val unread: Int? = null, | ||||
|         val starred: Int? = null | ||||
|         val starred: Int? = null, | ||||
|     ) | ||||
|  | ||||
|     @Serializable | ||||
|     data class Spout( | ||||
|         val name: String, | ||||
|         val description: String | ||||
|         val description: String, | ||||
|     ) | ||||
|  | ||||
|     @Serializable | ||||
|     data class ApiInformation( | ||||
|         val version: String? = null, | ||||
|         val apiversion: String? = null, | ||||
|         val configuration: ApiConfiguration? = null | ||||
|         val configuration: ApiConfiguration? = null, | ||||
|     ) { | ||||
|         fun getApiMajorVersion(): Int { | ||||
|             var versionNumber = 0 | ||||
| @@ -56,7 +55,7 @@ class SelfossModel { | ||||
|         @Serializable(with = BooleanSerializer::class) | ||||
|         val publicMode: Boolean? = null, | ||||
|         @Serializable(with = BooleanSerializer::class) | ||||
|         val authEnabled: Boolean? = null | ||||
|         val authEnabled: Boolean? = null, | ||||
|     ) { | ||||
|         fun isAuthEnabled() = authEnabled ?: true | ||||
|  | ||||
| @@ -77,7 +76,7 @@ class SelfossModel { | ||||
|         override var title: String, | ||||
|         override var unread: Int? = null, | ||||
|         override var error: String? = null, | ||||
|         override var icon: String? = null | ||||
|         override var icon: String? = null, | ||||
|     ) : Source | ||||
|  | ||||
|     @Serializable | ||||
| @@ -90,13 +89,14 @@ class SelfossModel { | ||||
|         var spout: String? = null, | ||||
|         override var error: String? = null, | ||||
|         override var icon: String? = null, | ||||
|         var params: SourceParams? = null | ||||
|         var params: SourceParams? = null, | ||||
|     ) : Source | ||||
|  | ||||
|     @Serializable | ||||
|     data class SourceParams( | ||||
|         val url: String? = null | ||||
|         val url: String? = null, | ||||
|     ) | ||||
|  | ||||
|     @Serializable | ||||
|     data class Item( | ||||
|         val id: Int, | ||||
| @@ -113,11 +113,12 @@ class SelfossModel { | ||||
|         val sourcetitle: String, | ||||
|         @Serializable(with = TagsListSerializer::class) | ||||
|         val tags: List<String>, | ||||
|         val author: String? = null | ||||
|         val author: String? = null, | ||||
|     ) { | ||||
|         fun getLinkDecoded(): String { | ||||
|             var stringUrl: String | ||||
|             stringUrl = if (link.contains("//news.google.com/news/") && link.contains("&url=")) { | ||||
|             stringUrl = | ||||
|                 if (link.contains("//news.google.com/news/") && link.contains("&url=")) { | ||||
|                     link.substringAfter("&url=") | ||||
|                 } else { | ||||
|                     this.link.replace("&", "&") | ||||
| @@ -151,7 +152,6 @@ class SelfossModel { | ||||
|         } | ||||
|     } | ||||
|  | ||||
|  | ||||
|     // TODO: this seems to be super slow. | ||||
|     object TagsListSerializer : KSerializer<List<String>> { | ||||
|         override fun deserialize(decoder: Decoder): List<String> { | ||||
| @@ -159,13 +159,15 @@ class SelfossModel { | ||||
|                 is JsonArray -> json.toList().map { it.toString().replace("^\"|\"$".toRegex(), "") } | ||||
|                 else -> json.toString().split(",") | ||||
|             } | ||||
|  | ||||
|         } | ||||
|  | ||||
|         override val descriptor: SerialDescriptor | ||||
|             get() = PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING) | ||||
|  | ||||
|         override fun serialize(encoder: Encoder, value: List<String>) { | ||||
|         override fun serialize( | ||||
|             encoder: Encoder, | ||||
|             value: List<String>, | ||||
|         ) { | ||||
|             encoder.encodeCollection(PrimitiveSerialDescriptor("tags", PrimitiveKind.STRING), value.size) { this.toString() } | ||||
|         } | ||||
|     } | ||||
| @@ -183,7 +185,10 @@ class SelfossModel { | ||||
|         override val descriptor: SerialDescriptor | ||||
|             get() = PrimitiveSerialDescriptor("b", PrimitiveKind.BOOLEAN) | ||||
|  | ||||
|         override fun serialize(encoder: Encoder, value: Boolean) { | ||||
|         override fun serialize( | ||||
|             encoder: Encoder, | ||||
|             value: Boolean, | ||||
|         ) { | ||||
|             TODO("Not yet implemented") | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -8,7 +8,6 @@ import bou.amine.apps.readerforselfossv2.rest.SelfossApi | ||||
| import bou.amine.apps.readerforselfossv2.service.AppSettingsService | ||||
| import bou.amine.apps.readerforselfossv2.utils.* | ||||
| import io.github.aakira.napier.Napier | ||||
| import io.ktor.client.call.* | ||||
| import kotlinx.coroutines.CoroutineScope | ||||
| import kotlinx.coroutines.Dispatchers | ||||
| import kotlinx.coroutines.flow.MutableStateFlow | ||||
| @@ -19,9 +18,8 @@ class Repository( | ||||
|     private val api: SelfossApi, | ||||
|     private val appSettingsService: AppSettingsService, | ||||
|     val isConnectionAvailable: MutableStateFlow<Boolean>, | ||||
|     private val db: ReaderForSelfossDB | ||||
|     private val db: ReaderForSelfossDB, | ||||
| ) { | ||||
|  | ||||
|     var items = ArrayList<SelfossModel.Item>() | ||||
|     var connectionMonitored = false | ||||
|  | ||||
| @@ -53,16 +51,18 @@ class Repository( | ||||
|     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> { | ||||
|         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error() | ||||
|         if (isNetworkAvailable()) { | ||||
|             fetchedItems = api.getItems( | ||||
|             fetchedItems = | ||||
|                 api.getItems( | ||||
|                     displayedItems.type, | ||||
|                     offset = 0, | ||||
|                     tagFilter.value?.tag, | ||||
|                     sourceFilter.value?.id?.toLong(), | ||||
|                     searchFilter, | ||||
|                 null | ||||
|                     null, | ||||
|                 ) | ||||
|         } else if (appSettingsService.isItemCachingEnabled()) { | ||||
|             var dbItems = getDBItems().filter { | ||||
|             var dbItems = | ||||
|                 getDBItems().filter { | ||||
|                     displayedItems == ItemType.ALL || | ||||
|                         (it.unread && displayedItems == ItemType.UNREAD) || | ||||
|                         (it.starred && displayedItems == ItemType.STARRED) | ||||
| @@ -75,8 +75,9 @@ class Repository( | ||||
|             } | ||||
|             val itemsList = ArrayList(dbItems.map { it.toView() }) | ||||
|             itemsList.sortByDescending { DateUtils.parseDate(it.datetime) } | ||||
|             fetchedItems = StatusAndData.succes( | ||||
|                 itemsList | ||||
|             fetchedItems = | ||||
|                 StatusAndData.succes( | ||||
|                     itemsList, | ||||
|                 ) | ||||
|         } | ||||
|  | ||||
| @@ -90,13 +91,14 @@ class Repository( | ||||
|         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error() | ||||
|         if (isNetworkAvailable()) { | ||||
|             val offset = items.size | ||||
|             fetchedItems = api.getItems( | ||||
|             fetchedItems = | ||||
|                 api.getItems( | ||||
|                     displayedItems.type, | ||||
|                     offset, | ||||
|                     tagFilter.value?.tag, | ||||
|                     sourceFilter.value?.id?.toLong(), | ||||
|                     searchFilter, | ||||
|                 null | ||||
|                     null, | ||||
|                 ) | ||||
|         } // When using the db cache, we load everything the first time, so there should be nothing more to load. | ||||
|  | ||||
| @@ -108,14 +110,15 @@ class Repository( | ||||
|  | ||||
|     private suspend fun getMaxItemsForBackground(itemType: ItemType): List<SelfossModel.Item> { | ||||
|         return if (isNetworkAvailable()) { | ||||
|             val items = api.getItems( | ||||
|             val items = | ||||
|                 api.getItems( | ||||
|                     itemType.type, | ||||
|                     0, | ||||
|                     null, | ||||
|                     null, | ||||
|                     null, | ||||
|                     null, | ||||
|                 200 | ||||
|                     200, | ||||
|                 ) | ||||
|             return if (items.success && items.data != null) { | ||||
|                 items.data | ||||
| @@ -374,7 +377,7 @@ class Repository( | ||||
|         title: String, | ||||
|         url: String, | ||||
|         spout: String, | ||||
|         tags: String | ||||
|         tags: String, | ||||
|     ): Boolean { | ||||
|         var response = false | ||||
|         if (isNetworkAvailable()) { | ||||
| @@ -384,7 +387,10 @@ class Repository( | ||||
|         return response | ||||
|     } | ||||
|  | ||||
|     suspend fun deleteSource(id: Int, title: String): Boolean { | ||||
|     suspend fun deleteSource( | ||||
|         id: Int, | ||||
|         title: String, | ||||
|     ): Boolean { | ||||
|         var success = false | ||||
|         if (isNetworkAvailable()) { | ||||
|             val response = api.deleteSource(id) | ||||
| @@ -422,22 +428,19 @@ class Repository( | ||||
|         return result | ||||
|     } | ||||
|  | ||||
|     suspend fun shouldBeSelfossInstance(): Pair<Boolean, Boolean> { | ||||
|     suspend fun checkIfFetchFails(): Boolean { | ||||
|         var fetchFailed = true | ||||
|         var showSelfossOnlyModal = false | ||||
|         if (isNetworkAvailable()) { | ||||
|             try { | ||||
|                 // Trying to fetch one item, and check someone is trying to use the app with | ||||
|                 // a random rss feed, that would throw a NoTransformationFoundException | ||||
|                 fetchFailed = !api.getItemsWithoutCatch().success | ||||
|             } catch (e: NoTransformationFoundException) { | ||||
|                 showSelfossOnlyModal = true | ||||
|             } catch (e: Throwable) { | ||||
|                 Napier.e(e.stackTraceToString(), tag = "RepositoryImpl.shouldBeSelfossInstance") | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         return Pair(fetchFailed, showSelfossOnlyModal) | ||||
|         return fetchFailed | ||||
|     } | ||||
|  | ||||
|     suspend fun logout() { | ||||
| @@ -456,7 +459,11 @@ class Repository( | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     fun refreshLoginInformation(url: String, login: String, password: String) { | ||||
|     fun refreshLoginInformation( | ||||
|         url: String, | ||||
|         login: String, | ||||
|         password: String, | ||||
|     ) { | ||||
|         appSettingsService.refreshLoginInformation(url, login, password) | ||||
|         baseUrl = url | ||||
|         api.refreshLoginInformation() | ||||
| @@ -474,9 +481,10 @@ class Repository( | ||||
|                 // Check if we're accessing the instance in public mode | ||||
|                 // This happens when auth and public mode are enabled but | ||||
|                 // no credentials are provided to login | ||||
|                 if (appSettingsService.getUserName().isEmpty() | ||||
|                     && fetchedInformation.data.getApiConfiguration().isAuthEnabled() | ||||
|                     && fetchedInformation.data.getApiConfiguration().isPublicModeEnabled()) { | ||||
|                 if (appSettingsService.getUserName().isEmpty() && | ||||
|                     fetchedInformation.data.getApiConfiguration().isAuthEnabled() && | ||||
|                     fetchedInformation.data.getApiConfiguration().isPublicModeEnabled() | ||||
|                 ) { | ||||
|                     appSettingsService.updatePublicAccess(true) | ||||
|                 } | ||||
|             } | ||||
| @@ -485,11 +493,9 @@ class Repository( | ||||
|  | ||||
|     fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride | ||||
|  | ||||
|     private fun getDBActions(): List<ACTION> = | ||||
|         db.actionsQueries.actions().executeAsList() | ||||
|     private fun getDBActions(): List<ACTION> = db.actionsQueries.actions().executeAsList() | ||||
|  | ||||
|     private fun deleteDBAction(action: ACTION) = | ||||
|         db.actionsQueries.deleteAction(action.id) | ||||
|     private fun deleteDBAction(action: ACTION) = db.actionsQueries.deleteAction(action.id) | ||||
|  | ||||
|     private fun getDBTags(): List<TAG> = db.tagsQueries.tags().executeAsList() | ||||
|  | ||||
| @@ -530,9 +536,8 @@ class Repository( | ||||
|         read: Boolean = false, | ||||
|         unread: Boolean = false, | ||||
|         starred: Boolean = false, | ||||
|         unstarred: Boolean = false | ||||
|     ) = | ||||
|         db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred) | ||||
|         unstarred: Boolean = false, | ||||
|     ) = db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred) | ||||
|  | ||||
|     private fun updateDBItem(item: SelfossModel.Item) = | ||||
|         db.itemsQueries.updateItem( | ||||
| @@ -547,7 +552,7 @@ class Repository( | ||||
|             item.sourcetitle, | ||||
|             item.tags.joinToString(","), | ||||
|             item.author, | ||||
|             item.id.toString() | ||||
|             item.id.toString(), | ||||
|         ) | ||||
|  | ||||
|     suspend fun tryToCacheItemsAndGetNewOnes(): List<SelfossModel.Item> { | ||||
| @@ -564,32 +569,38 @@ class Repository( | ||||
|     } | ||||
|  | ||||
|     suspend fun handleDBActions() { | ||||
|  | ||||
|         val actions: List<ACTION> = getDBActions() | ||||
|  | ||||
|         actions.forEach { action -> | ||||
|             when { | ||||
|                 action.read -> doAndReportOnFail( | ||||
|                 action.read -> | ||||
|                     doAndReportOnFail( | ||||
|                         markAsReadById(action.articleid.toInt()), | ||||
|                     action | ||||
|                         action, | ||||
|                     ) | ||||
|                 action.unread -> doAndReportOnFail( | ||||
|                 action.unread -> | ||||
|                     doAndReportOnFail( | ||||
|                         unmarkAsReadById(action.articleid.toInt()), | ||||
|                     action | ||||
|                         action, | ||||
|                     ) | ||||
|                 action.starred -> doAndReportOnFail( | ||||
|                 action.starred -> | ||||
|                     doAndReportOnFail( | ||||
|                         starrById(action.articleid.toInt()), | ||||
|                     action | ||||
|                         action, | ||||
|                     ) | ||||
|                 action.unstarred -> doAndReportOnFail( | ||||
|                 action.unstarred -> | ||||
|                     doAndReportOnFail( | ||||
|                         unstarrById(action.articleid.toInt()), | ||||
|                     action | ||||
|                         action, | ||||
|                     ) | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private fun doAndReportOnFail(result: Boolean, action: ACTION) { | ||||
|     private fun doAndReportOnFail( | ||||
|         result: Boolean, | ||||
|         action: ACTION, | ||||
|     ) { | ||||
|         if (result) { | ||||
|             deleteDBAction(action) | ||||
|         } | ||||
|   | ||||
| @@ -11,21 +11,23 @@ import io.ktor.serialization.kotlinx.json.* | ||||
| import kotlinx.serialization.json.Json | ||||
|  | ||||
| class MercuryApi() { | ||||
|  | ||||
|     var client = createHttpClient() | ||||
|  | ||||
|     private fun createHttpClient(): HttpClient { | ||||
|         return HttpClient { | ||||
|             install(ContentNegotiation) { | ||||
|                 install(HttpCache) | ||||
|                 json(Json { | ||||
|                 json( | ||||
|                     Json { | ||||
|                         prettyPrint = true | ||||
|                         isLenient = true | ||||
|                         ignoreUnknownKeys = true | ||||
|                 }) | ||||
|                     }, | ||||
|                 ) | ||||
|             } | ||||
|             install(Logging) { | ||||
|                 logger = object : Logger { | ||||
|                 logger = | ||||
|                     object : Logger { | ||||
|                         override fun log(message: String) { | ||||
|                             Napier.d(message, tag = "LogMercuryCalls") | ||||
|                         } | ||||
| @@ -37,7 +39,9 @@ class MercuryApi() { | ||||
|     } | ||||
|  | ||||
|     suspend fun query(url: String): StatusAndData<MercuryModel.ParsedContent> = | ||||
|         bodyOrFailure(client.get("https://amine-louveau.fr/parser.php") { | ||||
|         bodyOrFailure( | ||||
|             client.get("https://amine-bouabdallaoui.fr/parser.php") { | ||||
|                 parameter("link", url) | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
| } | ||||
| @@ -10,7 +10,6 @@ import io.ktor.client.request.forms.* | ||||
| import io.ktor.client.statement.* | ||||
| import io.ktor.http.* | ||||
|  | ||||
|  | ||||
| suspend fun responseOrSuccessIf404(r: HttpResponse?): SuccessResponse { | ||||
|     return if (r != null && r.status === HttpStatusCode.NotFound) { | ||||
|         SuccessResponse(true) | ||||
| @@ -40,7 +39,7 @@ suspend inline fun <reified T> bodyOrFailure(r: HttpResponse?): StatusAndData<T> | ||||
|  | ||||
| inline fun tryToRequest( | ||||
|     requestType: String, | ||||
|     fn: () -> HttpResponse | ||||
|     fn: () -> HttpResponse, | ||||
| ): HttpResponse? { | ||||
|     var response: HttpResponse? = null | ||||
|     try { | ||||
| @@ -53,26 +52,42 @@ inline fun tryToRequest( | ||||
|  | ||||
| suspend inline fun HttpClient.tryToGet( | ||||
|     urlString: String, | ||||
|     crossinline block: HttpRequestBuilder.() -> Unit = {} | ||||
| ): HttpResponse? = tryToRequest("Get") { return this.get { url(urlString); block() } } | ||||
|  | ||||
|     crossinline block: HttpRequestBuilder.() -> Unit = {}, | ||||
| ): HttpResponse? = | ||||
|     tryToRequest("Get") { | ||||
|         return this.get { | ||||
|             url(urlString) | ||||
|             block() | ||||
|         } | ||||
|     } | ||||
|  | ||||
| suspend inline fun HttpClient.tryToPost( | ||||
|     urlString: String, | ||||
|     block: HttpRequestBuilder.() -> Unit = {} | ||||
| ): HttpResponse? = tryToRequest("Post") { return this.post { url(urlString); block() } } | ||||
|     block: HttpRequestBuilder.() -> Unit = {}, | ||||
| ): HttpResponse? = | ||||
|     tryToRequest("Post") { | ||||
|         return this.post { | ||||
|             url(urlString) | ||||
|             block() | ||||
|         } | ||||
|     } | ||||
|  | ||||
| suspend inline fun HttpClient.tryToDelete( | ||||
|     urlString: String, | ||||
|     block: HttpRequestBuilder.() -> Unit = {} | ||||
| ): HttpResponse? = tryToRequest("Delete") { return this.delete { url(urlString); block() } } | ||||
|  | ||||
|     block: HttpRequestBuilder.() -> Unit = {}, | ||||
| ): HttpResponse? = | ||||
|     tryToRequest("Delete") { | ||||
|         return this.delete { | ||||
|             url(urlString) | ||||
|             block() | ||||
|         } | ||||
|     } | ||||
|  | ||||
| suspend fun HttpClient.tryToSubmitForm( | ||||
|     url: String, | ||||
|     formParameters: Parameters = Parameters.Empty, | ||||
|     encodeInQuery: Boolean = false, | ||||
|     block: HttpRequestBuilder.() -> Unit = {} | ||||
|     block: HttpRequestBuilder.() -> Unit = {}, | ||||
| ): HttpResponse? = | ||||
|     tryToRequest("SubmitForm") { | ||||
|         return this.submitForm(formParameters, encodeInQuery) { | ||||
|   | ||||
| @@ -36,8 +36,8 @@ import kotlinx.serialization.json.Json | ||||
| expect fun setupInsecureHTTPEngine(config: CIOEngineConfig) | ||||
|  | ||||
| class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|  | ||||
|     var client = createHttpClient() | ||||
|  | ||||
|     fun createHttpClient() = | ||||
|         HttpClient(CIO) { | ||||
|             if (appSettingsService.getSelfSigned()) { | ||||
| @@ -47,15 +47,18 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|             } | ||||
|             install(ContentNegotiation) { | ||||
|                 install(HttpCache) | ||||
|                 json(Json { | ||||
|                 json( | ||||
|                     Json { | ||||
|                         prettyPrint = true | ||||
|                         isLenient = true | ||||
|                         ignoreUnknownKeys = true | ||||
|                         explicitNulls = false | ||||
|                 }) | ||||
|                     }, | ||||
|                 ) | ||||
|             } | ||||
|             install(Logging) { | ||||
|                 logger = object : Logger { | ||||
|                 logger = | ||||
|                     object : Logger { | ||||
|                         override fun log(message: String) { | ||||
|                             Napier.d(message, tag = "LogApiCalls") | ||||
|                         } | ||||
| @@ -83,8 +86,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|             expectSuccess = false | ||||
|         } | ||||
|  | ||||
|     fun url(path: String) = | ||||
|         "${appSettingsService.getBaseUrl()}$path" | ||||
|     fun url(path: String) = "${appSettingsService.getBaseUrl()}$path" | ||||
|  | ||||
|     fun refreshLoginInformation() { | ||||
|         appSettingsService.refreshApiSettings() | ||||
| @@ -100,12 +102,15 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|  | ||||
|     // Api version was introduces after the POST login, so when there is a version, it should be available | ||||
|     private fun shouldHavePostLogin() = appSettingsService.getApiVersion() != -1 | ||||
|  | ||||
|     private fun hasLoginInfo() = | ||||
|         appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword() | ||||
|         appSettingsService.getUserName().isNotEmpty() && | ||||
|             appSettingsService.getPassword() | ||||
|                 .isNotEmpty() | ||||
|  | ||||
|     suspend fun login(): SuccessResponse = | ||||
|         if (appSettingsService.getUserName().isNotEmpty() && appSettingsService.getPassword() | ||||
|         if (appSettingsService.getUserName().isNotEmpty() && | ||||
|             appSettingsService.getPassword() | ||||
|                 .isNotEmpty() | ||||
|         ) { | ||||
|             if (shouldHavePostLogin()) { | ||||
| @@ -117,30 +122,49 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|             SuccessResponse(true) | ||||
|         } | ||||
|  | ||||
|     private suspend fun getLogin() = maybeResponse(client.tryToGet(url("/login")) { | ||||
|     private suspend fun getLogin() = | ||||
|         maybeResponse( | ||||
|             client.tryToGet(url("/login")) { | ||||
|                 parameter("username", appSettingsService.getUserName()) | ||||
|                 parameter("password", appSettingsService.getPassword()) | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                 append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|     }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     private suspend fun postLogin() = maybeResponse(client.tryToPost(url("/login")) { | ||||
|     private suspend fun postLogin() = | ||||
|         maybeResponse( | ||||
|             client.tryToPost(url("/login")) { | ||||
|                 parameter("username", appSettingsService.getUserName()) | ||||
|                 parameter("password", appSettingsService.getPassword()) | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                 append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|     }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     private fun shouldHaveNewLogout() = | ||||
|         appSettingsService.getApiVersion() >= 5 // We are missing 4.1.0 | ||||
|     private fun shouldHaveNewLogout() = appSettingsService.getApiVersion() >= 5 // We are missing 4.1.0 | ||||
|  | ||||
|     suspend fun logout(): SuccessResponse = | ||||
|         if (shouldHaveNewLogout()) { | ||||
| @@ -150,23 +174,42 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|         } | ||||
|  | ||||
|     private suspend fun maybeLogoutIfAvailable() = | ||||
|         responseOrSuccessIf404(client.tryToGet(url("/logout")) { | ||||
|         responseOrSuccessIf404( | ||||
|             client.tryToGet(url("/logout")) { | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     private suspend fun doLogout() = maybeResponse(client.tryToDelete(url("/api/session/current")) { | ||||
|     private suspend fun doLogout() = | ||||
|         maybeResponse( | ||||
|             client.tryToDelete(url("/api/session/current")) { | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                 append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|     }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun getItems( | ||||
|         type: String, | ||||
| @@ -175,9 +218,10 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|         source: Long?, | ||||
|         search: String?, | ||||
|         updatedSince: String?, | ||||
|         items: Int? = null | ||||
|         items: Int? = null, | ||||
|     ): StatusAndData<List<SelfossModel.Item>> = | ||||
|         bodyOrFailure(client.tryToGet(url("/items")) { | ||||
|         bodyOrFailure( | ||||
|             client.tryToGet(url("/items")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
| @@ -191,14 +235,23 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|                 parameter("offset", offset) | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun getItemsWithoutCatch(): StatusAndData<List<SelfossModel.Item>> = | ||||
|         bodyOrFailure(client.get(url("/items")) { | ||||
|         bodyOrFailure( | ||||
|             client.get(url("/items")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
| @@ -207,166 +260,275 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|                 parameter("items", 1) | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun stats(): StatusAndData<SelfossModel.Stats> = | ||||
|         bodyOrFailure(client.tryToGet(url("/stats")) { | ||||
|         bodyOrFailure( | ||||
|             client.tryToGet(url("/stats")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
|                 } | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun tags(): StatusAndData<List<SelfossModel.Tag>> = | ||||
|         bodyOrFailure(client.tryToGet(url("/tags")) { | ||||
|         bodyOrFailure( | ||||
|             client.tryToGet(url("/tags")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
|                 } | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun update(): StatusAndData<String> = | ||||
|         bodyOrFailure(client.tryToGet(url("/update")) { | ||||
|         bodyOrFailure( | ||||
|             client.tryToGet(url("/update")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
|                 } | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun spouts(): StatusAndData<Map<String, SelfossModel.Spout>> = | ||||
|         bodyOrFailure(client.tryToGet(url("/sources/spouts")) { | ||||
|         bodyOrFailure( | ||||
|             client.tryToGet(url("/sources/spouts")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
|                 } | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun sourcesStats(): StatusAndData<ArrayList<SelfossModel.SourceStats>> = | ||||
|         bodyOrFailure(client.tryToGet(url("/sources/stats")) { | ||||
|         bodyOrFailure( | ||||
|             client.tryToGet(url("/sources/stats")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
|                 } | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun sourcesDetailed(): StatusAndData<ArrayList<SelfossModel.SourceDetail>> = | ||||
|         bodyOrFailure(client.tryToGet(url("/sources/list")) { | ||||
|         bodyOrFailure( | ||||
|             client.tryToGet(url("/sources/list")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
|                 } | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun apiInformation(): StatusAndData<SelfossModel.ApiInformation> = | ||||
|         bodyOrFailure(client.tryToGet(url("/api/about")) { | ||||
|         bodyOrFailure( | ||||
|             client.tryToGet(url("/api/about")) { | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun markAsRead(id: String): SuccessResponse = | ||||
|         maybeResponse(client.tryToPost(url("/mark/$id")) { | ||||
|         maybeResponse( | ||||
|             client.tryToPost(url("/mark/$id")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
|                 } | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun unmarkAsRead(id: String): SuccessResponse = | ||||
|         maybeResponse(client.tryToPost(url("/unmark/$id")) { | ||||
|         maybeResponse( | ||||
|             client.tryToPost(url("/unmark/$id")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
|                 } | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun starr(id: String): SuccessResponse = | ||||
|         maybeResponse(client.tryToPost(url("/starr/$id")) { | ||||
|         maybeResponse( | ||||
|             client.tryToPost(url("/starr/$id")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
|                 } | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun unstarr(id: String): SuccessResponse = | ||||
|         maybeResponse(client.tryToPost(url("/unstarr/$id")) { | ||||
|         maybeResponse( | ||||
|             client.tryToPost(url("/unstarr/$id")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
|                 } | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                     append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun markAllAsRead(ids: List<String>): SuccessResponse = | ||||
|         maybeResponse(client.tryToSubmitForm( | ||||
|         maybeResponse( | ||||
|             client.tryToSubmitForm( | ||||
|                 url = url("/mark"), | ||||
|             formParameters = Parameters.build { | ||||
|                 formParameters = | ||||
|                     Parameters.build { | ||||
|                         if (!shouldHavePostLogin()) { | ||||
|                             append("username", appSettingsService.getUserName()) | ||||
|                             append("password", appSettingsService.getPassword()) | ||||
| @@ -376,12 +538,20 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|                 block = { | ||||
|                     if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                         headers { | ||||
|                         append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                             append( | ||||
|                                 HttpHeaders.Authorization, | ||||
|                                 constructBasicAuthValue( | ||||
|                                     BasicAuthCredentials( | ||||
|                                         username = appSettingsService.getBasicUserName(), | ||||
|                                         password = appSettingsService.getBasicPassword(), | ||||
|                                     ), | ||||
|                                 ), | ||||
|                             ) | ||||
|                         } | ||||
|                     } | ||||
|             } | ||||
|         )) | ||||
|                 }, | ||||
|             ), | ||||
|         ) | ||||
|  | ||||
|     suspend fun createSourceForVersion( | ||||
|         title: String, | ||||
| @@ -394,7 +564,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|                 createSource("tags[]", title, url, spout, tags) | ||||
|             } else { | ||||
|                 createSource("tags", title, url, spout, tags) | ||||
|             } | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     private suspend fun createSource( | ||||
| @@ -402,11 +572,12 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|         title: String, | ||||
|         url: String, | ||||
|         spout: String, | ||||
|         tags: String | ||||
|         tags: String, | ||||
|     ): HttpResponse? = | ||||
|         client.tryToSubmitForm( | ||||
|             url = url("/source"), | ||||
|             formParameters = Parameters.build { | ||||
|             formParameters = | ||||
|                 Parameters.build { | ||||
|                     if (!shouldHavePostLogin()) { | ||||
|                         append("username", appSettingsService.getUserName()) | ||||
|                         append("password", appSettingsService.getPassword()) | ||||
| @@ -419,11 +590,18 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|             block = { | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                         append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|             } | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun updateSourceForVersion( | ||||
| @@ -431,14 +609,14 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|         title: String, | ||||
|         url: String, | ||||
|         spout: String, | ||||
|         tags: String | ||||
|         tags: String, | ||||
|     ): SuccessResponse = | ||||
|         maybeResponse( | ||||
|             if (appSettingsService.getApiVersion() > 1) { | ||||
|                 updateSource(id, "tags[]", title, url, spout, tags) | ||||
|             } else { | ||||
|                 updateSource(id, "tags", title, url, spout, tags) | ||||
|             } | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     private suspend fun updateSource( | ||||
| @@ -451,7 +629,8 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|     ): HttpResponse? = | ||||
|         client.tryToSubmitForm( | ||||
|             url = url("/source/$id"), | ||||
|             formParameters = Parameters.build { | ||||
|             formParameters = | ||||
|                 Parameters.build { | ||||
|                     if (!shouldHavePostLogin()) { | ||||
|                         append("username", appSettingsService.getUserName()) | ||||
|                         append("password", appSettingsService.getPassword()) | ||||
| @@ -464,15 +643,23 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|             block = { | ||||
|                 if (appSettingsService.getBasicUserName().isNotEmpty() && appSettingsService.getBasicPassword().isNotEmpty()) { | ||||
|                     headers { | ||||
|                         append(HttpHeaders.Authorization, constructBasicAuthValue(BasicAuthCredentials(username = appSettingsService.getBasicUserName(), password = appSettingsService.getBasicPassword())) | ||||
|                         append( | ||||
|                             HttpHeaders.Authorization, | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|             } | ||||
|             }, | ||||
|         ) | ||||
|  | ||||
|     suspend fun deleteSource(id: Int): SuccessResponse = | ||||
|         maybeResponse(client.tryToDelete(url("/source/$id")) { | ||||
|         maybeResponse( | ||||
|             client.tryToDelete(url("/source/$id")) { | ||||
|                 if (!shouldHavePostLogin()) { | ||||
|                     parameter("username", appSettingsService.getUserName()) | ||||
|                     parameter("password", appSettingsService.getPassword()) | ||||
| @@ -484,11 +671,12 @@ class SelfossApi(private val appSettingsService: AppSettingsService) { | ||||
|                             constructBasicAuthValue( | ||||
|                                 BasicAuthCredentials( | ||||
|                                     username = appSettingsService.getBasicUserName(), | ||||
|                                 password = appSettingsService.getBasicPassword() | ||||
|                             ) | ||||
|                         ) | ||||
|                                     password = appSettingsService.getBasicPassword(), | ||||
|                                 ), | ||||
|                             ), | ||||
|                         ) | ||||
|                     } | ||||
|                 } | ||||
|         }) | ||||
|             }, | ||||
|         ) | ||||
| } | ||||
| @@ -13,58 +13,93 @@ class ACRASettings : Settings { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun getBoolean(key: String, defaultValue: Boolean): Boolean = false | ||||
|     override fun getBoolean( | ||||
|         key: String, | ||||
|         defaultValue: Boolean, | ||||
|     ): Boolean = false | ||||
|  | ||||
|     override fun getBooleanOrNull(key: String): Boolean? = null | ||||
|  | ||||
|     override fun getDouble(key: String, defaultValue: Double): Double = 0.0 | ||||
|     override fun getDouble( | ||||
|         key: String, | ||||
|         defaultValue: Double, | ||||
|     ): Double = 0.0 | ||||
|  | ||||
|     override fun getDoubleOrNull(key: String): Double? = null | ||||
|  | ||||
|     override fun getFloat(key: String, defaultValue: Float): Float = 0.0F | ||||
|     override fun getFloat( | ||||
|         key: String, | ||||
|         defaultValue: Float, | ||||
|     ): Float = 0.0F | ||||
|  | ||||
|     override fun getFloatOrNull(key: String): Float? = null | ||||
|  | ||||
|     override fun getInt(key: String, defaultValue: Int): Int = 0 | ||||
|     override fun getInt( | ||||
|         key: String, | ||||
|         defaultValue: Int, | ||||
|     ): Int = 0 | ||||
|  | ||||
|     override fun getIntOrNull(key: String): Int? = null | ||||
|  | ||||
|     override fun getLong(key: String, defaultValue: Long): Long = 0 | ||||
|     override fun getLong( | ||||
|         key: String, | ||||
|         defaultValue: Long, | ||||
|     ): Long = 0 | ||||
|  | ||||
|     override fun getLongOrNull(key: String): Long? = null | ||||
|  | ||||
|     override fun getString(key: String, defaultValue: String): String = "0" | ||||
|     override fun getString( | ||||
|         key: String, | ||||
|         defaultValue: String, | ||||
|     ): String = "0" | ||||
|  | ||||
|     override fun getStringOrNull(key: String): String? = null | ||||
|  | ||||
|     override fun hasKey(key: String): Boolean = false | ||||
|  | ||||
|     override fun putBoolean(key: String, value: Boolean) { | ||||
|     override fun putBoolean( | ||||
|         key: String, | ||||
|         value: Boolean, | ||||
|     ) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun putDouble(key: String, value: Double) { | ||||
|     override fun putDouble( | ||||
|         key: String, | ||||
|         value: Double, | ||||
|     ) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun putFloat(key: String, value: Float) { | ||||
|     override fun putFloat( | ||||
|         key: String, | ||||
|         value: Float, | ||||
|     ) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun putInt(key: String, value: Int) { | ||||
|     override fun putInt( | ||||
|         key: String, | ||||
|         value: Int, | ||||
|     ) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun putLong(key: String, value: Long) { | ||||
|     override fun putLong( | ||||
|         key: String, | ||||
|         value: Long, | ||||
|     ) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun putString(key: String, value: String) { | ||||
|     override fun putString( | ||||
|         key: String, | ||||
|         value: String, | ||||
|     ) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun remove(key: String) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
| } | ||||
| @@ -3,7 +3,12 @@ package bou.amine.apps.readerforselfossv2.service | ||||
| import com.russhwolf.settings.Settings | ||||
|  | ||||
| class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|     val settings: Settings = if (acraSenderServiceProcess) { ACRASettings() } else { Settings() } | ||||
|     val settings: Settings = | ||||
|         if (acraSenderServiceProcess) { | ||||
|             ACRASettings() | ||||
|         } else { | ||||
|             Settings() | ||||
|         } | ||||
|  | ||||
|     // Api related | ||||
|     private var _apiVersion: Int = -1 | ||||
| @@ -38,7 +43,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|     private var _font: String = "" | ||||
|     private var _theme: Int? = null | ||||
|  | ||||
|  | ||||
|     init { | ||||
|         refreshApiSettings() | ||||
|         refreshUserSettings() | ||||
| @@ -52,7 +56,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|         return _apiVersion | ||||
|     } | ||||
|  | ||||
|  | ||||
|     fun updateApiVersion(apiMajorVersion: Int) { | ||||
|         settings.putInt(API_VERSION_MAJOR, apiMajorVersion) | ||||
|         refreshApiVersion() | ||||
| @@ -137,13 +140,13 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|     } | ||||
|  | ||||
|     private fun refreshItemsNumber() { | ||||
|         _itemsNumber = try { | ||||
|         _itemsNumber = | ||||
|             try { | ||||
|                 settings.getString(API_ITEMS_NUMBER, "20").toInt() | ||||
|             } catch (e: Exception) { | ||||
|                 settings.remove(API_ITEMS_NUMBER) | ||||
|                 20 | ||||
|             } | ||||
|  | ||||
|     } | ||||
|  | ||||
|     fun getApiTimeout(): Long { | ||||
| @@ -156,7 +159,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|     private fun secToMs(n: Long) = n * 1000 | ||||
|  | ||||
|     private fun refreshApiTimeout() { | ||||
|         _apiTimeout = secToMs(try { | ||||
|         _apiTimeout = | ||||
|             secToMs( | ||||
|                 try { | ||||
|                     val settingsTimeout = settings.getString(API_TIMEOUT, "60") | ||||
|                     if (settingsTimeout.toLong() > 0) { | ||||
|                         settingsTimeout.toLong() | ||||
| @@ -167,7 +172,8 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|                 } catch (e: Exception) { | ||||
|                     settings.remove(API_TIMEOUT) | ||||
|                     60 | ||||
|         }) | ||||
|                 }, | ||||
|             ) | ||||
|     } | ||||
|  | ||||
|     private fun refreshBaseUrl() { | ||||
| @@ -200,6 +206,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|         } | ||||
|         return _articleViewer == true | ||||
|     } | ||||
|  | ||||
|     private fun refreshShouldBeCardViewEnabled() { | ||||
|         _shouldBeCardView = settings.getBoolean(CARD_VIEW_ACTIVE, false) | ||||
|     } | ||||
| @@ -210,6 +217,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|         } | ||||
|         return _shouldBeCardView == true | ||||
|     } | ||||
|  | ||||
|     private fun refreshDisplayUnreadCountEnabled() { | ||||
|         _displayUnreadCount = settings.getBoolean(DISPLAY_UNREAD_COUNT, true) | ||||
|     } | ||||
| @@ -220,6 +228,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|         } | ||||
|         return _displayUnreadCount == true | ||||
|     } | ||||
|  | ||||
|     private fun refreshDisplayAllCountEnabled() { | ||||
|         _displayAllCount = settings.getBoolean(DISPLAY_OTHER_COUNT, false) | ||||
|     } | ||||
| @@ -230,6 +239,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|         } | ||||
|         return _displayAllCount == true | ||||
|     } | ||||
|  | ||||
|     private fun refreshFullHeightCardsEnabled() { | ||||
|         _fullHeightCards = settings.getBoolean(FULL_HEIGHT_CARDS, false) | ||||
|     } | ||||
| @@ -240,6 +250,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|         } | ||||
|         return _fullHeightCards == true | ||||
|     } | ||||
|  | ||||
|     private fun refreshUpdateSourcesEnabled() { | ||||
|         _updateSources = settings.getBoolean(UPDATE_SOURCES, true) | ||||
|     } | ||||
| @@ -250,6 +261,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|         } | ||||
|         return _updateSources == true | ||||
|     } | ||||
|  | ||||
|     private fun refreshPeriodicRefreshEnabled() { | ||||
|         _periodicRefresh = settings.getBoolean(PERIODIC_REFRESH, false) | ||||
|     } | ||||
| @@ -319,7 +331,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|         return _notifyNewItems == true | ||||
|     } | ||||
|  | ||||
|  | ||||
|     private fun refreshMarkOnScrollEnabled() { | ||||
|         _markOnScroll = settings.getBoolean(MARK_ON_SCROLL, false) | ||||
|     } | ||||
| @@ -331,7 +342,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|         return _markOnScroll == true | ||||
|     } | ||||
|  | ||||
|  | ||||
|     private fun refreshActiveAllignment() { | ||||
|         _activeAlignment = settings.getInt(TEXT_ALIGN, JUSTIFY) | ||||
|     } | ||||
| @@ -429,7 +439,7 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|     fun refreshLoginInformation( | ||||
|         url: String, | ||||
|         login: String, | ||||
|         password: String | ||||
|         password: String, | ||||
|     ) { | ||||
|         val regex = """\/\/(\D+):(\D+)@""".toRegex() | ||||
|         val matchResult = regex.find(url) | ||||
| @@ -470,9 +480,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|     companion object { | ||||
|         const val translationUrl = "https://crwd.in/readerforselfoss" | ||||
|  | ||||
|         const val sourceUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform" | ||||
|         const val sourceUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform" | ||||
|  | ||||
|         const val trackerUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues" | ||||
|         const val trackerUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues" | ||||
|  | ||||
|         const val syncChannelId = "sync-channel-id" | ||||
|  | ||||
| @@ -537,6 +547,5 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|         const val ITEMS_CACHING = "items_caching" | ||||
|  | ||||
|         const val CURRENT_THEME = "currentMode" | ||||
|  | ||||
|     } | ||||
| } | ||||
| @@ -9,7 +9,7 @@ fun TAG.toView(): SelfossModel.Tag = | ||||
|     SelfossModel.Tag( | ||||
|         this.name, | ||||
|         this.color, | ||||
|         this.unread.toInt() | ||||
|         this.unread.toInt(), | ||||
|     ) | ||||
|  | ||||
| fun SOURCE.toView(): SelfossModel.SourceDetail = | ||||
| @@ -21,7 +21,7 @@ fun SOURCE.toView(): SelfossModel.SourceDetail = | ||||
|         this.spout, | ||||
|         this.error, | ||||
|         this.icon, | ||||
|         if (this.url != null) SelfossModel.SourceParams(this.url) else null | ||||
|         if (this.url != null) SelfossModel.SourceParams(this.url) else null, | ||||
|     ) | ||||
|  | ||||
| fun SelfossModel.SourceDetail.toEntity(): SOURCE = | ||||
| @@ -32,14 +32,14 @@ fun SelfossModel.SourceDetail.toEntity(): SOURCE = | ||||
|         this.spout.orEmpty(), | ||||
|         this.error.orEmpty(), | ||||
|         this.icon.orEmpty(), | ||||
|         this.params?.url | ||||
|         this.params?.url, | ||||
|     ) | ||||
|  | ||||
| fun SelfossModel.Tag.toEntity(): TAG = | ||||
|     TAG( | ||||
|         this.tag, | ||||
|         this.color, | ||||
|         this.unread.toLong() | ||||
|         this.unread.toLong(), | ||||
|     ) | ||||
|  | ||||
| fun ITEM.toView(): SelfossModel.Item = | ||||
| @@ -55,7 +55,7 @@ fun ITEM.toView(): SelfossModel.Item = | ||||
|         this.link, | ||||
|         this.sourcetitle, | ||||
|         this.tags.split(","), | ||||
|         this.author | ||||
|         this.author, | ||||
|     ) | ||||
|  | ||||
| fun SelfossModel.Item.toEntity(): ITEM = | ||||
| @@ -71,5 +71,15 @@ fun SelfossModel.Item.toEntity(): ITEM = | ||||
|         this.link, | ||||
|         this.sourcetitle.getHtmlDecoded(), | ||||
|         this.tags.joinToString(","), | ||||
|         this.author | ||||
|         this.author, | ||||
|     ) | ||||
|  | ||||
| fun SelfossModel.Tag.getColorHexCode(): String = | ||||
|     if (this.color.length == 4) { // #000 | ||||
|         val char1 = this.color.get(1) | ||||
|         val char2 = this.color.get(2) | ||||
|         val char3 = this.color.get(3) | ||||
|         "#$char1$char1$char2$char2$char3$char3" | ||||
|     } else { | ||||
|         this.color | ||||
|     } | ||||
| @@ -3,7 +3,8 @@ package bou.amine.apps.readerforselfossv2.utils | ||||
| enum class ItemType(val position: Int, val type: String) { | ||||
|     UNREAD(1, "unread"), | ||||
|     ALL(2, "all"), | ||||
|     STARRED(3, "starred"); | ||||
|     STARRED(3, "starred"), | ||||
|     ; | ||||
|  | ||||
|     companion object { | ||||
|         fun fromInt(value: Int) = values().first { it.position == value } | ||||
|   | ||||
| @@ -12,4 +12,8 @@ expect fun SelfossModel.Item.getImages(): ArrayList<String> | ||||
|  | ||||
| expect fun SelfossModel.Source.getIcon(baseUrl: String): String | ||||
|  | ||||
| expect fun constructUrl(baseUrl: String, path: String, file: String?): String | ||||
| expect fun constructUrl( | ||||
|     baseUrl: String, | ||||
|     path: String, | ||||
|     file: String?, | ||||
| ): String | ||||
|   | ||||
| @@ -1,7 +1,6 @@ | ||||
| package bou.amine.apps.readerforselfossv2.utils | ||||
|  | ||||
| fun String?.isEmptyOrNullOrNullString(): Boolean = | ||||
|     this == null || this == "null" || this.isEmpty() | ||||
| fun String?.isEmptyOrNullOrNullString(): Boolean = this == null || this == "null" || this.isEmpty() | ||||
|  | ||||
| fun String.longHash(): Long { | ||||
|     var h = 98764321261L | ||||
|   | ||||
| @@ -22,6 +22,10 @@ actual fun SelfossModel.Source.getIcon(baseUrl: String): String { | ||||
|     TODO("Not yet implemented") | ||||
| } | ||||
|  | ||||
| actual fun constructUrl(baseUrl: String, path: String, file: String?): String { | ||||
| actual fun constructUrl( | ||||
|     baseUrl: String, | ||||
|     path: String, | ||||
|     file: String?, | ||||
| ): String { | ||||
|     TODO("Not yet implemented") | ||||
| } | ||||
| @@ -1,7 +1,5 @@ | ||||
| package bou.amine.apps.readerforselfossv2.utils | ||||
|  | ||||
| import bou.amine.apps.readerforselfossv2.service.AppSettingsService | ||||
|  | ||||
| actual class DateUtils { | ||||
|     actual companion object { | ||||
|         actual fun parseDate(dateString: String): Long { | ||||
| @@ -12,5 +10,4 @@ actual class DateUtils { | ||||
|             TODO("Not yet implemented") | ||||
|         } | ||||
|     } | ||||
|  | ||||
| } | ||||
| @@ -22,6 +22,10 @@ actual fun SelfossModel.Source.getIcon(baseUrl: String): String { | ||||
|     TODO("Not yet implemented") | ||||
| } | ||||
|  | ||||
| actual fun constructUrl(baseUrl: String, path: String, file: String?): String { | ||||
| actual fun constructUrl( | ||||
|     baseUrl: String, | ||||
|     path: String, | ||||
|     file: String?, | ||||
| ): String { | ||||
|     TODO("Not yet implemented") | ||||
| } | ||||
		Reference in New Issue
	
	Block a user