From dc2b2fecb8bcb3b8c7f49b84462b554cf3c4ccad Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Tue, 4 Feb 2014 09:52:09 -0600 Subject: [PATCH] cleanup new lines and fixup revision properties --- .../apktool-lib/src/main/java/brut/androlib/Androlib.java | 5 +---- .../src/main/java/brut/androlib/ApktoolProperties.java | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java index 6b736328..2b674534 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java @@ -651,10 +651,7 @@ public class Androlib { } public static String getVersion() { - String version = ApktoolProperties.get("application.version"); - return version.endsWith("-SNAPSHOT") ? version.substring(0, - version.length() - 9) - + '.' + ApktoolProperties.get("git.commit.id.abbrev") : version; + return ApktoolProperties.get("application.version"); } private File[] parseUsesFramework(Map usesFramework) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java index 14f53177..aa1f0d76 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java @@ -62,7 +62,6 @@ public class ApktoolProperties { } sProps.put("baksmaliVersion", version); - templateStream = main.class.getClassLoader().getResourceAsStream("smali.properties"); properties = new Properties(); version = "(unknown)";