fix: gradle export for APKs without strings.xml (PR #2050)

skylot · Dec 3, 2023 · 1e57e85 · 1e57e85
1 parent ca03406
commit 1e57e85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/export/ExportGradleTask.java b/jadx-core/src/main/java/jadx/core/export/ExportGradleTask.java
@@ -55,7 +55,7 @@ public void run() {
 				.orElseGet(() -> resContainers.stream()
 						.filter(resContainer -> resContainer.getFileName().contains("strings.xml"))
 						.findFirst()
-						.orElseThrow(IllegalStateException::new));
+						.orElse(null));
 
 		ExportGradleProject export = new ExportGradleProject(root, projectDir, androidManifest, strings);
 

diff --git a/jadx-core/src/main/java/jadx/core/utils/android/AndroidManifestParser.java b/jadx-core/src/main/java/jadx/core/utils/android/AndroidManifestParser.java
@@ -36,8 +36,6 @@ public AndroidManifestParser(ResourceFile androidManifestRes, ResContainer appSt
 
 		this.androidManifest = parseAndroidManifest(androidManifestRes);
 		this.appStrings = parseAppStrings(appStrings);
-
-		validateAttrs();
 	}
 
 	public boolean isManifestFound() {
@@ -60,12 +58,6 @@ public ApplicationParams parse() {
 		return parseAttributes();
 	}
 
-	private void validateAttrs() {
-		if (parseAttrs.contains(AppAttribute.APPLICATION_LABEL) && appStrings == null) {
-			throw new IllegalArgumentException("APPLICATION_LABEL attribute requires non null appStrings");
-		}
-	}
-
 	private ApplicationParams parseAttributes() {
 		String applicationLabel = null;
 		Integer minSdkVersion = null;
@@ -113,6 +105,9 @@ private String getApplicationLabel() {
 		if (application.hasAttribute("android:label")) {
 			String appLabelName = application.getAttribute("android:label");
 			if (appLabelName.startsWith("@string")) {
+				if (appStrings == null) {
+					throw new IllegalArgumentException("APPLICATION_LABEL attribute requires non null appStrings");
+				}
 				appLabelName = appLabelName.split("/")[1];
 				NodeList strings = appStrings.getElementsByTagName("string");