From 9efd2d113a5e56c552b00b64663c48fcb3c1927d Mon Sep 17 00:00:00 2001 From: Torsten Grote <t@grobox.de> Date: Mon, 3 Sep 2018 11:58:42 -0300 Subject: [PATCH] Ignore file extension when retrieving resources on Android --- .../bramble/system/AndroidResourceProvider.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidResourceProvider.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidResourceProvider.java index 1a87d704f9..89f7f31e34 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidResourceProvider.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidResourceProvider.java @@ -24,14 +24,9 @@ class AndroidResourceProvider implements ResourceProvider { @Override public InputStream getResourceInputStream(String name, String extension) { Resources res = appContext.getResources(); - String fileName; - if (extension.equals(".zip")) { - fileName = name; - } else { - fileName = name + extension; - } + // extension is ignored on Android, resources are retrieved without it int resId = - res.getIdentifier(fileName, "raw", appContext.getPackageName()); + res.getIdentifier(name, "raw", appContext.getPackageName()); return res.openRawResource(resId); } } -- GitLab