Compare commits
	
		
			12 Commits
		
	
	
		
			v123020511
			...
			v123020572
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | c2a1c9eaac | ||
|  | bf37209a15 | ||
|  | 2c558fe6fd | ||
|  | ad88011454 | ||
|  | 559c17bc1d | ||
|  | ab9c46f0eb | ||
|  | aa799d2ca8 | ||
|  | 177c978474 | ||
|  | 39b9991413 | ||
|  | b303f110f1 | ||
|  | f851941a6a | ||
|  | a313552976 | 
| @@ -48,13 +48,14 @@ steps: | |||||||
|     commands: |     commands: | ||||||
|       - apt-get update && apt-get install -y git |       - apt-get update && apt-get install -y git | ||||||
|       - git fetch --tags -p |       - 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) |       - VER=$(git describe --tags --abbrev=0) | ||||||
|       - CHANGELOG=$(git log $VER..HEAD --pretty="- %s") |       - CHANGELOG=$(git log $PREV..HEAD --pretty="- %s") | ||||||
|       - echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md |       - echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md | ||||||
|       - git add CHANGELOG.md |       - git add CHANGELOG.md | ||||||
|       - git commit -m "Changelog for $VER [CI SKIP]" |       - git commit -m "Changelog for $VER [CI SKIP]" | ||||||
|       - ./build.sh --publish --from-ci |  | ||||||
|       - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git |  | ||||||
|       - git push pushing master |       - git push pushing master | ||||||
|       - git push pushing --tags |       - git push pushing --tags | ||||||
|     environment: |     environment: | ||||||
|   | |||||||
							
								
								
									
										15
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,3 +1,18 @@ | |||||||
|  | **v123020571** | ||||||
|  |  | ||||||
|  | - chore: remove errors logging. | ||||||
|  | - fix: quickfix for url param not provided for some sources. | ||||||
|  | - Update 'CHANGELOG.md' | ||||||
|  | - Changelog for v123020523 [CI SKIP] | ||||||
|  |  | ||||||
|  | -------------------------------------------------------------------- | ||||||
|  |  | ||||||
|  | **v123020523** | ||||||
|  |  | ||||||
|  | - fix: Git changelog. | ||||||
|  |  | ||||||
|  | -------------------------------------------------------------------- | ||||||
|  |  | ||||||
| **v123020491** | **v123020491** | ||||||
|  |  | ||||||
| - fix: Fixed acra bug reporting. | - fix: Fixed acra bug reporting. | ||||||
|   | |||||||
| @@ -1,5 +1,6 @@ | |||||||
| package bou.amine.apps.readerforselfossv2.android.fragments | package bou.amine.apps.readerforselfossv2.android.fragments | ||||||
|  |  | ||||||
|  | import android.content.ActivityNotFoundException | ||||||
| import android.content.Intent | import android.content.Intent | ||||||
| import android.content.res.ColorStateList | import android.content.res.ColorStateList | ||||||
| import android.content.res.TypedArray | import android.content.res.TypedArray | ||||||
| @@ -150,6 +151,7 @@ class ArticleFragment : Fragment(), DIAware { | |||||||
|  |  | ||||||
|         } catch (e: InflateException) { |         } catch (e: InflateException) { | ||||||
|             e.sendSilentlyWithAcraWithName("webview not available") |             e.sendSilentlyWithAcraWithName("webview not available") | ||||||
|  |             if (context != null) { | ||||||
|                 AlertDialog.Builder(requireContext()) |                 AlertDialog.Builder(requireContext()) | ||||||
|                     .setMessage(requireContext().getString(R.string.webview_dialog_issue_message)) |                     .setMessage(requireContext().getString(R.string.webview_dialog_issue_message)) | ||||||
|                     .setTitle(requireContext().getString(R.string.webview_dialog_issue_title)) |                     .setTitle(requireContext().getString(R.string.webview_dialog_issue_title)) | ||||||
| @@ -162,6 +164,7 @@ class ArticleFragment : Fragment(), DIAware { | |||||||
|                     .create() |                     .create() | ||||||
|                     .show() |                     .show() | ||||||
|             } |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|         return binding.root |         return binding.root | ||||||
|     } |     } | ||||||
| @@ -304,10 +307,16 @@ class ArticleFragment : Fragment(), DIAware { | |||||||
|         binding.webcontent.webViewClient = object : WebViewClient() { |         binding.webcontent.webViewClient = object : WebViewClient() { | ||||||
|             @Deprecated("Deprecated in Java") |             @Deprecated("Deprecated in Java") | ||||||
|             override fun shouldOverrideUrlLoading(view: WebView?, url: String): Boolean { |             override fun shouldOverrideUrlLoading(view: WebView?, url: String): Boolean { | ||||||
|                 if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) { |                 return if (context != null && binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) { | ||||||
|  |                     try { | ||||||
|                         requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url))) |                         requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url))) | ||||||
|  |                     } catch (e: ActivityNotFoundException) { | ||||||
|  |                         e.sendSilentlyWithAcraWithName("activityNotFound > $url") | ||||||
|  |                     } | ||||||
|  |                     true | ||||||
|  |                 } else { | ||||||
|  |                     false | ||||||
|                 } |                 } | ||||||
|                 return true |  | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             @Deprecated("Deprecated in Java") |             @Deprecated("Deprecated in Java") | ||||||
| @@ -325,7 +334,7 @@ class ArticleFragment : Fragment(), DIAware { | |||||||
|                             getBitmapInputStream(image, Bitmap.CompressFormat.JPEG) |                             getBitmapInputStream(image, Bitmap.CompressFormat.JPEG) | ||||||
|                         ) |                         ) | ||||||
|                     } catch (e: ExecutionException) { |                     } catch (e: ExecutionException) { | ||||||
|                         e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg > $url") |                         // Do nothing | ||||||
|                     } |                     } | ||||||
|                 } else if (url.lowercase(Locale.US).contains(".png")) { |                 } else if (url.lowercase(Locale.US).contains(".png")) { | ||||||
|                     try { |                     try { | ||||||
| @@ -337,7 +346,7 @@ class ArticleFragment : Fragment(), DIAware { | |||||||
|                             getBitmapInputStream(image, Bitmap.CompressFormat.PNG) |                             getBitmapInputStream(image, Bitmap.CompressFormat.PNG) | ||||||
|                         ) |                         ) | ||||||
|                     } catch (e: ExecutionException) { |                     } catch (e: ExecutionException) { | ||||||
|                         e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png > $url") |                         // Do nothing | ||||||
|                     } |                     } | ||||||
|                 } else if (url.lowercase(Locale.US).contains(".webp")) { |                 } else if (url.lowercase(Locale.US).contains(".webp")) { | ||||||
|                     try { |                     try { | ||||||
| @@ -349,7 +358,7 @@ class ArticleFragment : Fragment(), DIAware { | |||||||
|                             getBitmapInputStream(image, Bitmap.CompressFormat.WEBP) |                             getBitmapInputStream(image, Bitmap.CompressFormat.WEBP) | ||||||
|                         ) |                         ) | ||||||
|                     } catch (e: ExecutionException) { |                     } catch (e: ExecutionException) { | ||||||
|                         e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp > $url") |                         // Do nothing | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|  |  | ||||||
| @@ -359,7 +368,7 @@ class ArticleFragment : Fragment(), DIAware { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     private fun htmlToWebview() { |     private fun htmlToWebview() { | ||||||
|  |         if (context != null) { | ||||||
|             val attrs: IntArray = intArrayOf(android.R.attr.fontFamily) |             val attrs: IntArray = intArrayOf(android.R.attr.fontFamily) | ||||||
|             val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs) |             val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs) | ||||||
|  |  | ||||||
| @@ -500,6 +509,7 @@ class ArticleFragment : Fragment(), DIAware { | |||||||
|                 null |                 null | ||||||
|             ) |             ) | ||||||
|         } |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|     fun scrollDown() { |     fun scrollDown() { | ||||||
|         val height = binding.nestedScrollView.measuredHeight |         val height = binding.nestedScrollView.measuredHeight | ||||||
|   | |||||||
| @@ -76,7 +76,7 @@ class SelfossModel { | |||||||
|     ) |     ) | ||||||
|     @Serializable |     @Serializable | ||||||
|     data class SourceParams( |     data class SourceParams( | ||||||
|         val url: String |         val url: String? | ||||||
|     ) |     ) | ||||||
|     @Serializable |     @Serializable | ||||||
|     data class Item( |     data class Item( | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ fun SOURCE.toView(): SelfossModel.Source = | |||||||
|         this.spout, |         this.spout, | ||||||
|         this.error, |         this.error, | ||||||
|         this.icon, |         this.icon, | ||||||
|         if (this.url != null) SelfossModel.SourceParams(this.url) else null |         SelfossModel.SourceParams(this.url) | ||||||
|     ) |     ) | ||||||
|  |  | ||||||
| fun SelfossModel.Source.toEntity(): SOURCE = | fun SelfossModel.Source.toEntity(): SOURCE = | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user