From 07856dc0e030bd18930f8168dd8ef17312b502d7 Mon Sep 17 00:00:00 2001
From: Gaurav Ujjwal <gujjwal00@gmail.com>
Date: Sun, 19 Sep 2021 09:44:37 +0000
Subject: [PATCH 1/2] Fix invalid key error due to NDK versions in "revision"
 form  (e.g. 21.4.7075529)

First element in the 'NDKS' array does not have 'revision'  key, which results in 'KeyError' when accessed through subscript operator.
---
 fdroidserver/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index bd05f3a2..c413f239 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -4310,7 +4310,7 @@ def _install_ndk(ndk):
     """
     if re.match(r'[1-9][0-9.]+[0-9]', ndk):
         for ndkdict in NDKS:
-            if ndk == ndkdict['revision']:
+            if ndk == ndkdict.get('revision'):
                 ndk = ndkdict['release']
                 break
 

From d6fd16544483f0cfbca008b53387e817d8a7bf1e Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 20 Sep 2021 10:15:59 +0200
Subject: [PATCH 2/2] test whether NDK version parsing is working properly

---
 tests/common.TestCase | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tests/common.TestCase b/tests/common.TestCase
index 88ba20cc..f5ae4725 100755
--- a/tests/common.TestCase
+++ b/tests/common.TestCase
@@ -2082,6 +2082,39 @@ class CommonTest(unittest.TestCase):
         fdroidserver.common.fill_config_defaults(config)
         self.assertEqual({'r10e': r10e}, config['ndk_paths'])
 
+    def test_install_ndk_versions(self):
+        """Test whether NDK version parsing is working properly"""
+
+        def fake_download(url, zipball):
+            print(url, zipball)
+            with ZipFile(zipball, 'w') as zipfp:
+                zipfp.writestr(os.path.basename(url), url)
+
+        sdk_path = tempfile.mkdtemp(
+            prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir
+        )
+        config = {'sdk_path': sdk_path}
+        fdroidserver.common.config = config
+        for r, sha256 in (
+            (
+                'r10e',
+                'ee5f405f3b57c4f5c3b3b8b5d495ae12b660e03d2112e4ed5c728d349f1e520c',
+            ),
+            ('r20', '57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0'),
+            (
+                '23.0.7599858',
+                'e3eacf80016b91d4cd2c8ca9f34eebd32df912bb799c859cc5450b6b19277b4f',
+            ),
+        ):
+            with mock.patch(
+                'fdroidserver.net.download_file', side_effect=fake_download
+            ) as _ignored, mock.patch(
+                'fdroidserver.common.get_ndk_version', return_value=r
+            ) as _ignored, mock.patch(
+                'fdroidserver.common.sha256sum', return_value=sha256
+            ):
+                fdroidserver.common._install_ndk(r)
+
     def test_fill_config_defaults(self):
         """Test the auto-detection of NDKs installed in standard paths"""
         sdk_path = tempfile.mkdtemp(