Improve encoding detection

Signed-off-by: Raul <[email protected]>

Author: Raudius

composer.json

@@ -7,7 +7,8 @@
         "jakub-onderka/php-parallel-lint": "^1.0.0",
         "nextcloud/coding-standard": "^1.0.0",
         "psalm/phar": "^4.3",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.5",
+        "ext-mbstring": "*"
     },
     "license": "AGPLv3",
     "authors": [

lib/Service/EncodingService.php

@@ -26,17 +26,28 @@
 namespace OCA\Text\Service;
 
 class EncodingService {
-	public const COMMON_ENCODINGS = ['ASCII', 'UTF-8', 'ISO-8859-1', 'ISO-8859-15', 'Windows-1252'];
+	public const COMMON_ENCODINGS = ['UTF-8', 'Windows-1252', 'ISO-8859-1', 'ISO-8859-15', 'ASCII'];
 
 	public function encodeToUtf8(string $string): ?string {
-		$encoding = mb_detect_encoding($string, $this->getEncodings(), true);
+		$encoding = $this->detectEncoding($string);
 		if (!$encoding) {
 			return null;
 		}
 
 		return mb_convert_encoding($string, 'UTF-8', $encoding);
 	}
 
+    public function detectEncoding(string $string): ?string {
+        $encodings = $this->getEncodings();
+        foreach ($encodings as $encoding) {
+            if (mb_check_encoding($string, $encoding)) {
+                return $encoding;
+            }
+        }
+
+        return null;
+    }
+
 	/**
 	 * @return string[]
 	 */