Revert "Merge branch 'main' of https://github.com/Aglag257/Android"

This reverts commit ae44302, reversing
changes made to a1febbe.

Author: Aglag257

.github/workflows/android.yml

@@ -29,7 +29,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.5
     - name: Fail on bad translations
       run: if grep -ri "<xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
     - uses: gradle/actions/wrapper-validation@v3

.github/workflows/changelog-to-fastlane.yml

@@ -27,7 +27,7 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v4.1.6
+      uses: actions/checkout@v4.1.5
     - name: Setup Python
       uses: actions/setup-python@v5.1.0
       with:

.github/workflows/contributors-to-file.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v4.1.6
+      uses: actions/checkout@v4.1.5
     - name: Update contributors
       id: update_contributors
       uses: TheLastProject/contributors-to-file-action@v3.2.0

.github/workflows/generate-feature-graphic.yml

@@ -24,7 +24,7 @@ jobs:
   generate-feature-graphic:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.5
     - name: Install requirements
       run: |
         sudo apt-get update

.github/workflows/gradle-update.yml

@@ -21,7 +21,7 @@ jobs:
   gradle-update:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.5
     - uses: obfusk/gradle-update-action@v2.0.0
       id: gradle-update
     - uses: gradle/actions/wrapper-validation@v3

.github/workflows/update-locales.yml

@@ -25,7 +25,7 @@ jobs:
   update-locales:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.5
     - name: Add new locales
       run: .scripts/new-locales.py
     - name: Update locales

.scripts/locales.py

@@ -24,7 +24,7 @@
 ]
 subprocess.run(sed, check=True)
 
-with open("app/src/main/res/xml/locales_config.xml", "w", encoding="utf-8") as fh:
+with open("app/src/main/res/xml/locales_config.xml", "w") as fh:
     fh.write('<?xml version="1.0" encoding="utf-8"?>\n')
     fh.write('<locale-config xmlns:android="http://schemas.android.com/apk/res/android">\n')
     fh.write('    <locale android:name="en-US" />\n')

.scripts/new-locales.py

@@ -19,27 +19,15 @@
 STATS_URL = "https://hosted.weblate.org/api/components/catima/catima/statistics/"
 
 
-class Error(Exception):
-    pass
-
-
 def get_weblate_langs() -> List[Tuple[str, int]]:
-    url = STATS_URL
+    r = requests.get(STATS_URL, timeout=5)
+    r.raise_for_status()
     results = []
-    for _ in range(16):     # avoid endless loops just in case
-        r = requests.get(url, timeout=5)
-        r.raise_for_status()
-        data = r.json()
-        for lang in data["results"]:
-            if lang["code"] != "en":
-                code = REPLACE_CODES.get(lang["code"], lang["code"]).replace("_", "-r")
-                results.append((code, round(lang["translated_percent"])))
-        url = data["next"]
-        if not url:
-            return sorted(results)
-        if not url.split("?")[0] == STATS_URL:
-            raise Error(f"Unexpected next URL: {url}")
-    raise Error("Too many pages")
+    for lang in r.json()["results"]:
+        if lang["code"] != "en":
+            code = REPLACE_CODES.get(lang["code"], lang["code"]).replace("_", "-r")
+            results.append((code, round(lang["translated_percent"])))
+    return sorted(results)
 
 
 def get_dir_langs() -> List[str]:
@@ -54,7 +42,7 @@ def get_dir_langs() -> List[str]:
 def get_xml_langs() -> List[Tuple[str, bool]]:
     results = []
     in_section = False
-    with open("app/src/main/res/values/settings.xml", encoding="utf-8") as fh:
+    with open("app/src/main/res/values/settings.xml") as fh:
         for line in fh:
             if not in_section and 'name="locale_values"' in line:
                 in_section = True
@@ -71,7 +59,7 @@ def get_xml_langs() -> List[Tuple[str, bool]]:
 def update_xml_langs(langs: List[Tuple[str, bool]]) -> None:
     lines: List[str] = []
     in_section = False
-    with open("app/src/main/res/values/settings.xml", encoding="utf-8") as fh:
+    with open("app/src/main/res/values/settings.xml") as fh:
         for line in fh:
             if not in_section and 'name="locale_values"' in line:
                 in_section = True
@@ -82,7 +70,7 @@ def update_xml_langs(langs: List[Tuple[str, bool]]) -> None:
                 else:
                     continue
             lines.append(line)
-    with open("app/src/main/res/values/settings.xml", "w", encoding="utf-8") as fh:
+    with open("app/src/main/res/values/settings.xml", "w") as fh:
         for line in lines:
             fh.write(line)
 

CHANGELOG.md

@@ -1,13 +1,6 @@
 # Changelog
 
-## Unreleased - 136
-
-- Support for creating a card when sharing plain text
-- Display image type instead of barcode below images
-- Fix possible crash when trying to import a backup from the Nextcloud app
-- Improved support for devices without camera
-
-## v2.29.1 - 135 (2024-05-19)
+## Unreleased - 135
 
 - Various fixes and improvements to balance handling
 

Gemfile.lock

@@ -10,17 +10,17 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.931.0)
-    aws-sdk-core (3.196.1)
+    aws-partitions (1.916.0)
+    aws-sdk-core (3.192.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.81.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.79.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.151.0)
-      aws-sdk-core (~> 3, >= 3.194.0)
+    aws-sdk-s3 (1.147.0)
+      aws-sdk-core (~> 3, >= 3.192.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -157,7 +157,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.4.1)
+    multipart-post (2.4.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
     nkf (0.2.0)
@@ -171,8 +171,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.2.6)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -185,7 +184,6 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -216,4 +214,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   2.5.9
+   2.3.26