From 9b304357b8dbdef31d260d24f6eed8bfdfd187dd Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Mon, 20 Oct 2025 18:26:19 +0200
Subject: [PATCH] Simplify code

---
 .../java/info/hannes/changelog/ChangeLog.kt   | 28 ++++---------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/ChangeLogLib/src/main/java/info/hannes/changelog/ChangeLog.kt b/ChangeLogLib/src/main/java/info/hannes/changelog/ChangeLog.kt
index 847be1e..9f456a4 100644
--- a/ChangeLogLib/src/main/java/info/hannes/changelog/ChangeLog.kt
+++ b/ChangeLogLib/src/main/java/info/hannes/changelog/ChangeLog.kt
@@ -279,8 +279,8 @@ open class ChangeLog @JvmOverloads constructor(
      * @see .getChangeLogComparator
      */
     fun getChangeLog(full: Boolean): List<ReleaseItem> {
-        val masterChangelog = getMasterChangeLog(full)
-        val changelog = getLocalizedChangeLog(full)
+        val masterChangelog = readChangeLogFromResource(R.xml.changelog_master, full)
+        val changelog = readChangeLogFromResource(R.xml.changelog, full)
 
         val jsonString = context.resources.openRawResource(R.raw.gitlog)
             .bufferedReader().use { it.readText() }//.replace("},]", "}]")
@@ -310,35 +310,17 @@ open class ChangeLog @JvmOverloads constructor(
         return mergedChangeLog
     }
 
-    /**
-     * Read master change log from `xml/changelog.xml`
-     *
-     * @see .readChangeLogFromResource
-     */
-    protected fun getMasterChangeLog(full: Boolean): SparseArray<ReleaseItem> {
-        return readChangeLogFromResource(R.xml.changelog_master, full)
-    }
-
-    /**
-     * Read localized change log from `xml[-lang]/changelog.xml`
-     *
-     * @see .readChangeLogFromResource
-     */
-    protected fun getLocalizedChangeLog(full: Boolean): SparseArray<ReleaseItem> {
-        return readChangeLogFromResource(R.xml.changelog, full)
-    }
-
     /**
      * Read change log from XML resource file.
      *
-     * @param resId Resource ID of the XML file to read the change log from.
+     * @param resourceXML_id Resource ID of the XML file to read the change log from.
      * @param full  If this is `true` the full change log is returned. Otherwise only changes for
      * versions newer than the last version are returned.
      * @return A `SparseArray` containing [ReleaseItem]s representing the (partial)
      * change log.
      */
-    protected fun readChangeLogFromResource(resId: Int, full: Boolean): SparseArray<ReleaseItem> {
-        val xml = context.resources.getXml(resId)
+    protected fun readChangeLogFromResource(resourceXMLid: Int, full: Boolean): SparseArray<ReleaseItem> {
+        val xml = context.resources.getXml(resourceXMLid)
         try {
             return readChangeLog(xml, full)
         } finally {