From a6248fd108caf6df45a332bd11b91c36edc51621 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 13 Jul 2018 15:43:20 +0200
Subject: [PATCH] update: pass resourceIds through if they can't be deferenced

People do odd tricks with `aapt --rename-manifest-package` and androguard
doesn't handle them all.

* https://github.com/androguard/androguard/issues/503
---
 fdroidserver/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index a4bf5064..45da7ffc 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -2002,7 +2002,7 @@ def ensure_final_value(packageName, arsc, value):
                 res_id = int('0x' + value[1:], 16)
                 res_id = arsc.get_id(packageName, res_id)[1]
                 returnValue = arsc.get_string(packageName, res_id)[1]
-            except ValueError:
+            except (ValueError, TypeError):
                 pass
         return returnValue