fix: change not allowed access modifiers for methods (#387) (PR #439)

Fix visibility access modifies for methods (see discussions in #370 and #387):
    * all virtual methods become public
    * direct methods become private (instead constructors and static methods for now)
    * such modifications perform by default and can be disabled by the option in preferences (`--respect-bytecode-access-modifiers` in jadx-cli)
    * if changed to method added comment (`Access modifiers changed, original: private`)

.gitignore

@@ -9,6 +9,7 @@ out/
 *.iml
 *.ipr
 *.iws
+.attach_pid*
 
 **/.DS_Store
 
@@ -18,7 +19,7 @@ build/
 classes/
 idea/
 .gradle/
-gradle.properties
+node_modules/
 
 jadx-output/
 *-tmp/
@@ -28,4 +29,3 @@ jadx-output/
 *.dump
 *.log
 *.cfg
-

.gitlab-ci.yml

@@ -12,12 +12,14 @@ stages:
 
 build:
   stage: build
+  before_script:
+    - export JADX_LAST_TAG="$(git describe --abbrev=0 --tags)"
+    - export JADX_VERSION="${JADX_LAST_TAG:1}-$(git rev-parse --short HEAD)"
   script:
-    - sed -i " 1 s/.*/&-b$(git rev-list --count HEAD)-$(git rev-parse --short HEAD)/" version
-    - cat version
     - ./gradlew -g /cache/.gradle clean build jacocoTestReport
     - ./gradlew -g /cache/.gradle clean sonarqube -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_TOKEN
     - ./gradlew -g /cache/.gradle clean dist
   artifacts:
     paths:
     - build/jadx*.zip
+    - build/jadx*.exe

.releaserc.yml

@@ -0,0 +1,14 @@
+branch: release
+verifyConditions:
+  - '@semantic-release/github'
+prepare:
+  - path: '@semantic-release/exec'
+    cmd: "JADX_VERSION=${nextRelease.version} ./gradlew clean dist"
+publish:
+  - path: '@semantic-release/exec'
+    cmd: "JADX_VERSION=${nextRelease.version} BINTRAY_PACKAGE=releases bash scripts/bintray-upload.sh"
+  - path: '@semantic-release/github'
+    assets:
+      - path: 'build/*.zip'
+      - path: 'build/*.exe'
+

.travis.yml

@@ -1,39 +1,54 @@
 language: java
-jdk:
-    - oraclejdk8
+sudo: false
+dist: trusty
 
-env:
-    - TERM=dumb
+# don't build on tag push
+if: tag IS blank
+
+git:
+  depth: false
 
 before_install:
-    - chmod +x gradlew
+  - chmod +x gradlew
+
+# override install to skip 'gradle assemble'
+install:
+  - true
+
+env:
+  global:
+    - TERM=dumb
+    - JADX_LAST_TAG=$(git describe --abbrev=0 --tags)
+    - JADX_VERSION="${JADX_LAST_TAG:1}-b$TRAVIS_BUILD_NUMBER-$(git rev-parse --short HEAD)"
+
+matrix:
+  include:
+    - env: JDK=oracle-8
+      jdk: oraclejdk8
+    - env: JDK=openjdk11
+      jdk: openjdk11
 
 script:
-    - sed -i " 1 s/.*/&-b$TRAVIS_BUILD_NUMBER-$(git rev-parse --short HEAD)/" version
-    - cat version
-    - sed -i "s/BUILD_VERSION/$(head -c -1 version)/g" bintray.json
-    - ./gradlew clean build
-
-after_success:
-    - ./gradlew clean build jacocoTestReport
-    - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
-    - ./gradlew clean sonarqube -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_TOKEN
-    - ./gradlew clean dist
+  - java -version
+  - ./gradlew clean build
 
 deploy:
-    provider: bintray
-    edge:
-      branch: v1.8.47
-    file: bintray.json
-    user: skylot
-    key: $BINTRAY_KEY
+  - provider: script
     skip_cleanup: true
     on:
       branch: master
       tags: false
+      condition: $JDK = oracle-8
+    script: bash scripts/travis-master.sh
 
-sudo: false
+  - provider: script
+    skip_cleanup: true
+    on:
+      branch: release
+      tags: false
+      condition: $JDK = oracle-8
+    script: bash scripts/travis-release.sh
 
 notifications:
-    email:
-        - skylot@gmail.com
+  email:
+    - skylot@gmail.com

README.md

@@ -2,8 +2,9 @@
 
 [![Build Status](https://travis-ci.org/skylot/jadx.png?branch=master)](https://travis-ci.org/skylot/jadx)
 [![Code Coverage](https://codecov.io/gh/skylot/jadx/branch/master/graph/badge.svg)](https://codecov.io/gh/skylot/jadx)
-[![SonarQube Bugs](https://sonarcloud.io/api/badges/measure?key=jadx&metric=bugs)](https://sonarcloud.io/dashboard?id=jadx)
+[![SonarQube Bugs](https://sonarcloud.io/api/project_badges/measure?project=jadx&metric=bugs)](https://sonarcloud.io/dashboard?id=jadx)
 [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
 **jadx** - Dex to Java decompiler
 
@@ -16,7 +17,6 @@ Command line and GUI tools for produce Java source code from Android Dex and Apk
 - latest [unstable build: ![Download](https://api.bintray.com/packages/skylot/jadx/unstable/images/download.svg) ](https://bintray.com/skylot/jadx/unstable/_latestVersion#files)
 - release from [github: ![Latest release](https://img.shields.io/github/release/skylot/jadx.svg)](https://github.com/skylot/jadx/releases/latest)
 - release from [bintray: ![Download](https://api.bintray.com/packages/skylot/jadx/releases/images/download.svg) ](https://bintray.com/skylot/jadx/releases/_latestVersion#files)
-- release from [sourceforge](http://sourceforge.net/projects/jadx/files/)
 
 After download unpack zip file go to `bin` directory and run:
 - `jadx` - command line version
@@ -25,8 +25,13 @@ After download unpack zip file go to `bin` directory and run:
 On Windows run `.bat` files with double-click\
 **Note:** ensure you have installed Java 8 64-bit version
 
-### Building from source
-Java 8 JDK or higher must be installed:
+
+### Related projects:
+- [PyJadx](https://github.com/romainthomas/pyjadx) - python binding for jadx by [@romainthomas](https://github.com/romainthomas)
+
+
+### Building jadx from source
+JDK 8 or higher must be installed:
 
     git clone https://github.com/skylot/jadx.git
     cd jadx

bintray.json

@@ -1,34 +0,0 @@
-{
-  "package": {
-    "name": "unstable",
-    "repo": "jadx",
-    "subject": "skylot",
-    "desc": "Unstable",
-    "website_url": "https://github.com/skylot/jadx",
-    "issue_tracker_url": "https://github.com/skylot/jadx/issues",
-    "vcs_url": "https://github.com/skylot/jadx.git",
-    "licenses": [
-      "Apache-2.0"
-    ],
-    "labels": [
-      "unstable"
-    ],
-    "public_download_numbers": true,
-    "public_stats": true
-  },
-  "version": {
-    "name": "BUILD_VERSION",
-    "desc": "Dev build: BUILD_VERSION"
-  },
-  "files": [
-    {
-      "includePattern": "build/(jadx.*\.zip)",
-      "uploadPattern": "$1",
-      "matrixParams": {
-        "override": 1
-      },
-      "list_in_downloads": true
-    }
-  ],
-  "publish": true
-}

build.gradle

@@ -1,17 +1,16 @@
 plugins {
-    id 'com.github.ksoichiro.console.reporter' version '0.5.0'
-    id 'org.sonarqube' version '2.6.2'
-    id 'com.github.ben-manes.versions' version '0.17.0'
+    id 'org.sonarqube' version '2.7'
+    id 'com.github.ben-manes.versions' version '0.20.0'
 }
 
-ext.jadxVersion = file('version').readLines().get(0)
+ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
 version = jadxVersion
+println("jadx version: ${jadxVersion}")
 
 allprojects {
     apply plugin: 'java'
     apply plugin: 'groovy'
     apply plugin: 'jacoco'
-    apply plugin: 'com.github.ksoichiro.console.reporter'
 
     version = jadxVersion
 
@@ -40,20 +39,20 @@ allprojects {
 
         testCompile 'ch.qos.logback:logback-classic:1.2.3'
         testCompile 'junit:junit:4.12'
-        testCompile 'org.hamcrest:hamcrest-library:1.3'
-        testCompile 'org.mockito:mockito-core:2.15.0'
+        testCompile 'org.hamcrest:hamcrest-library:2.1'
+        testCompile 'org.mockito:mockito-core:2.23.4'
         testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
-        testCompile 'cglib:cglib-nodep:3.2.6'
     }
 
     repositories {
         mavenLocal()
         mavenCentral()
         jcenter()
+        google()
     }
 
     jacoco {
-        toolVersion = "0.8.0"
+        toolVersion = "0.8.2"
     }
     jacocoTestReport {
         reports {
@@ -96,17 +95,29 @@ task pack(type: Zip, dependsOn: copyArtifacts) {
     from copyArtifacts.destinationDir
 }
 
-task dist(dependsOn: pack) {
+task copyExe(type: Copy, dependsOn: 'jadx-gui:createExe') {
+    group 'jadx'
+    description = 'Copy exe to build dir'
+    destinationDir buildDir
+    from tasks.getByPath('jadx-gui:createExe').outputs
+    include '*.exe'
+}
+
+task dist(dependsOn: [pack, copyExe]) {
+    group 'jadx'
     description = 'Build jadx distribution zip'
 }
 
 task samples(dependsOn: 'jadx-samples:samples') {
+    group 'jadx'
 }
 
 task testAppCheck(dependsOn: 'jadx-test-app:testAppCheck') {
+    group 'jadx'
 }
 
 task cleanBuildDir(type: Delete) {
+    group 'jadx'
     delete buildDir
 }
 

gradle.properties

@@ -0,0 +1 @@
+org.gradle.daemon=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip

jadx-cli/build.gradle

@@ -5,7 +5,7 @@ applicationName = 'jadx'
 
 dependencies {
     compile(project(':jadx-core'))
-    compile 'com.beust:jcommander:1.72'
+    compile 'com.beust:jcommander:1.74'
     compile 'ch.qos.logback:logback-classic:1.2.3'
 }
 
@@ -19,5 +19,5 @@ applicationDistribution.with {
 }
 
 startScripts {
-    defaultJvmOpts = [ '-Xms2g', '-Xmx4g' ]
+    defaultJvmOpts = ['-Xms128M', '-Xmx4g']
 }

jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java

@@ -0,0 +1,105 @@
+package jadx.cli;
+
+import java.io.PrintStream;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.ParameterDescription;
+import com.beust.jcommander.ParameterException;
+import com.beust.jcommander.Parameterized;
+
+import jadx.api.JadxDecompiler;
+
+public class JCommanderWrapper<T> {
+	private final JCommander jc;
+
+	public JCommanderWrapper(T obj) {
+		this.jc = JCommander.newBuilder().addObject(obj).build();
+	}
+
+	public boolean parse(String[] args) {
+		try {
+			jc.parse(args);
+			return true;
+		} catch (ParameterException e) {
+			System.err.println("Arguments parse error: " + e.getMessage());
+			printUsage();
+			return false;
+		}
+	}
+
+	public void overrideProvided(T obj) {
+		List<ParameterDescription> fieldsParams = jc.getParameters();
+		List<ParameterDescription> parameters = new ArrayList<>(1 + fieldsParams.size());
+		parameters.add(jc.getMainParameterValue());
+		parameters.addAll(fieldsParams);
+		for (ParameterDescription parameter : parameters) {
+			if (parameter.isAssigned()) {
+				// copy assigned field value to obj
+				Parameterized parameterized = parameter.getParameterized();
+				Object val = parameterized.get(parameter.getObject());
+				parameterized.set(obj, val);
+			}
+		}
+	}
+
+	public void printUsage() {
+		// print usage in not sorted fields order (by default its sorted by description)
+		PrintStream out = System.out;
+		out.println();
+		out.println("jadx - dex to java decompiler, version: " + JadxDecompiler.getVersion());
+		out.println();
+		out.println("usage: jadx [options] " + jc.getMainParameterDescription());
+		out.println("options:");
+
+		List<ParameterDescription> params = jc.getParameters();
+		Map<String, ParameterDescription> paramsMap = new LinkedHashMap<>(params.size());
+		int maxNamesLen = 0;
+		for (ParameterDescription p : params) {
+			paramsMap.put(p.getParameterized().getName(), p);
+			int len = p.getNames().length();
+			if (len > maxNamesLen) {
+				maxNamesLen = len;
+			}
+		}
+		JadxCLIArgs args = new JadxCLIArgs();
+		Field[] fields = args.getClass().getDeclaredFields();
+		for (Field f : fields) {
+			String name = f.getName();
+			ParameterDescription p = paramsMap.get(name);
+			if (p == null) {
+				continue;
+			}
+			StringBuilder opt = new StringBuilder();
+			opt.append("  ").append(p.getNames());
+			addSpaces(opt, maxNamesLen - opt.length() + 3);
+			opt.append("- ").append(p.getDescription());
+			addDefaultValue(args, f, opt);
+			out.println(opt);
+		}
+		out.println("Example:");
+		out.println("  jadx -d out classes.dex");
+	}
+
+	private void addDefaultValue(JadxCLIArgs args, Field f, StringBuilder opt) {
+		Class<?> fieldType = f.getType();
+		if (fieldType == int.class) {
+			try {
+				int val = f.getInt(args);
+				opt.append(" (default: ").append(val).append(")");
+			} catch (Exception e) {
+				// ignore
+			}
+		}
+	}
+
+	private static void addSpaces(StringBuilder str, int count) {
+		for (int i = 0; i < count; i++) {
+			str.append(' ');
+		}
+	}
+}

jadx-cli/src/main/java/jadx/cli/JadxCLI.java

@@ -10,31 +10,36 @@ public class JadxCLI {
 	private static final Logger LOG = LoggerFactory.getLogger(JadxCLI.class);
 
 	public static void main(String[] args) {
+		int result = 0;
 		try {
 			JadxCLIArgs jadxArgs = new JadxCLIArgs();
 			if (jadxArgs.processArgs(args)) {
-				processAndSave(jadxArgs);
+				result = processAndSave(jadxArgs);
 			}
 		} catch (Exception e) {
 			LOG.error("jadx error: {}", e.getMessage(), e);
-			System.exit(1);
+			result = 1;
+		} finally {
+			System.exit(result);
 		}
 	}
 
-	static void processAndSave(JadxCLIArgs inputArgs) {
+	static int processAndSave(JadxCLIArgs inputArgs) {
 		JadxDecompiler jadx = new JadxDecompiler(inputArgs.toJadxArgs());
 		try {
 			jadx.load();
 		} catch (JadxArgsValidateException e) {
 			LOG.error("Incorrect arguments: {}", e.getMessage());
-			System.exit(1);
+			return 1;
 		}
 		jadx.save();
-		if (jadx.getErrorsCount() != 0) {
+		int errorsCount = jadx.getErrorsCount();
+		if (errorsCount != 0) {
 			jadx.printErrorsReport();
 			LOG.error("finished with errors");
 		} else {
 			LOG.info("done");
 		}
+		return errorsCount;
 	}
 }

jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java

@@ -1,19 +1,12 @@
 package jadx.cli;
 
-import java.io.PrintStream;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.Appender;
-import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
-import com.beust.jcommander.ParameterDescription;
-import com.beust.jcommander.ParameterException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,20 +53,23 @@ public class JadxCLIArgs {
 	@Parameter(names = {"--escape-unicode"}, description = "escape non latin characters in strings (with \\u)")
 	protected boolean escapeUnicode = false;
 
+	@Parameter(names = {"--respect-bytecode-access-modifiers"}, description = "don't change original access modifiers")
+	protected boolean respectBytecodeAccessModifiers = false;
+
 	@Parameter(names = {"--deobf"}, description = "activate deobfuscation")
 	protected boolean deobfuscationOn = false;
 
-	@Parameter(names = {"--deobf-min"}, description = "min length of name")
-	protected int deobfuscationMinLength = 2;
+	@Parameter(names = {"--deobf-min"}, description = "min length of name, renamed if shorter")
+	protected int deobfuscationMinLength = 3;
 
-	@Parameter(names = {"--deobf-max"}, description = "max length of name")
+	@Parameter(names = {"--deobf-max"}, description = "max length of name, renamed if longer")
 	protected int deobfuscationMaxLength = 64;
 
 	@Parameter(names = {"--deobf-rewrite-cfg"}, description = "force to save deobfuscation map")
 	protected boolean deobfuscationForceSave = false;
 
 	@Parameter(names = {"--deobf-use-sourcename"}, description = "use source file name as class name alias")
-	protected boolean deobfuscationUseSourceNameAsAlias = false;
+	protected boolean deobfuscationUseSourceNameAsAlias = true;
 
 	@Parameter(names = {"--cfg"}, description = "save methods control flow graph to dot file")
 	protected boolean cfgOutput = false;
@@ -94,27 +90,26 @@ public class JadxCLIArgs {
 	protected boolean printHelp = false;
 
 	public boolean processArgs(String[] args) {
-		return parse(args) && process();
+		JCommanderWrapper<JadxCLIArgs> jcw = new JCommanderWrapper<>(this);
+		return jcw.parse(args) && process(jcw);
 	}
 
-	private boolean parse(String[] args) {
-		try {
-			makeJCommander().parse(args);
-			return true;
-		} catch (ParameterException e) {
-			System.err.println("Arguments parse error: " + e.getMessage());
-			printUsage();
+	/**
+	 * Set values only for options provided in cmd.
+	 * Used to merge saved options and options passed in command line.
+	 */
+	public boolean overrideProvided(String[] args) {
+		JCommanderWrapper<JadxCLIArgs> jcw = new JCommanderWrapper<>(new JadxCLIArgs());
+		if (!jcw.parse(args)) {
 			return false;
 		}
+		jcw.overrideProvided(this);
+		return process(jcw);
 	}
 
-	private JCommander makeJCommander() {
-		return JCommander.newBuilder().addObject(this).build();
-	}
-
-	private boolean process() {
+	private boolean process(JCommanderWrapper jcw) {
 		if (printHelp) {
-			printUsage();
+			jcw.printUsage();
 			return false;
 		}
 		if (printVersion) {
@@ -136,55 +131,12 @@ public class JadxCLIArgs {
 			}
 		} catch (JadxException e) {
 			System.err.println("ERROR: " + e.getMessage());
-			printUsage();
+			jcw.printUsage();
 			return false;
 		}
 		return true;
 	}
 
-	public void printUsage() {
-		JCommander jc = makeJCommander();
-		// print usage in not sorted fields order (by default its sorted by description)
-		PrintStream out = System.out;
-		out.println();
-		out.println("jadx - dex to java decompiler, version: " + JadxDecompiler.getVersion());
-		out.println();
-		out.println("usage: jadx [options] " + jc.getMainParameterDescription());
-		out.println("options:");
-
-		List<ParameterDescription> params = jc.getParameters();
-		Map<String, ParameterDescription> paramsMap = new LinkedHashMap<>(params.size());
-		int maxNamesLen = 0;
-		for (ParameterDescription p : params) {
-			paramsMap.put(p.getParameterized().getName(), p);
-			int len = p.getNames().length();
-			if (len > maxNamesLen) {
-				maxNamesLen = len;
-			}
-		}
-		Field[] fields = JadxCLIArgs.class.getDeclaredFields();
-		for (Field f : fields) {
-			String name = f.getName();
-			ParameterDescription p = paramsMap.get(name);
-			if (p == null) {
-				continue;
-			}
-			StringBuilder opt = new StringBuilder();
-			opt.append("  ").append(p.getNames());
-			addSpaces(opt, maxNamesLen - opt.length() + 2);
-			opt.append("- ").append(p.getDescription());
-			out.println(opt);
-		}
-		out.println("Example:");
-		out.println("  jadx -d out classes.dex");
-	}
-
-	private static void addSpaces(StringBuilder str, int count) {
-		for (int i = 0; i < count; i++) {
-			str.append(' ');
-		}
-	}
-
 	public JadxArgs toJadxArgs() {
 		JadxArgs args = new JadxArgs();
 		args.setInputFiles(files.stream().map(FileUtils::toFile).collect(Collectors.toList()));
@@ -205,6 +157,7 @@ public class JadxCLIArgs {
 		args.setDeobfuscationMaxLength(deobfuscationMaxLength);
 		args.setUseSourceNameAsClassAlias(deobfuscationUseSourceNameAsAlias);
 		args.setEscapeUnicode(escapeUnicode);
+		args.setRespectBytecodeAccModifiers(respectBytecodeAccessModifiers);
 		args.setExportAsGradleProject(exportAsGradleProject);
 		args.setUseImports(useImports);
 		return args;
@@ -290,6 +243,10 @@ public class JadxCLIArgs {
 		return replaceConsts;
 	}
 
+	public boolean isRespectBytecodeAccessModifiers() {
+		return respectBytecodeAccessModifiers;
+	}
+
 	public boolean isExportAsGradleProject() {
 		return exportAsGradleProject;
 	}

jadx-cli/src/test/java/jadx/cli/JadxCLIArgsTest.java

@@ -30,11 +30,35 @@ public class JadxCLIArgsTest {
 		assertThat(parse("").isSkipSources(), is(false));
 	}
 
+	@Test
+	public void testOptionsOverride() {
+		assertThat(override(new JadxCLIArgs(), "--no-imports").isUseImports(), is(false));
+		assertThat(override(new JadxCLIArgs(), "").isUseImports(), is(true));
+
+		JadxCLIArgs args = new JadxCLIArgs();
+		args.useImports = false;
+		assertThat(override(args, "--no-imports").isUseImports(), is(false));
+
+		args = new JadxCLIArgs();
+		args.useImports = false;
+		assertThat(override(args, "").isUseImports(), is(false));
+	}
+
 	private JadxCLIArgs parse(String... args) {
-		JadxCLIArgs jadxArgs = new JadxCLIArgs();
+		return parse(new JadxCLIArgs(), args);
+	}
+
+	private JadxCLIArgs parse(JadxCLIArgs jadxArgs, String... args) {
 		boolean res = jadxArgs.processArgs(args);
 		assertThat(res, is(true));
 		LOG.info("Jadx args: {}", jadxArgs.toJadxArgs());
 		return jadxArgs;
 	}
+
+	private JadxCLIArgs override(JadxCLIArgs jadxArgs, String... args) {
+		boolean res = jadxArgs.overrideProvided(args);
+		assertThat(res, is(true));
+		LOG.info("Jadx args: {}", jadxArgs.toJadxArgs());
+		return jadxArgs;
+	}
 }

jadx-core/build.gradle

@@ -3,13 +3,15 @@ ext.jadxClasspath = 'clsp-data/android-5.1.jar'
 dependencies {
     runtime files(jadxClasspath)
 
-    compile files('lib/dx-1.14.jar')
+    compile files('lib/dx-1.16.jar')
     compile 'commons-io:commons-io:2.6'
-    compile 'org.ow2.asm:asm:6.0'
-    compile 'org.jetbrains:annotations:15.0'
-    compile 'uk.com.robust-it:cloning:1.9.9'
+    compile 'org.ow2.asm:asm:7.0'
+    compile 'org.jetbrains:annotations:16.0.3'
+    compile 'uk.com.robust-it:cloning:1.9.11'
 
-    testCompile 'org.smali:smali:2.2.2'
-    testCompile 'org.smali:baksmali:2.2.2'
+    testCompile 'org.smali:smali:2.2.5'
+    testCompile 'org.smali:baksmali:2.2.5'
+
+    testCompile 'org.apache.commons:commons-lang3:3.8.1'
 }
 

jadx-core/src/main/java/jadx/api/JadxArgs.java

@@ -40,6 +40,7 @@ public class JadxArgs {
 
 	private boolean escapeUnicode = false;
 	private boolean replaceConsts = true;
+	private boolean respectBytecodeAccModifiers = false;
 	private boolean exportAsGradleProject = false;
 
 	public JadxArgs() {
@@ -204,6 +205,14 @@ public class JadxArgs {
 		this.replaceConsts = replaceConsts;
 	}
 
+	public boolean isRespectBytecodeAccModifiers() {
+		return respectBytecodeAccModifiers;
+	}
+
+	public void setRespectBytecodeAccModifiers(boolean respectBytecodeAccModifiers) {
+		this.respectBytecodeAccModifiers = respectBytecodeAccModifiers;
+	}
+
 	public boolean isExportAsGradleProject() {
 		return exportAsGradleProject;
 	}
@@ -234,8 +243,10 @@ public class JadxArgs {
 		sb.append(", deobfuscationMaxLength=").append(deobfuscationMaxLength);
 		sb.append(", escapeUnicode=").append(escapeUnicode);
 		sb.append(", replaceConsts=").append(replaceConsts);
+		sb.append(", respectBytecodeAccModifiers=").append(respectBytecodeAccModifiers);
 		sb.append(", exportAsGradleProject=").append(exportAsGradleProject);
 		sb.append('}');
 		return sb.toString();
 	}
+
 }

jadx-core/src/main/java/jadx/api/JadxDecompiler.java

@@ -42,7 +42,7 @@ import jadx.core.xmlgen.ResourcesSaver;
  * jadx.load();
  * jadx.save();
  * </code></pre>
- * <p/>
+ * <p>
  * Instead of 'save()' you can iterate over decompiled classes:
  * <pre><code>
  *  for(JavaClass cls : jadx.getClasses()) {
@@ -91,7 +91,6 @@ public final class JadxDecompiler {
 
 		root.initClassPath();
 		root.loadResources(getResources());
-		root.initAppResClass();
 
 		initVisitors();
 	}
@@ -176,12 +175,12 @@ public final class JadxDecompiler {
 			sourcesOutDir = args.getOutDirSrc();
 			resOutDir = args.getOutDirRes();
 		}
-		if (saveSources) {
-			appendSourcesSave(executor, sourcesOutDir);
-		}
 		if (saveResources) {
 			appendResourcesSave(executor, resOutDir);
 		}
+		if (saveSources) {
+			appendSourcesSave(executor, sourcesOutDir);
+		}
 		return executor;
 	}
 
@@ -197,8 +196,12 @@ public final class JadxDecompiler {
 				continue;
 			}
 			executor.execute(() -> {
-				cls.decompile();
-				SaveCode.save(outDir, args, cls.getClassNode());
+				try {
+					cls.decompile();
+					SaveCode.save(outDir, args, cls.getClassNode());
+				} catch (Exception e) {
+					LOG.error("Error saving class: {}", cls.getFullName(), e);
+				}
 			});
 		}
 	}
@@ -260,6 +263,13 @@ public final class JadxDecompiler {
 		return root.getErrorsCounter().getErrorCount();
 	}
 
+	public int getWarnsCount() {
+		if (root == null) {
+			return 0;
+		}
+		return root.getErrorsCounter().getWarnsCount();
+	}
+
 	public void printErrorsReport() {
 		if (root == null) {
 			return;
@@ -301,10 +311,38 @@ public final class JadxDecompiler {
 		return methodsMap;
 	}
 
+	JavaMethod getJavaMethodByNode(MethodNode mth) {
+		JavaMethod javaMethod = methodsMap.get(mth);
+		if (javaMethod != null) {
+			return javaMethod;
+		}
+		// parent class not loaded yet
+		JavaClass javaClass = classesMap.get(mth.getParentClass());
+		if (javaClass != null) {
+			javaClass.decompile();
+			return methodsMap.get(mth);
+		}
+		return null;
+	}
+
 	Map<FieldNode, JavaField> getFieldsMap() {
 		return fieldsMap;
 	}
 
+	JavaField getJavaFieldByNode(FieldNode fld) {
+		JavaField javaField = fieldsMap.get(fld);
+		if (javaField != null) {
+			return javaField;
+		}
+		// parent class not loaded yet
+		JavaClass javaClass = classesMap.get(fld.getParentClass());
+		if (javaClass != null) {
+			javaClass.decompile();
+			return fieldsMap.get(fld);
+		}
+		return null;
+	}
+
 	public JadxArgs getArgs() {
 		return args;
 	}

jadx-core/src/main/java/jadx/api/JavaClass.java

@@ -1,13 +1,5 @@
 package jadx.api;
 
-import jadx.core.codegen.CodeWriter;
-import jadx.core.dex.attributes.AFlag;
-import jadx.core.dex.attributes.nodes.LineAttrNode;
-import jadx.core.dex.info.AccessInfo;
-import jadx.core.dex.nodes.ClassNode;
-import jadx.core.dex.nodes.FieldNode;
-import jadx.core.dex.nodes.MethodNode;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -17,6 +9,14 @@ import java.util.Map;
 
 import org.jetbrains.annotations.Nullable;
 
+import jadx.core.codegen.CodeWriter;
+import jadx.core.dex.attributes.AFlag;
+import jadx.core.dex.attributes.nodes.LineAttrNode;
+import jadx.core.dex.info.AccessInfo;
+import jadx.core.dex.nodes.ClassNode;
+import jadx.core.dex.nodes.FieldNode;
+import jadx.core.dex.nodes.MethodNode;
+
 public final class JavaClass implements JavaNode {
 
 	private final JadxDecompiler decompiler;
@@ -64,6 +64,10 @@ public final class JavaClass implements JavaNode {
 		}
 	}
 
+	public synchronized void unload() {
+		cls.unload();
+	}
+
 	ClassNode getClassNode() {
 		return cls;
 	}
@@ -107,12 +111,7 @@ public final class JavaClass implements JavaNode {
 					rootDecompiler.getMethodsMap().put(m, javaMethod);
 				}
 			}
-			Collections.sort(mths, new Comparator<JavaMethod>() {
-				@Override
-				public int compare(JavaMethod o1, JavaMethod o2) {
-					return o1.getName().compareTo(o2.getName());
-				}
-			});
+			mths.sort(Comparator.comparing(JavaMethod::getName));
 			this.methods = Collections.unmodifiableList(mths);
 		}
 	}
@@ -126,7 +125,11 @@ public final class JavaClass implements JavaNode {
 
 	private Map<CodePosition, Object> getCodeAnnotations() {
 		decompile();
-		return cls.getCode().getAnnotations();
+		CodeWriter code = cls.getCode();
+		if (code == null) {
+			return Collections.emptyMap();
+		}
+		return code.getAnnotations();
 	}
 
 	public Map<CodePosition, JavaNode> getUsageMap() {
@@ -157,10 +160,10 @@ public final class JavaClass implements JavaNode {
 			return getRootDecompiler().getClassesMap().get(obj);
 		}
 		if (obj instanceof MethodNode) {
-			return getRootDecompiler().getMethodsMap().get(obj);
+			return getRootDecompiler().getJavaMethodByNode(((MethodNode) obj));
 		}
 		if (obj instanceof FieldNode) {
-			return getRootDecompiler().getFieldsMap().get(obj);
+			return getRootDecompiler().getJavaFieldByNode((FieldNode) obj);
 		}
 		return null;
 	}
@@ -178,15 +181,6 @@ public final class JavaClass implements JavaNode {
 		return convertNode(obj);
 	}
 
-	@Nullable
-	public CodePosition getDefinitionPosition(int line, int offset) {
-		JavaNode javaNode = getJavaNodeAtPosition(line, offset);
-		if (javaNode == null) {
-			return null;
-		}
-		return getDefinitionPosition(javaNode);
-	}
-
 	@Nullable
 	public CodePosition getDefinitionPosition(JavaNode javaNode) {
 		JavaClass jCls = javaNode.getTopParentClass();
@@ -262,6 +256,6 @@ public final class JavaClass implements JavaNode {
 
 	@Override
 	public String toString() {
-		return cls.getFullName() + "[ " + getFullName() + " ]";
+		return getFullName();
 	}
 }

jadx-core/src/main/java/jadx/api/JavaMethod.java

@@ -1,11 +1,11 @@
 package jadx.api;
 
+import java.util.List;
+
 import jadx.core.dex.info.AccessInfo;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.nodes.MethodNode;
 
-import java.util.List;
-
 public final class JavaMethod implements JavaNode {
 	private final MethodNode mth;
 	private final JavaClass parent;

jadx-core/src/main/java/jadx/api/ResourceFile.java

@@ -1,10 +1,10 @@
 package jadx.api;
 
+import java.io.File;
+
 import jadx.core.utils.files.ZipSecurity;
 import jadx.core.xmlgen.ResContainer;
 
-import java.io.File;
-
 public class ResourceFile {
 
 	public static final class ZipRef {
@@ -35,6 +35,13 @@ public class ResourceFile {
 	private final ResourceType type;
 	private ZipRef zipRef;
 
+	public static ResourceFile createResourceFile(JadxDecompiler decompiler, String name, ResourceType type) {
+		if (!ZipSecurity.isValidZipEntryName(name)) {
+			return null;
+		}
+		return new ResourceFile(decompiler, name, type);
+	}
+
 	protected ResourceFile(JadxDecompiler decompiler, String name, ResourceType type) {
 		this.decompiler = decompiler;
 		this.name = name;
@@ -65,11 +72,4 @@ public class ResourceFile {
 	public String toString() {
 		return "ResourceFile{name='" + name + '\'' + ", type=" + type + "}";
 	}
-	
-	public static ResourceFile createResourceFileInstance(JadxDecompiler decompiler, String name, ResourceType type) {
-		if(!ZipSecurity.isValidZipEntryName(name)) {
-			return null;
-		}
-		return new ResourceFile(decompiler, name, type);
-	}
 }

jadx-core/src/main/java/jadx/api/ResourceFileContent.java

@@ -1,27 +1,18 @@
 package jadx.api;
 
 import jadx.core.codegen.CodeWriter;
-import jadx.core.utils.files.ZipSecurity;
 import jadx.core.xmlgen.ResContainer;
 
 public class ResourceFileContent extends ResourceFile {
-
 	private final CodeWriter content;
 
-	private ResourceFileContent(String name, ResourceType type, CodeWriter content) {
+	public ResourceFileContent(String name, ResourceType type, CodeWriter content) {
 		super(null, name, type);
 		this.content = content;
 	}
 
 	@Override
 	public ResContainer loadContent() {
-		return ResContainer.singleFile(getName(), content);
-	}
-	
-	public static ResourceFileContent createResourceFileContentInstance(String name, ResourceType type, CodeWriter content) {
-		if(!ZipSecurity.isValidZipEntryName(name)) {
-			return null;
-		}
-		return new ResourceFileContent(name, type, content);
+		return ResContainer.textResource(getName(), content);
 	}
 }

jadx-core/src/main/java/jadx/api/ResourceType.java

@@ -30,21 +30,4 @@ public enum ResourceType {
 		}
 		return UNKNOWN;
 	}
-
-	public static boolean isSupportedForUnpack(ResourceType type) {
-		switch (type) {
-			case CODE:
-			case LIB:
-			case FONT:
-			case UNKNOWN:
-				return false;
-
-			case MANIFEST:
-			case XML:
-			case ARSC:
-			case IMG:
-				return true;
-		}
-		return false;
-	}
 }

jadx-core/src/main/java/jadx/api/ResourcesLoader.java

@@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory;
 import jadx.api.ResourceFile.ZipRef;
 import jadx.core.codegen.CodeWriter;
 import jadx.core.utils.Utils;
+import jadx.core.utils.android.Res9patchStreamDecoder;
 import jadx.core.utils.exceptions.JadxException;
 import jadx.core.utils.files.InputFile;
 import jadx.core.utils.files.ZipSecurity;
@@ -31,8 +32,6 @@ import static jadx.core.utils.files.FileUtils.copyStream;
 public final class ResourcesLoader {
 	private static final Logger LOG = LoggerFactory.getLogger(ResourcesLoader.class);
 
-	private static final int LOAD_SIZE_LIMIT = 10 * 1024 * 1024;
-
 	private final JadxDecompiler jadxRef;
 
 	ResourcesLoader(JadxDecompiler jadxRef) {
@@ -47,11 +46,11 @@ public final class ResourcesLoader {
 		return list;
 	}
 
-	public interface ResourceDecoder {
-		ResContainer decode(long size, InputStream is) throws IOException;
+	public interface ResourceDecoder<T> {
+		T decode(long size, InputStream is) throws IOException;
 	}
 
-	public static ResContainer decodeStream(ResourceFile rf, ResourceDecoder decoder) throws JadxException {
+	public static <T> T decodeStream(ResourceFile rf, ResourceDecoder<T> decoder) throws JadxException {
 		try {
 			ZipRef zipRef = rf.getZipRef();
 			if (zipRef == null) {
@@ -80,39 +79,50 @@ public final class ResourcesLoader {
 
 	static ResContainer loadContent(JadxDecompiler jadxRef, ResourceFile rf) {
 		try {
-			return decodeStream(rf, (size, is) -> loadContent(jadxRef, rf, is, size));
+			return decodeStream(rf, (size, is) -> loadContent(jadxRef, rf, is));
 		} catch (JadxException e) {
 			LOG.error("Decode error", e);
 			CodeWriter cw = new CodeWriter();
 			cw.add("Error decode ").add(rf.getType().toString().toLowerCase());
 			cw.startLine(Utils.getStackTrace(e.getCause()));
-			return ResContainer.singleFile(rf.getName(), cw);
+			return ResContainer.textResource(rf.getName(), cw);
 		}
 	}
 
 	private static ResContainer loadContent(JadxDecompiler jadxRef, ResourceFile rf,
-	                                        InputStream inputStream, long size) throws IOException {
+	                                        InputStream inputStream) throws IOException {
 		switch (rf.getType()) {
 			case MANIFEST:
 			case XML:
-				return ResContainer.singleFile(rf.getName(),
-						jadxRef.getXmlParser().parse(inputStream));
+				CodeWriter content = jadxRef.getXmlParser().parse(inputStream);
+				return ResContainer.textResource(rf.getName(), content);
 
 			case ARSC:
 				return new ResTableParser().decodeFiles(inputStream);
 
 			case IMG:
-				return ResContainer.singleImageFile(rf.getName(), inputStream);
+				return decodeImage(rf, inputStream);
 
 			default:
-				if (size > LOAD_SIZE_LIMIT) {
-					return ResContainer.singleFile(rf.getName(),
-							new CodeWriter().add("File too big, size: " + String.format("%.2f KB", size / 1024.)));
-				}
-				return ResContainer.singleFile(rf.getName(), loadToCodeWriter(inputStream));
+				return ResContainer.resourceFileLink(rf);
 		}
 	}
 
+	private static ResContainer decodeImage(ResourceFile rf, InputStream inputStream) {
+		String name = rf.getName();
+		if (name.endsWith(".9.png")) {
+			Res9patchStreamDecoder decoder = new Res9patchStreamDecoder();
+			ByteArrayOutputStream os = new ByteArrayOutputStream();
+			try {
+				decoder.decode(inputStream, os);
+				return ResContainer.decodedData(rf.getName(), os.toByteArray());
+			} catch (Exception e) {
+				LOG.error("Failed to decode 9-patch png image, path: {}", name, e);
+			}
+		}
+		return ResContainer.resourceFileLink(rf);
+	}
+
 	private void loadFile(List<ResourceFile> list, File file) {
 		if (file == null) {
 			return;
@@ -134,7 +144,7 @@ public final class ResourcesLoader {
 	private void addResourceFile(List<ResourceFile> list, File file) {
 		String name = file.getAbsolutePath();
 		ResourceType type = ResourceType.getFileType(name);
-		ResourceFile rf = ResourceFile.createResourceFileInstance(jadxRef, name, type);
+		ResourceFile rf = ResourceFile.createResourceFile(jadxRef, name, type);
 		if (rf != null) {
 			list.add(rf);
 		}
@@ -146,7 +156,7 @@ public final class ResourcesLoader {
 		}
 		String name = entry.getName();
 		ResourceType type = ResourceType.getFileType(name);
-		ResourceFile rf = ResourceFile.createResourceFileInstance(jadxRef, name, type);
+		ResourceFile rf = ResourceFile.createResourceFile(jadxRef, name, type);
 		if (rf != null) {
 			rf.setZipRef(new ZipRef(zipFile, name));
 			list.add(rf);

jadx-core/src/main/java/jadx/core/Jadx.java

@@ -19,6 +19,7 @@ import jadx.core.dex.visitors.DotGraphVisitor;
 import jadx.core.dex.visitors.EnumVisitor;
 import jadx.core.dex.visitors.ExtractFieldInit;
 import jadx.core.dex.visitors.FallbackModeVisitor;
+import jadx.core.dex.visitors.FixAccessModifiers;
 import jadx.core.dex.visitors.IDexTreeVisitor;
 import jadx.core.dex.visitors.MethodInlineVisitor;
 import jadx.core.dex.visitors.ModVisitor;
@@ -94,18 +95,19 @@ public class Jadx {
 			passes.add(new SimplifyVisitor());
 			passes.add(new CheckRegions());
 
-			if (args.isCfgOutput()) {
-				passes.add(DotGraphVisitor.dumpRegions());
-			}
-
 			passes.add(new MethodInlineVisitor());
 			passes.add(new ExtractFieldInit());
+			passes.add(new FixAccessModifiers());
 			passes.add(new ClassModifier());
 			passes.add(new EnumVisitor());
 			passes.add(new PrepareForCodeGen());
 			passes.add(new LoopRegionVisitor());
 			passes.add(new ProcessVariables());
 
+			if (args.isCfgOutput()) {
+				passes.add(DotGraphVisitor.dumpRegions());
+			}
+
 			passes.add(new DependencyCollector());
 
 			passes.add(new RenameVisitor());

jadx-core/src/main/java/jadx/core/ProcessClass.java

@@ -1,20 +1,18 @@
 package jadx.core;
 
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
 import jadx.core.codegen.CodeGen;
 import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.visitors.DepthTraversal;
 import jadx.core.dex.visitors.IDexTreeVisitor;
 import jadx.core.utils.ErrorsCounter;
 
-import java.util.List;
-
-import org.jetbrains.annotations.Nullable;
-
-import static jadx.core.dex.nodes.ProcessState.GENERATED;
 import static jadx.core.dex.nodes.ProcessState.NOT_LOADED;
 import static jadx.core.dex.nodes.ProcessState.PROCESSED;
 import static jadx.core.dex.nodes.ProcessState.STARTED;
-import static jadx.core.dex.nodes.ProcessState.UNLOADED;
 
 public final class ProcessClass {
 
@@ -25,7 +23,7 @@ public final class ProcessClass {
 		if (codeGen == null && cls.getState() == PROCESSED) {
 			return;
 		}
-		synchronized (cls.getClassInfo()) {
+		synchronized (getSyncObj(cls)) {
 			try {
 				if (cls.getState() == NOT_LOADED) {
 					cls.load();
@@ -38,22 +36,18 @@ public final class ProcessClass {
 				if (cls.getState() == PROCESSED && codeGen != null) {
 					processDependencies(cls, passes);
 					codeGen.visit(cls);
-					cls.setState(GENERATED);
 				}
 			} catch (Exception e) {
 				ErrorsCounter.classError(cls, e.getClass().getSimpleName(), e);
-			} finally {
-				if (cls.getState() == GENERATED) {
-					cls.unload();
-					cls.setState(UNLOADED);
-				}
 			}
 		}
 	}
 
+	public static Object getSyncObj(ClassNode cls) {
+		return cls.getClassInfo();
+	}
+
 	private static void processDependencies(ClassNode cls, List<IDexTreeVisitor> passes) {
-		for (ClassNode depCls : cls.getDependencies()) {
-			process(depCls, passes, null);
-		}
+		cls.getDependencies().forEach(depCls -> process(depCls, passes, null));
 	}
 }

jadx-core/src/main/java/jadx/core/clsp/ClsSet.java

@@ -1,13 +1,5 @@
 package jadx.core.clsp;
 
-import jadx.core.dex.instructions.args.ArgType;
-import jadx.core.dex.nodes.ClassNode;
-import jadx.core.dex.nodes.RootNode;
-import jadx.core.utils.exceptions.DecodeException;
-import jadx.core.utils.exceptions.JadxRuntimeException;
-import jadx.core.utils.files.FileUtils;
-import jadx.core.utils.files.ZipSecurity;
-
 import java.io.BufferedOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -28,6 +20,14 @@ import java.util.zip.ZipOutputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.nodes.ClassNode;
+import jadx.core.dex.nodes.RootNode;
+import jadx.core.utils.exceptions.DecodeException;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+import jadx.core.utils.files.FileUtils;
+import jadx.core.utils.files.ZipSecurity;
+
 import static jadx.core.utils.files.FileUtils.close;
 
 /**

jadx-core/src/main/java/jadx/core/clsp/ClspGraph.java

@@ -1,9 +1,5 @@
 package jadx.core.clsp;
 
-import jadx.core.dex.nodes.ClassNode;
-import jadx.core.utils.exceptions.DecodeException;
-import jadx.core.utils.exceptions.JadxRuntimeException;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,6 +13,10 @@ import java.util.WeakHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jadx.core.dex.nodes.ClassNode;
+import jadx.core.utils.exceptions.DecodeException;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+
 /**
  * Classes hierarchy graph
  */
@@ -120,9 +120,11 @@ public class ClspGraph {
 	}
 
 	private void addAncestorsNames(NClass cls, Set<String> result) {
-		result.add(cls.getName());
-		for (NClass p : cls.getParents()) {
-			addAncestorsNames(p, result);
+		boolean isNew = result.add(cls.getName());
+		if (isNew) {
+			for (NClass p : cls.getParents()) {
+				addAncestorsNames(p, result);
+			}
 		}
 	}
 

jadx-core/src/main/java/jadx/core/clsp/ConvertToClsSet.java

@@ -1,10 +1,5 @@
 package jadx.core.clsp;
 
-import jadx.api.JadxArgs;
-import jadx.core.dex.nodes.RootNode;
-import jadx.core.utils.exceptions.DecodeException;
-import jadx.core.utils.files.InputFile;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,6 +8,11 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jadx.api.JadxArgs;
+import jadx.core.dex.nodes.RootNode;
+import jadx.core.utils.exceptions.DecodeException;
+import jadx.core.utils.files.InputFile;
+
 /**
  * Utility class for convert dex or jar to jadx classes set (.jcst)
  */

jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java

@@ -1,5 +1,10 @@
 package jadx.core.codegen;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 import jadx.core.Consts;
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.IAttributeNode;
@@ -14,11 +19,6 @@ import jadx.core.dex.nodes.MethodNode;
 import jadx.core.utils.StringUtils;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 public class AnnotationGen {
 
 	private final ClassNode cls;

jadx-core/src/main/java/jadx/core/codegen/ClassGen.java

@@ -1,7 +1,6 @@
 package jadx.core.codegen;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -18,6 +17,8 @@ import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.AttrNode;
 import jadx.core.dex.attributes.nodes.EnumClassAttr;
 import jadx.core.dex.attributes.nodes.EnumClassAttr.EnumField;
+import jadx.core.dex.attributes.nodes.JadxError;
+import jadx.core.dex.attributes.nodes.JadxWarn;
 import jadx.core.dex.attributes.nodes.LineAttrNode;
 import jadx.core.dex.attributes.nodes.SourceFileAttr;
 import jadx.core.dex.info.AccessInfo;
@@ -32,6 +33,7 @@ import jadx.core.dex.nodes.InsnNode;
 import jadx.core.dex.nodes.MethodNode;
 import jadx.core.dex.nodes.parser.FieldInitAttr;
 import jadx.core.dex.nodes.parser.FieldInitAttr.InitType;
+import jadx.core.utils.CodegenUtils;
 import jadx.core.utils.ErrorsCounter;
 import jadx.core.utils.Utils;
 import jadx.core.utils.exceptions.CodegenException;
@@ -81,18 +83,18 @@ public class ClassGen {
 		}
 		int importsCount = imports.size();
 		if (importsCount != 0) {
-			List<String> sortImports = new ArrayList<>(importsCount);
-			for (ClassInfo ic : imports) {
-				sortImports.add(ic.getAlias().getFullName());
-			}
-			Collections.sort(sortImports);
-
-			for (String imp : sortImports) {
-				clsCode.startLine("import ").add(imp).add(';');
-			}
+			List<ClassInfo> sortedImports = new ArrayList<>(imports);
+			sortedImports.sort(Comparator.comparing(classInfo -> classInfo.getAlias().getFullName()));
+			sortedImports.forEach(classInfo -> {
+				clsCode.startLine("import ");
+				ClassNode classNode = cls.root().resolveClass(classInfo);
+				if (classNode != null) {
+					clsCode.attachAnnotation(classNode);
+				}
+				clsCode.add(classInfo.getAlias().getFullName());
+				clsCode.add(';');
+			});
 			clsCode.newLine();
-
-			sortImports.clear();
 			imports.clear();
 		}
 		clsCode.add(clsBody);
@@ -103,9 +105,8 @@ public class ClassGen {
 		if (cls.contains(AFlag.DONT_GENERATE)) {
 			return;
 		}
-		if (cls.contains(AFlag.INCONSISTENT_CODE)) {
-			code.startLine("// jadx: inconsistent code");
-		}
+		CodegenUtils.addComments(code, cls);
+		insertDecompilationProblems(code, cls);
 		addClassDeclaration(code);
 		addClassBody(code);
 	}
@@ -253,6 +254,7 @@ public class ClassGen {
 			if (code.getLine() != clsDeclLine) {
 				code.newLine();
 			}
+			int savedIndent = code.getIndent();
 			try {
 				addMethod(code, mth);
 			} catch (Exception e) {
@@ -260,6 +262,7 @@ public class ClassGen {
 				code.newLine().add(ErrorsCounter.methodError(mth, "Method generation error", e));
 				code.newLine().add(Utils.getStackTrace(e));
 				code.newLine().add("*/");
+				code.setIndent(savedIndent);
 			}
 		}
 	}
@@ -292,15 +295,13 @@ public class ClassGen {
 			}
 			code.add(';');
 		} else {
+			CodegenUtils.addComments(code, mth);
+			insertDecompilationProblems(code, mth);
 			boolean badCode = mth.contains(AFlag.INCONSISTENT_CODE);
-			if (badCode) {
-				code.startLine("/* JADX WARNING: inconsistent code. */");
+			if (badCode && showInconsistentCode) {
 				code.startLine("/* Code decompiled incorrectly, please refer to instructions dump. */");
-				ErrorsCounter.methodError(mth, "Inconsistent code");
-				if (showInconsistentCode) {
-					mth.remove(AFlag.INCONSISTENT_CODE);
-					badCode = false;
-				}
+				mth.remove(AFlag.INCONSISTENT_CODE);
+				badCode = false;
 			}
 			MethodGen mthGen;
 			if (badCode || mth.contains(AType.JADX_ERROR) || fallback) {
@@ -324,12 +325,33 @@ public class ClassGen {
 		}
 	}
 
+	private void insertDecompilationProblems(CodeWriter code, AttrNode node) {
+		List<JadxError> errors = node.getAll(AType.JADX_ERROR);
+		List<JadxWarn> warns = node.getAll(AType.JADX_WARN);
+		if (!errors.isEmpty()) {
+			errors.forEach(err -> {
+				code.startLine("/*  JADX ERROR: ").add(err.getError());
+				Throwable cause = err.getCause();
+				if (cause != null) {
+					code.incIndent();
+					Utils.appendStackTrace(code, cause);
+					code.decIndent();
+				}
+				code.add("*/");
+			});
+		}
+		if (!warns.isEmpty()) {
+			warns.forEach(warn -> code.startLine("/* JADX WARNING: ").addMultiLine(warn.getWarn()).add(" */"));
+		}
+	}
+
 	private void addFields(CodeWriter code) throws CodegenException {
 		addEnumFields(code);
 		for (FieldNode f : cls.getFields()) {
 			if (f.contains(AFlag.DONT_GENERATE)) {
 				continue;
 			}
+			CodegenUtils.addComments(code, f);
 			annotationGen.addForField(code, f);
 
 			if (f.getFieldInfo().isRenamed()) {
@@ -435,7 +457,7 @@ public class ClassGen {
 	}
 
 	public void useClass(CodeWriter code, ArgType type) {
-		useClass(code, ClassInfo.extCls(cls.dex(), type));
+		useClass(code, ClassInfo.extCls(cls.root(), type));
 		ArgType[] generics = type.getGenericTypes();
 		if (generics != null) {
 			code.add('<');

jadx-core/src/main/java/jadx/core/codegen/CodeGen.java

@@ -1,12 +1,10 @@
 package jadx.core.codegen;
 
 import jadx.core.dex.nodes.ClassNode;
-import jadx.core.dex.visitors.AbstractVisitor;
 import jadx.core.utils.exceptions.CodegenException;
 
-public class CodeGen extends AbstractVisitor {
+public class CodeGen {
 
-	@Override
 	public boolean visit(ClassNode cls) throws CodegenException {
 		ClassGen clsGen = new ClassGen(cls, cls.root().getArgs());
 		CodeWriter clsCode = clsGen.makeClass();

jadx-core/src/main/java/jadx/core/codegen/CodeWriter.java

@@ -1,10 +1,5 @@
 package jadx.core.codegen;
 
-import jadx.api.CodePosition;
-import jadx.core.dex.attributes.nodes.LineAttrNode;
-import jadx.core.utils.files.FileUtils;
-import jadx.core.utils.files.ZipSecurity;
-
 import java.io.File;
 import java.io.PrintWriter;
 import java.util.Collections;
@@ -17,6 +12,12 @@ import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jadx.api.CodePosition;
+import jadx.core.dex.attributes.nodes.LineAttrNode;
+import jadx.core.utils.StringUtils;
+import jadx.core.utils.files.FileUtils;
+import jadx.core.utils.files.ZipSecurity;
+
 public class CodeWriter {
 	private static final Logger LOG = LoggerFactory.getLogger(CodeWriter.class);
 
@@ -93,6 +94,15 @@ public class CodeWriter {
 		return this;
 	}
 
+	public CodeWriter addMultiLine(String str) {
+		buf.append(str);
+		if (str.contains(NL)) {
+			line += StringUtils.countMatches(str, NL);
+			offset = 0;
+		}
+		return this;
+	}
+
 	public CodeWriter add(String str) {
 		buf.append(str);
 		offset += str.length();
@@ -181,6 +191,11 @@ public class CodeWriter {
 		return indent;
 	}
 
+	public void setIndent(int indent) {
+		this.indent = indent;
+		updateIndent();
+	}
+
 	public int getLine() {
 		return line;
 	}
@@ -254,8 +269,9 @@ public class CodeWriter {
 	}
 
 	private void removeFirstEmptyLine() {
-		if (buf.indexOf(NL) == 0) {
-			buf.delete(0, NL.length());
+		int len = NL.length();
+		if (buf.substring(0, len).equals(NL)) {
+			buf.delete(0, len);
 		}
 	}
 
@@ -273,14 +289,14 @@ public class CodeWriter {
 	}
 
 	public void save(File dir, String subDir, String fileName) {
-		if(!ZipSecurity.isValidZipEntryName(subDir) || !ZipSecurity.isValidZipEntryName(fileName)) {
+		if (!ZipSecurity.isValidZipEntryName(subDir) || !ZipSecurity.isValidZipEntryName(fileName)) {
 			return;
 		}
 		save(dir, new File(subDir, fileName).getPath());
 	}
 
 	public void save(File dir, String fileName) {
-		if(!ZipSecurity.isValidZipEntryName(fileName)) {
+		if (!ZipSecurity.isValidZipEntryName(fileName)) {
 			return;
 		}
 		save(new File(dir, fileName));

jadx-core/src/main/java/jadx/core/codegen/ConditionGen.java

@@ -4,9 +4,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import jadx.core.dex.instructions.ArithNode;
 import jadx.core.dex.instructions.IfOp;
 import jadx.core.dex.instructions.InsnType;
@@ -23,7 +20,6 @@ import jadx.core.utils.exceptions.CodegenException;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
 public class ConditionGen extends InsnGen {
-	private static final Logger LOG = LoggerFactory.getLogger(ConditionGen.class);
 
 	private static class CondStack {
 		private final Queue<IfCondition> stack = new LinkedList<>();
@@ -126,7 +122,7 @@ public class ConditionGen extends InsnGen {
 				wrap(code, firstArg);
 				return;
 			}
-			ErrorsCounter.methodError(mth, "Unsupported boolean condition " + op.getSymbol());
+			ErrorsCounter.methodWarn(mth, "Unsupported boolean condition " + op.getSymbol());
 		}
 
 		addArg(code, firstArg, isArgWrapNeeded(firstArg));

jadx-core/src/main/java/jadx/core/codegen/InsnGen.java

@@ -1,5 +1,16 @@
 package jadx.core.codegen;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jadx.core.dex.attributes.AFlag;
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.nodes.FieldReplaceAttr;
@@ -41,17 +52,6 @@ import jadx.core.utils.RegionUtils;
 import jadx.core.utils.exceptions.CodegenException;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import static jadx.core.utils.android.AndroidResourcesUtils.handleAppResField;
 
 public class InsnGen {
@@ -137,13 +137,7 @@ public class InsnGen {
 
 	private void instanceField(CodeWriter code, FieldInfo field, InsnArg arg) throws CodegenException {
 		ClassNode pCls = mth.getParentClass();
-		FieldNode fieldNode = pCls.searchField(field);
-		while (fieldNode == null
-				&& pCls.getParentClass() != pCls
-				&& pCls.getParentClass() != null) {
-			pCls = pCls.getParentClass();
-			fieldNode = pCls.searchField(field);
-		}
+		FieldNode fieldNode = pCls.dex().root().deepResolveField(field);
 		if (fieldNode != null) {
 			FieldReplaceAttr replace = fieldNode.get(AType.FIELD_REPLACE);
 			if (replace != null) {
@@ -163,7 +157,11 @@ public class InsnGen {
 		if (fieldNode != null) {
 			code.attachAnnotation(fieldNode);
 		}
-		code.add(field.getAlias());
+		if (fieldNode == null) {
+			code.add(field.getAlias());
+		} else {
+			code.add(fieldNode.getAlias());
+		}
 	}
 
 	public static void makeStaticFieldAccess(CodeWriter code, FieldInfo field, ClassGen clsGen) {
@@ -176,11 +174,15 @@ public class InsnGen {
 			}
 			code.add('.');
 		}
-		FieldNode fieldNode = clsGen.getClassNode().dex().resolveField(field);
+		FieldNode fieldNode = clsGen.getClassNode().dex().root().deepResolveField(field);
 		if (fieldNode != null) {
 			code.attachAnnotation(fieldNode);
 		}
-		code.add(field.getAlias());
+		if (fieldNode == null) {
+			code.add(field.getAlias());
+		} else {
+			code.add(fieldNode.getAlias());
+		}
 	}
 
 	protected void staticField(CodeWriter code, FieldInfo field) {
@@ -222,7 +224,7 @@ public class InsnGen {
 					code.add(';');
 				}
 			}
-		} catch (Throwable th) {
+		} catch (Exception th) {
 			throw new CodegenException(mth, "Error generate insn: " + insn, th);
 		}
 		return true;
@@ -578,7 +580,7 @@ public class InsnGen {
 		// anonymous class construction
 		if (cls.contains(AFlag.DONT_GENERATE)) {
 			code.add("/* anonymous class already generated */");
-			ErrorsCounter.methodError(mth, "Anonymous class already generated: " + cls);
+			ErrorsCounter.methodWarn(mth, "Anonymous class already generated: " + cls);
 			return;
 		}
 		ArgType parent;
@@ -612,7 +614,7 @@ public class InsnGen {
 		MethodInfo callMth = insn.getCallMth();
 
 		// inline method
-		MethodNode callMthNode = mth.dex().deepResolveMethod(callMth);
+		MethodNode callMthNode = mth.root().deepResolveMethod(callMth);
 		if (callMthNode != null) {
 			if (inlineMethod(callMthNode, insn, code)) {
 				return;
@@ -657,7 +659,7 @@ public class InsnGen {
 	}
 
 	void generateMethodArguments(CodeWriter code, InsnNode insn, int startArgNum,
-			@Nullable MethodNode callMth) throws CodegenException {
+	                             @Nullable MethodNode callMth) throws CodegenException {
 		int k = startArgNum;
 		if (callMth != null && callMth.contains(AFlag.SKIP_FIRST_ARG)) {
 			k++;

jadx-core/src/main/java/jadx/core/codegen/MethodGen.java

@@ -1,9 +1,17 @@
 package jadx.core.codegen;
 
+import java.util.Iterator;
+import java.util.List;
+
+import com.android.dx.rop.code.AccessFlags;
+import jadx.core.dex.info.ClassInfo;
+import jadx.core.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jadx.core.dex.attributes.AFlag;
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.annotations.MethodParameters;
-import jadx.core.dex.attributes.nodes.JadxErrorAttr;
 import jadx.core.dex.info.AccessInfo;
 import jadx.core.dex.instructions.InsnType;
 import jadx.core.dex.instructions.args.ArgType;
@@ -16,18 +24,9 @@ import jadx.core.dex.visitors.DepthTraversal;
 import jadx.core.dex.visitors.FallbackModeVisitor;
 import jadx.core.utils.ErrorsCounter;
 import jadx.core.utils.InsnUtils;
-import jadx.core.utils.Utils;
 import jadx.core.utils.exceptions.CodegenException;
 import jadx.core.utils.exceptions.DecodeException;
 
-import java.util.Iterator;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.android.dx.rop.code.AccessFlags;
-
 public class MethodGen {
 	private static final Logger LOG = LoggerFactory.getLogger(MethodGen.class);
 
@@ -81,7 +80,7 @@ public class MethodGen {
 			ai = ai.remove(AccessFlags.ACC_PUBLIC);
 		}
 
-		if (mth.getMethodInfo().isRenamed()) {
+		if (mth.getMethodInfo().isRenamed() && !ai.isConstructor()) {
 			code.startLine("/* renamed from: ").add(mth.getName()).add(" */");
 		}
 		code.startLineWithNum(mth.getSourceLine());
@@ -90,7 +89,7 @@ public class MethodGen {
 		if (classGen.addGenericMap(code, mth.getGenericMap())) {
 			code.add(' ');
 		}
-		if (mth.getAccessFlags().isConstructor()) {
+		if (ai.isConstructor()) {
 			code.attachDefinition(mth);
 			code.add(classGen.getClassNode().getShortName()); // constructor
 		} else {
@@ -109,7 +108,7 @@ public class MethodGen {
 			} else if (args.size() > 2) {
 				args = args.subList(2, args.size());
 			} else {
-				LOG.warn(ErrorsCounter.formatErrorMsg(mth,
+				LOG.warn(ErrorsCounter.formatMsg(mth,
 						"Incorrect number of args for enum constructor: " + args.size()
 								+ " (expected >= 2)"
 				));
@@ -144,7 +143,7 @@ public class MethodGen {
 					classGen.useType(argsCode, elType);
 					argsCode.add("...");
 				} else {
-					LOG.warn(ErrorsCounter.formatErrorMsg(mth, "Last argument in varargs method not array"));
+					LOG.warn(ErrorsCounter.formatMsg(mth, "Last argument in varargs method not array"));
 					classGen.useType(argsCode, arg.getType());
 				}
 			} else {
@@ -164,23 +163,20 @@ public class MethodGen {
 		if (mth.contains(AType.JADX_ERROR)
 				|| mth.contains(AFlag.INCONSISTENT_CODE)
 				|| mth.getRegion() == null) {
-			JadxErrorAttr err = mth.get(AType.JADX_ERROR);
-			if (err != null) {
-				code.startLine("/* JADX: method processing error */");
-				Throwable cause = err.getCause();
-				if (cause != null) {
-					code.newLine();
-					code.add("/*");
-					code.newLine().add("Error: ").add(Utils.getStackTrace(cause));
-					code.add("*/");
-				}
-			}
 			code.startLine("/*");
 			addFallbackMethodCode(code);
 			code.startLine("*/");
 
+			ClassInfo clsAlias = mth.getParentClass().getAlias();
+
 			code.startLine("throw new UnsupportedOperationException(\"Method not decompiled: ")
-					.add(mth.toString())
+					.add(clsAlias.makeFullClsName(clsAlias.getShortName(), true))
+					.add(".")
+					.add(mth.getAlias())
+					.add("(")
+					.add(Utils.listToString(mth.getMethodInfo().getArgumentsTypes()))
+					.add("):")
+					.add(mth.getMethodInfo().getReturnType().toString())
 					.add("\");");
 		} else {
 			RegionGen regionGen = new RegionGen(this);
@@ -190,19 +186,14 @@ public class MethodGen {
 
 	public void addFallbackMethodCode(CodeWriter code) {
 		if (mth.getInstructions() == null) {
-			JadxErrorAttr errorAttr = mth.get(AType.JADX_ERROR);
-			if (errorAttr == null
-					|| errorAttr.getCause() == null
-					|| !errorAttr.getCause().getClass().equals(DecodeException.class)) {
-				// load original instructions
-				try {
-					mth.load();
-					DepthTraversal.visit(new FallbackModeVisitor(), mth);
-				} catch (DecodeException e) {
-					LOG.error("Error reload instructions in fallback mode:", e);
-					code.startLine("// Can't load method instructions: " + e.getMessage());
-					return;
-				}
+			// load original instructions
+			try {
+				mth.load();
+				DepthTraversal.visit(new FallbackModeVisitor(), mth);
+			} catch (DecodeException e) {
+				LOG.error("Error reload instructions in fallback mode:", e);
+				code.startLine("// Can't load method instructions: " + e.getMessage());
+				return;
 			}
 		}
 		InsnNode[] insnArr = mth.getInstructions();
@@ -252,5 +243,4 @@ public class MethodGen {
 	public static String getLabelName(int offset) {
 		return "L_" + InsnUtils.formatOffset(offset);
 	}
-
 }

jadx-core/src/main/java/jadx/core/codegen/NameGen.java

@@ -1,5 +1,9 @@
 package jadx.core.codegen;
 
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
 import jadx.core.Consts;
 import jadx.core.deobf.NameMapper;
 import jadx.core.dex.attributes.nodes.LoopLabelAttr;
@@ -16,35 +20,32 @@ import jadx.core.dex.instructions.mods.ConstructorInsn;
 import jadx.core.dex.nodes.InsnNode;
 import jadx.core.dex.nodes.MethodNode;
 import jadx.core.utils.StringUtils;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import jadx.core.utils.Utils;
 
 public class NameGen {
 
 	private static final Map<String, String> OBJ_ALIAS;
 
-	private final Set<String> varNames = new HashSet<>();
+	private final Set<String> varNames = new LinkedHashSet<>();
 	private final MethodNode mth;
 	private final boolean fallback;
 
 	static {
-		OBJ_ALIAS = new HashMap<>();
-		OBJ_ALIAS.put(Consts.CLASS_STRING, "str");
-		OBJ_ALIAS.put(Consts.CLASS_CLASS, "cls");
-		OBJ_ALIAS.put(Consts.CLASS_THROWABLE, "th");
-		OBJ_ALIAS.put(Consts.CLASS_OBJECT, "obj");
-		OBJ_ALIAS.put("java.util.Iterator", "it");
-		OBJ_ALIAS.put("java.lang.Boolean", "bool");
-		OBJ_ALIAS.put("java.lang.Short", "sh");
-		OBJ_ALIAS.put("java.lang.Integer", "num");
-		OBJ_ALIAS.put("java.lang.Character", "ch");
-		OBJ_ALIAS.put("java.lang.Byte", "b");
-		OBJ_ALIAS.put("java.lang.Float", "f");
-		OBJ_ALIAS.put("java.lang.Long", "l");
-		OBJ_ALIAS.put("java.lang.Double", "d");
+		OBJ_ALIAS = Utils.newConstStringMap(
+				Consts.CLASS_STRING, "str",
+				Consts.CLASS_CLASS, "cls",
+				Consts.CLASS_THROWABLE, "th",
+				Consts.CLASS_OBJECT, "obj",
+				"java.util.Iterator", "it",
+				"java.lang.Boolean", "bool",
+				"java.lang.Short", "sh",
+				"java.lang.Integer", "num",
+				"java.lang.Character", "ch",
+				"java.lang.Byte", "b",
+				"java.lang.Float", "f",
+				"java.lang.Long", "l",
+				"java.lang.Double", "d"
+		);
 	}
 
 	public NameGen(MethodNode mth, boolean fallback) {
@@ -102,16 +103,11 @@ public class NameGen {
 		if (fallback) {
 			return getFallbackName(arg);
 		}
-		String name = arg.getName();
-		String varName;
-		if (name != null) {
-			if ("this".equals(name)) {
-				return name;
-			}
-			varName = name;
-		} else {
-			varName = guessName(arg);
+		if (arg.isThis()) {
+			return RegisterArg.THIS_ARG_NAME;
 		}
+		String name = arg.getName();
+		String varName = name != null ? name : guessName(arg);
 		if (NameMapper.isReserved(varName)) {
 			return varName + "R";
 		}
@@ -141,11 +137,11 @@ public class NameGen {
 	private String makeNameForType(ArgType type) {
 		if (type.isPrimitive()) {
 			return makeNameForPrimitive(type);
-		} else if (type.isArray()) {
-			return makeNameForType(type.getArrayRootElement()) + "Arr";
-		} else {
-			return makeNameForObject(type);
 		}
+		if (type.isArray()) {
+			return makeNameForType(type.getArrayRootElement()) + "Arr";
+		}
+		return makeNameForObject(type);
 	}
 
 	private static String makeNameForPrimitive(ArgType type) {
@@ -158,7 +154,7 @@ public class NameGen {
 			if (alias != null) {
 				return alias;
 			}
-			ClassInfo extClsInfo = ClassInfo.extCls(mth.dex(), type);
+			ClassInfo extClsInfo = ClassInfo.extCls(mth.root(), type);
 			String shortName = extClsInfo.getShortName();
 			String vName = fromName(shortName);
 			if (vName != null) {

jadx-core/src/main/java/jadx/core/codegen/RegionGen.java

@@ -1,10 +1,18 @@
 package jadx.core.codegen;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jadx.core.dex.attributes.AFlag;
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.nodes.DeclareVariablesAttr;
 import jadx.core.dex.attributes.nodes.ForceReturnAttr;
 import jadx.core.dex.attributes.nodes.LoopLabelAttr;
+import jadx.core.dex.info.ClassInfo;
 import jadx.core.dex.instructions.SwitchNode;
 import jadx.core.dex.instructions.args.InsnArg;
 import jadx.core.dex.instructions.args.NamedArg;
@@ -32,12 +40,6 @@ import jadx.core.utils.RegionUtils;
 import jadx.core.utils.exceptions.CodegenException;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class RegionGen extends InsnGen {
 	private static final Logger LOG = LoggerFactory.getLogger(RegionGen.class);
 
@@ -134,17 +136,16 @@ public class RegionGen extends InsnGen {
 	 * Connect if-else-if block
 	 */
 	private boolean connectElseIf(CodeWriter code, IContainer els) throws CodegenException {
-		if (!els.contains(AFlag.ELSE_IF_CHAIN)) {
-			return false;
-		}
-		if (!(els instanceof Region)) {
-			return false;
-		}
-		List<IContainer> subBlocks = ((Region) els).getSubBlocks();
-		if (subBlocks.size() == 1
-				&& subBlocks.get(0) instanceof IfRegion) {
-			makeIf((IfRegion) subBlocks.get(0), code, false);
-			return true;
+		if (els.contains(AFlag.ELSE_IF_CHAIN) && els instanceof Region) {
+			List<IContainer> subBlocks = ((Region) els).getSubBlocks();
+			if (subBlocks.size() == 1) {
+				IContainer elseBlock = subBlocks.get(0);
+				if (elseBlock instanceof IfRegion) {
+					declareVars(code, elseBlock);
+					makeIf((IfRegion) elseBlock, code, false);
+					return true;
+				}
+			}
 		}
 		return false;
 	}
@@ -154,7 +155,7 @@ public class RegionGen extends InsnGen {
 		if (header != null) {
 			List<InsnNode> headerInsns = header.getInstructions();
 			if (headerInsns.size() > 1) {
-				ErrorsCounter.methodError(mth, "Found not inlined instructions from loop header");
+				ErrorsCounter.methodWarn(mth, "Found not inlined instructions from loop header");
 				int last = headerInsns.size() - 1;
 				for (int i = 0; i < last; i++) {
 					InsnNode insn = headerInsns.get(i);
@@ -307,16 +308,23 @@ public class RegionGen extends InsnGen {
 			return;
 		}
 		code.startLine("} catch (");
+		if (handler.isCatchAll()) {
+			code.add("Throwable");
+		} else {
+			Iterator<ClassInfo> it = handler.getCatchTypes().iterator();
+			if (it.hasNext()) {
+				useClass(code, it.next());
+			}
+			while (it.hasNext()) {
+				code.add(" | ");
+				useClass(code, it.next());
+			}
+		}
+		code.add(' ');
 		InsnArg arg = handler.getArg();
 		if (arg instanceof RegisterArg) {
-			declareVar(code, (RegisterArg) arg);
+			code.add(mgen.getNameGen().assignArg((RegisterArg) arg));
 		} else if (arg instanceof NamedArg) {
-			if (handler.isCatchAll()) {
-				code.add("Throwable");
-			} else {
-				useClass(code, handler.getCatchType());
-			}
-			code.add(' ');
 			code.add(mgen.getNameGen().assignNamedArg((NamedArg) arg));
 		}
 		code.add(") {");

jadx-core/src/main/java/jadx/core/codegen/TypeGen.java

@@ -1,6 +1,10 @@
 package jadx.core.codegen;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jadx.api.JadxArgs;
+import jadx.core.deobf.NameMapper;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.instructions.args.PrimitiveType;
 import jadx.core.dex.nodes.IDexNode;
@@ -8,9 +12,6 @@ import jadx.core.utils.StringUtils;
 import jadx.core.utils.Utils;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class TypeGen {
 	private static final Logger LOG = LoggerFactory.getLogger(TypeGen.class);
 
@@ -57,7 +58,11 @@ public class TypeGen {
 			case BOOLEAN:
 				return lit == 0 ? "false" : "true";
 			case CHAR:
-				return stringUtils.unescapeChar((char) lit);
+				char ch = (char) lit;
+				if (!NameMapper.isPrintableChar(ch)) {
+					return Integer.toString(ch);
+				}
+				return stringUtils.unescapeChar(ch);
 			case BYTE:
 				return formatByte((byte) lit);
 			case SHORT:
@@ -171,5 +176,4 @@ public class TypeGen {
 		}
 		return Float.toString(f) + "f";
 	}
-
 }

jadx-core/src/main/java/jadx/core/deobf/DeobfPresets.java

@@ -1,9 +1,5 @@
 package jadx.core.deobf;
 
-import jadx.core.dex.info.ClassInfo;
-import jadx.core.dex.info.FieldInfo;
-import jadx.core.dex.info.MethodInfo;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -16,6 +12,10 @@ import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jadx.core.dex.info.ClassInfo;
+import jadx.core.dex.info.FieldInfo;
+import jadx.core.dex.info.MethodInfo;
+
 class DeobfPresets {
 	private static final Logger LOG = LoggerFactory.getLogger(DeobfPresets.class);
 
@@ -112,18 +112,20 @@ class DeobfPresets {
 		for (DeobfClsInfo deobfClsInfo : deobfuscator.getClsMap().values()) {
 			if (deobfClsInfo.getAlias() != null) {
 				list.add(String.format("c %s = %s",
-						deobfClsInfo.getCls().getClassInfo().getFullName(), deobfClsInfo.getAlias()));
+						deobfClsInfo.getCls().getClassInfo().makeRawFullName(), deobfClsInfo.getAlias()));
 			}
 		}
 		for (FieldInfo fld : deobfuscator.getFldMap().keySet()) {
-			list.add(String.format("f %s = %s", fld.getFullId(), fld.getAlias()));
+			list.add(String.format("f %s = %s", fld.getRawFullId(), fld.getAlias()));
 		}
 		for (MethodInfo mth : deobfuscator.getMthMap().keySet()) {
-			list.add(String.format("m %s = %s", mth.getFullId(), mth.getAlias()));
+			list.add(String.format("m %s = %s", mth.getRawFullId(), mth.getAlias()));
 		}
 		Collections.sort(list);
 		FileUtils.writeLines(deobfMapFile, MAP_FILE_CHARSET, list);
-		list.clear();
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("Deobfuscation map file saved as: {}", deobfMapFile);
+		}
 	}
 
 	private static void dfsPackageName(List<String> list, String prefix, PackageNode node) {
@@ -136,15 +138,15 @@ class DeobfPresets {
 	}
 
 	public String getForCls(ClassInfo cls) {
-		return clsPresetMap.get(cls.getFullName());
+		return clsPresetMap.get(cls.makeRawFullName());
 	}
 
 	public String getForFld(FieldInfo fld) {
-		return fldPresetMap.get(fld.getFullId());
+		return fldPresetMap.get(fld.getRawFullId());
 	}
 
 	public String getForMth(MethodInfo mth) {
-		return mthPresetMap.get(mth.getFullId());
+		return mthPresetMap.get(mth.getRawFullId());
 	}
 
 	public void clear() {

jadx-core/src/main/java/jadx/core/deobf/Deobfuscator.java

@@ -1,5 +1,21 @@
 package jadx.core.deobf;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jadx.api.JadxArgs;
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.nodes.SourceFileAttr;
@@ -12,20 +28,6 @@ import jadx.core.dex.nodes.DexNode;
 import jadx.core.dex.nodes.FieldNode;
 import jadx.core.dex.nodes.MethodNode;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class Deobfuscator {
 	private static final Logger LOG = LoggerFactory.getLogger(Deobfuscator.class);
 
@@ -48,6 +50,7 @@ public class Deobfuscator {
 
 	private final PackageNode rootPackage = new PackageNode("");
 	private final Set<String> pkgSet = new TreeSet<>();
+	private final Set<String> reservedClsNames = new HashSet<>();
 
 	private final int maxLength;
 	private final int minLength;
@@ -89,7 +92,12 @@ public class Deobfuscator {
 	private void preProcess() {
 		for (DexNode dexNode : dexNodes) {
 			for (ClassNode cls : dexNode.getClasses()) {
-				doClass(cls);
+				Collections.addAll(reservedClsNames, cls.getPackage().split("\\."));
+			}
+		}
+		for (DexNode dexNode : dexNodes) {
+			for (ClassNode cls : dexNode.getClasses()) {
+				preProcessClass(cls);
 			}
 		}
 	}
@@ -101,7 +109,7 @@ public class Deobfuscator {
 		}
 		for (DexNode dexNode : dexNodes) {
 			for (ClassNode cls : dexNode.getClasses()) {
-				processClass(dexNode, cls);
+				processClass(cls);
 			}
 		}
 		postProcess();
@@ -121,14 +129,13 @@ public class Deobfuscator {
 			for (MethodInfo mth : o.getMethods()) {
 				if (aliasToUse == null) {
 					if (mth.isRenamed() && !mth.isAliasFromPreset()) {
-						mth.setAlias(String.format("mo%d%s", id, makeName(mth.getName())));
+						mth.setAlias(String.format("mo%d%s", id, prepareNamePart(mth.getName())));
 					}
 					aliasToUse = mth.getAlias();
 				}
 				mth.setAlias(aliasToUse);
 				mth.setAliasFromPreset(aliasFromPreset);
 			}
-
 			id++;
 		}
 	}
@@ -143,114 +150,117 @@ public class Deobfuscator {
 		ovrdMap.clear();
 	}
 
-	@Nullable
-	private static ClassNode resolveOverridingInternal(DexNode dex, ClassNode cls, String signature,
-			Set<MethodInfo> overrideSet, ClassNode rootClass) {
-		ClassNode result = null;
+	private void resolveOverriding(MethodNode mth) {
+		Set<ClassNode> clsParents = new LinkedHashSet<>();
+		collectClassHierarchy(mth.getParentClass(), clsParents);
 
-		for (MethodNode m : cls.getMethods()) {
-			if (m.getMethodInfo().getShortId().startsWith(signature)) {
-				result = cls;
-				if (!overrideSet.contains(m.getMethodInfo())) {
-					overrideSet.add(m.getMethodInfo());
-				}
-				break;
+		String mthSignature = mth.getMethodInfo().makeSignature(false);
+		Set<MethodInfo> overrideSet = new LinkedHashSet<>();
+		for (ClassNode classNode : clsParents) {
+			MethodInfo methodInfo = getMthOverride(classNode.getMethods(), mthSignature);
+			if (methodInfo != null) {
+				overrideSet.add(methodInfo);
 			}
 		}
-
-		ArgType superClass = cls.getSuperClass();
-		if (superClass != null) {
-			ClassNode superNode = dex.resolveClass(superClass);
-			if (superNode != null) {
-				ClassNode clsWithMth = resolveOverridingInternal(dex, superNode, signature, overrideSet, rootClass);
-				if (clsWithMth != null) {
-					if ((result != null) && (result != cls)) {
-						if (clsWithMth != result) {
-							LOG.warn(String.format("Multiple overriding '%s' from '%s' and '%s' in '%s'",
-									signature,
-									result.getFullName(), clsWithMth.getFullName(),
-									rootClass.getFullName()));
-						}
-					} else {
-						result = clsWithMth;
-					}
-				}
-			}
+		if (overrideSet.isEmpty()) {
+			return;
 		}
-
-		for (ArgType iFaceType : cls.getInterfaces()) {
-			ClassNode iFaceNode = dex.resolveClass(iFaceType);
-			if (iFaceNode != null) {
-				ClassNode clsWithMth = resolveOverridingInternal(dex, iFaceNode, signature, overrideSet, rootClass);
-				if (clsWithMth != null) {
-					if ((result != null) && (result != cls)) {
-						if (clsWithMth != result) {
-							LOG.warn(String.format("Multiple overriding '%s' from '%s' and '%s' in '%s'",
-									signature,
-									result.getFullName(), clsWithMth.getFullName(),
-									rootClass.getFullName()));
-						}
-					} else {
-						result = clsWithMth;
-					}
-				}
-			}
+		OverridedMethodsNode overrideNode = getOverrideMethodsNode(overrideSet);
+		if (overrideNode == null) {
+			overrideNode = new OverridedMethodsNode(overrideSet);
+			ovrd.add(overrideNode);
 		}
-
-		return result;
-	}
-
-	private void resolveOverriding(DexNode dex, ClassNode cls, MethodNode mth) {
-		Set<MethodInfo> overrideSet = new HashSet<>();
-		resolveOverridingInternal(dex, cls, mth.getMethodInfo().makeSignature(false), overrideSet, cls);
-		if (overrideSet.size() > 1) {
-			OverridedMethodsNode overrideNode = null;
-			for (MethodInfo _mth : overrideSet) {
-				if (ovrdMap.containsKey(_mth)) {
-					overrideNode = ovrdMap.get(_mth);
-					break;
-				}
+		for (MethodInfo overrideMth : overrideSet) {
+			if (!ovrdMap.containsKey(overrideMth)) {
+				ovrdMap.put(overrideMth, overrideNode);
+				overrideNode.add(overrideMth);
 			}
-			if (overrideNode == null) {
-				overrideNode = new OverridedMethodsNode(overrideSet);
-				ovrd.add(overrideNode);
-			}
-			for (MethodInfo _mth : overrideSet) {
-				if (!ovrdMap.containsKey(_mth)) {
-					ovrdMap.put(_mth, overrideNode);
-					if (!overrideNode.contains(_mth)) {
-						overrideNode.add(_mth);
-					}
-				}
-			}
-		} else {
-			overrideSet.clear();
 		}
 	}
 
-	private void processClass(DexNode dex, ClassNode cls) {
+	private OverridedMethodsNode getOverrideMethodsNode(Set<MethodInfo> overrideSet) {
+		for (MethodInfo overrideMth : overrideSet) {
+			OverridedMethodsNode node = ovrdMap.get(overrideMth);
+			if (node != null) {
+				return node;
+			}
+		}
+		return null;
+	}
+
+	private MethodInfo getMthOverride(List<MethodNode> methods, String mthSignature) {
+		for (MethodNode m : methods) {
+			MethodInfo mthInfo = m.getMethodInfo();
+			if (mthInfo.getShortId().startsWith(mthSignature)) {
+				return mthInfo;
+			}
+		}
+		return null;
+	}
+
+	private void collectClassHierarchy(ClassNode cls, Set<ClassNode> collected) {
+		boolean added = collected.add(cls);
+		if (added) {
+			ArgType superClass = cls.getSuperClass();
+			if (superClass != null) {
+				ClassNode superNode = cls.dex().resolveClass(superClass);
+				if (superNode != null) {
+					collectClassHierarchy(superNode, collected);
+				}
+			}
+
+			for (ArgType argType : cls.getInterfaces()) {
+				ClassNode interfaceNode = cls.dex().resolveClass(argType);
+				if (interfaceNode != null) {
+					collectClassHierarchy(interfaceNode, collected);
+				}
+			}
+		}
+	}
+
+	private void processClass(ClassNode cls) {
 		ClassInfo clsInfo = cls.getClassInfo();
 		String fullName = getClassFullName(clsInfo);
 		if (!fullName.equals(clsInfo.getFullName())) {
-			clsInfo.rename(dex, fullName);
+			clsInfo.rename(cls.dex().root(), fullName);
 		}
 		for (FieldNode field : cls.getFields()) {
-			FieldInfo fieldInfo = field.getFieldInfo();
-			String alias = getFieldAlias(field);
-			if (alias != null) {
-				fieldInfo.setAlias(alias);
-			}
+			renameField(field);
 		}
 		for (MethodNode mth : cls.getMethods()) {
-			MethodInfo methodInfo = mth.getMethodInfo();
-			String alias = getMethodAlias(mth);
-			if (alias != null) {
-				methodInfo.setAlias(alias);
-			}
+			renameMethod(mth);
+		}
+		for (ClassNode innerCls : cls.getInnerClasses()) {
+			processClass(innerCls);
+		}
+	}
 
-			if (mth.isVirtual()) {
-				resolveOverriding(dex, cls, mth);
-			}
+	public void renameField(FieldNode field) {
+		FieldInfo fieldInfo = field.getFieldInfo();
+		String alias = getFieldAlias(field);
+		if (alias != null) {
+			fieldInfo.setAlias(alias);
+		}
+	}
+
+	public void forceRenameField(FieldNode field) {
+		field.getFieldInfo().setAlias(makeFieldAlias(field));
+	}
+
+	public void renameMethod(MethodNode mth) {
+		String alias = getMethodAlias(mth);
+		if (alias != null) {
+			mth.getMethodInfo().setAlias(alias);
+		}
+		if (mth.isVirtual()) {
+			resolveOverriding(mth);
+		}
+	}
+
+	public void forceRenameMethod(MethodNode mth) {
+		mth.getMethodInfo().setAlias(makeMethodAlias(mth));
+		if (mth.isVirtual()) {
+			resolveOverriding(mth);
 		}
 	}
 
@@ -311,7 +321,7 @@ public class Deobfuscator {
 		return prefix + clsInfo.getShortName();
 	}
 
-	private void doClass(ClassNode cls) {
+	private void preProcessClass(ClassNode cls) {
 		ClassInfo classInfo = cls.getClassInfo();
 		String pkgFullName = classInfo.getPackage();
 		PackageNode pkg = getPackageNode(pkgFullName, true);
@@ -320,13 +330,16 @@ public class Deobfuscator {
 		String alias = deobfPresets.getForCls(classInfo);
 		if (alias != null) {
 			clsMap.put(classInfo, new DeobfClsInfo(this, cls, pkg, alias));
-			return;
+		} else {
+			if (!clsMap.containsKey(classInfo)) {
+				String clsShortName = classInfo.getShortName();
+				if (shouldRename(clsShortName) || reservedClsNames.contains(clsShortName)) {
+					makeClsAlias(cls);
+				}
+			}
 		}
-		if (clsMap.containsKey(classInfo)) {
-			return;
-		}
-		if (shouldRename(classInfo.getShortName())) {
-			makeClsAlias(cls);
+		for (ClassNode innerCls : cls.getInnerClasses()) {
+			preProcessClass(innerCls);
 		}
 	}
 
@@ -348,7 +361,7 @@ public class Deobfuscator {
 
 		if (alias == null) {
 			String clsName = classInfo.getShortName();
-			alias = String.format("C%04d%s", clsIndex++, makeName(clsName));
+			alias = String.format("C%04d%s", clsIndex++, prepareNamePart(clsName));
 		}
 		PackageNode pkg = getPackageNode(classInfo.getPackage(), true);
 		clsMap.put(classInfo, new DeobfClsInfo(this, cls, pkg, alias));
@@ -361,21 +374,33 @@ public class Deobfuscator {
 		if (sourceFileAttr == null) {
 			return null;
 		}
+		if (cls.getClassInfo().isInner()) {
+			return null;
+		}
 		String name = sourceFileAttr.getFileName();
 		if (name.endsWith(".java")) {
 			name = name.substring(0, name.length() - ".java".length());
+		} else if (name.endsWith(".kt")) {
+			name = name.substring(0, name.length() - ".kt".length());
 		}
-		if (NameMapper.isValidIdentifier(name)
-				&& !NameMapper.isReserved(name)) {
-			// TODO: check if no class with this name exists or already renamed
-			cls.remove(AType.SOURCE_FILE);
-			return name;
+		if (!NameMapper.isValidIdentifier(name) || NameMapper.isReserved(name)) {
+			return null;
 		}
-		return null;
+		for (DeobfClsInfo deobfClsInfo : clsMap.values()) {
+			if (deobfClsInfo.getAlias().equals(name)) {
+				return null;
+			}
+		}
+		ClassNode otherCls = cls.dex().root().searchClassByName(cls.getPackage() + "." + name);
+		if (otherCls != null) {
+			return null;
+		}
+		cls.remove(AType.SOURCE_FILE);
+		return name;
 	}
 
 	@Nullable
-	public String getFieldAlias(FieldNode field) {
+	private String getFieldAlias(FieldNode field) {
 		FieldInfo fieldInfo = field.getFieldInfo();
 		String alias = fldMap.get(fieldInfo);
 		if (alias != null) {
@@ -393,8 +418,11 @@ public class Deobfuscator {
 	}
 
 	@Nullable
-	public String getMethodAlias(MethodNode mth) {
+	private String getMethodAlias(MethodNode mth) {
 		MethodInfo methodInfo = mth.getMethodInfo();
+		if (methodInfo.isClassInit() || methodInfo.isConstructor()) {
+			return null;
+		}
 		String alias = mthMap.get(methodInfo);
 		if (alias != null) {
 			return alias;
@@ -412,13 +440,13 @@ public class Deobfuscator {
 	}
 
 	public String makeFieldAlias(FieldNode field) {
-		String alias = String.format("f%d%s", fldIndex++, makeName(field.getName()));
+		String alias = String.format("f%d%s", fldIndex++, prepareNamePart(field.getName()));
 		fldMap.put(field.getFieldInfo(), alias);
 		return alias;
 	}
 
 	public String makeMethodAlias(MethodNode mth) {
-		String alias = String.format("m%d%s", mthIndex++, makeName(mth.getName()));
+		String alias = String.format("m%d%s", mthIndex++, prepareNamePart(mth.getName()));
 		mthMap.put(mth.getMethodInfo(), alias);
 		return alias;
 	}
@@ -440,25 +468,21 @@ public class Deobfuscator {
 
 		String pkgName = pkg.getName();
 		if (!pkg.hasAlias() && shouldRename(pkgName)) {
-			String pkgAlias = String.format("p%03d%s", pkgIndex++, makeName(pkgName));
+			String pkgAlias = String.format("p%03d%s", pkgIndex++, prepareNamePart(pkgName));
 			pkg.setAlias(pkgAlias);
 		}
 	}
 
 	private boolean shouldRename(String s) {
-		return s.length() > maxLength
-				|| s.length() < minLength
-				|| NameMapper.isReserved(s)
-				|| !NameMapper.isAllCharsPrintable(s);
+		int len = s.length();
+		return len < minLength || len > maxLength
+				|| !NameMapper.isValidIdentifier(s);
 	}
 
-	private String makeName(String name) {
+	private String prepareNamePart(String name) {
 		if (name.length() > maxLength) {
 			return "x" + Integer.toHexString(name.hashCode());
 		}
-		if (NameMapper.isReserved(name)) {
-			return name;
-		}
 		if (!NameMapper.isAllCharsPrintable(name)) {
 			return removeInvalidChars(name);
 		}

jadx-core/src/main/java/jadx/core/deobf/NameMapper.java

@@ -5,6 +5,8 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import static jadx.core.utils.StringUtils.notEmpty;
+
 public class NameMapper {
 
 	private static final Pattern VALID_JAVA_IDENTIFIER = Pattern.compile(
@@ -76,11 +78,17 @@ public class NameMapper {
 	}
 
 	public static boolean isValidIdentifier(String str) {
-		return VALID_JAVA_IDENTIFIER.matcher(str).matches() && isAllCharsPrintable(str);
+		return notEmpty(str)
+				&& !isReserved(str)
+				&& VALID_JAVA_IDENTIFIER.matcher(str).matches()
+				&& isAllCharsPrintable(str);
 	}
 
 	public static boolean isValidFullIdentifier(String str) {
-		return VALID_JAVA_FULL_IDENTIFIER.matcher(str).matches() && isAllCharsPrintable(str);
+		return notEmpty(str)
+				&& !isReserved(str)
+				&& VALID_JAVA_FULL_IDENTIFIER.matcher(str).matches()
+				&& isAllCharsPrintable(str);
 	}
 
 	public static boolean isPrintableChar(int c) {

jadx-core/src/main/java/jadx/core/deobf/OverridedMethodsNode.java

@@ -1,10 +1,10 @@
 package jadx.core.deobf;
 
-import jadx.core.dex.info.MethodInfo;
-
 import java.util.Set;
 
-/* package */ class OverridedMethodsNode {
+import jadx.core.dex.info.MethodInfo;
+
+class OverridedMethodsNode {
 
 	private Set<MethodInfo> methods;
 

jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java

@@ -26,6 +26,7 @@ public enum AFlag {
 	SKIP_ARG, // skip argument in invoke call
 	ANONYMOUS_CONSTRUCTOR,
 	ANONYMOUS_CLASS,
+	THIS,
 
 	ELSE_IF_CHAIN,
 

jadx-core/src/main/java/jadx/core/dex/attributes/AType.java

@@ -9,7 +9,8 @@ import jadx.core.dex.attributes.nodes.EnumMapAttr;
 import jadx.core.dex.attributes.nodes.FieldReplaceAttr;
 import jadx.core.dex.attributes.nodes.ForceReturnAttr;
 import jadx.core.dex.attributes.nodes.IgnoreEdgeAttr;
-import jadx.core.dex.attributes.nodes.JadxErrorAttr;
+import jadx.core.dex.attributes.nodes.JadxError;
+import jadx.core.dex.attributes.nodes.JadxWarn;
 import jadx.core.dex.attributes.nodes.JumpInfo;
 import jadx.core.dex.attributes.nodes.LoopInfo;
 import jadx.core.dex.attributes.nodes.LoopLabelAttr;
@@ -33,13 +34,16 @@ public class AType<T extends IAttribute> {
 	public static final AType<AttrList<LoopInfo>> LOOP = new AType<>();
 	public static final AType<AttrList<EdgeInsnAttr>> EDGE_INSN = new AType<>();
 
+	public static final AType<AttrList<JadxError>> JADX_ERROR = new AType<>();
+	public static final AType<AttrList<JadxWarn>> JADX_WARN = new AType<>();
+	public static final AType<AttrList<String>> COMMENTS = new AType<>();
+
 	public static final AType<ExcHandlerAttr> EXC_HANDLER = new AType<>();
 	public static final AType<CatchAttr> CATCH_BLOCK = new AType<>();
 	public static final AType<SplitterBlockAttr> SPLITTER_BLOCK = new AType<>();
 	public static final AType<ForceReturnAttr> FORCE_RETURN = new AType<>();
 	public static final AType<FieldInitAttr> FIELD_INIT = new AType<>();
 	public static final AType<FieldReplaceAttr> FIELD_REPLACE = new AType<>();
-	public static final AType<JadxErrorAttr> JADX_ERROR = new AType<>();
 	public static final AType<MethodInlineAttr> METHOD_INLINE = new AType<>();
 	public static final AType<EnumClassAttr> ENUM_CLASS = new AType<>();
 	public static final AType<EnumMapAttr> ENUM_MAP = new AType<>();
@@ -50,4 +54,7 @@ public class AType<T extends IAttribute> {
 	public static final AType<DeclareVariablesAttr> DECLARE_VARIABLES = new AType<>();
 	public static final AType<LoopLabelAttr> LOOP_LABEL = new AType<>();
 	public static final AType<IgnoreEdgeAttr> IGNORE_EDGE = new AType<>();
+
+	private AType() {
+	}
 }

jadx-core/src/main/java/jadx/core/dex/attributes/AttrList.java

@@ -1,14 +1,14 @@
 package jadx.core.dex.attributes;
 
-import jadx.core.utils.Utils;
-
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 
+import jadx.core.utils.Utils;
+
 public class AttrList<T> implements IAttribute {
 
 	private final AType<AttrList<T>> type;
-	private final List<T> list = new LinkedList<>();
+	private final List<T> list = new ArrayList<>();
 
 	public AttrList(AType<AttrList<T>> type) {
 		this.type = type;

jadx-core/src/main/java/jadx/core/dex/attributes/AttrNode.java

@@ -1,9 +1,9 @@
 package jadx.core.dex.attributes;
 
-import jadx.core.dex.attributes.annotations.Annotation;
-
 import java.util.List;
 
+import jadx.core.dex.attributes.annotations.Annotation;
+
 public abstract class AttrNode implements IAttributeNode {
 
 	private static final AttributeStorage EMPTY_ATTR_STORAGE = new EmptyAttrStorage();
@@ -96,4 +96,8 @@ public abstract class AttrNode implements IAttributeNode {
 	public String getAttributesString() {
 		return storage.toString();
 	}
+
+	public boolean isAttrStorageEmpty() {
+		return storage.isEmpty();
+	}
 }

jadx-core/src/main/java/jadx/core/dex/attributes/AttributeStorage.java

@@ -1,9 +1,5 @@
 package jadx.core.dex.attributes;
 
-import jadx.core.dex.attributes.annotations.Annotation;
-import jadx.core.dex.attributes.annotations.AnnotationsList;
-import jadx.core.utils.Utils;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -12,6 +8,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import jadx.core.dex.attributes.annotations.Annotation;
+import jadx.core.dex.attributes.annotations.AnnotationsList;
+import jadx.core.utils.Utils;
+
 /**
  * Storage for different attribute types:
  * 1. flags - boolean attribute (set or not)

jadx-core/src/main/java/jadx/core/dex/attributes/EmptyAttrStorage.java

@@ -1,10 +1,10 @@
 package jadx.core.dex.attributes;
 
-import jadx.core.dex.attributes.annotations.Annotation;
-
 import java.util.Collections;
 import java.util.List;
 
+import jadx.core.dex.attributes.annotations.Annotation;
+
 public final class EmptyAttrStorage extends AttributeStorage {
 
 	@Override
@@ -34,18 +34,22 @@ public final class EmptyAttrStorage extends AttributeStorage {
 
 	@Override
 	public void clear() {
+		// ignore
 	}
 
 	@Override
 	public void remove(AFlag flag) {
+		// ignore
 	}
 
 	@Override
 	public <T extends IAttribute> void remove(AType<T> type) {
+		// ignore
 	}
 
 	@Override
 	public void remove(IAttribute attr) {
+		// ignore
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/dex/attributes/IAttribute.java

@@ -1,5 +1,5 @@
 package jadx.core.dex.attributes;
 
 public interface IAttribute {
-	AType<? extends IAttribute> getType();
+	<T extends IAttribute> AType<T> getType();
 }

jadx-core/src/main/java/jadx/core/dex/attributes/IAttributeNode.java

@@ -1,9 +1,9 @@
 package jadx.core.dex.attributes;
 
-import jadx.core.dex.attributes.annotations.Annotation;
-
 import java.util.List;
 
+import jadx.core.dex.attributes.annotations.Annotation;
+
 public interface IAttributeNode {
 
 	void add(AFlag flag);

jadx-core/src/main/java/jadx/core/dex/attributes/annotations/Annotation.java

@@ -1,9 +1,9 @@
 package jadx.core.dex.attributes.annotations;
 
-import jadx.core.dex.instructions.args.ArgType;
-
 import java.util.Map;
 
+import jadx.core.dex.instructions.args.ArgType;
+
 public class Annotation {
 
 	public enum Visibility {
@@ -44,5 +44,4 @@ public class Annotation {
 	public String toString() {
 		return "Annotation[" + visibility + ", " + atype + ", " + values + "]";
 	}
-
 }

jadx-core/src/main/java/jadx/core/dex/attributes/annotations/AnnotationsList.java

@@ -1,15 +1,15 @@
 package jadx.core.dex.attributes.annotations;
 
-import jadx.core.dex.attributes.AType;
-import jadx.core.dex.attributes.IAttribute;
-import jadx.core.utils.Utils;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
+import jadx.core.utils.Utils;
+
 public class AnnotationsList implements IAttribute {
 
 	public static final AnnotationsList EMPTY = new AnnotationsList(Collections.<Annotation>emptyList());
@@ -48,5 +48,4 @@ public class AnnotationsList implements IAttribute {
 	public String toString() {
 		return Utils.listToString(map.values());
 	}
-
 }

jadx-core/src/main/java/jadx/core/dex/attributes/annotations/MethodParameters.java

@@ -1,12 +1,12 @@
 package jadx.core.dex.attributes.annotations;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.IAttribute;
 import jadx.core.utils.Utils;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class MethodParameters implements IAttribute {
 
 	private final List<AnnotationsList> paramList;
@@ -28,5 +28,4 @@ public class MethodParameters implements IAttribute {
 	public String toString() {
 		return Utils.listToString(paramList);
 	}
-
 }

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/DeclareVariablesAttr.java

@@ -1,13 +1,13 @@
 package jadx.core.dex.attributes.nodes;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.IAttribute;
 import jadx.core.dex.instructions.args.RegisterArg;
 import jadx.core.utils.Utils;
 
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * List of variables to be declared at region start.
  */

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EnumClassAttr.java

@@ -1,5 +1,8 @@
 package jadx.core.dex.attributes.nodes;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.IAttribute;
 import jadx.core.dex.info.FieldInfo;
@@ -7,9 +10,6 @@ import jadx.core.dex.instructions.mods.ConstructorInsn;
 import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.nodes.MethodNode;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class EnumClassAttr implements IAttribute {
 
 	public static class EnumField {
@@ -78,5 +78,4 @@ public class EnumClassAttr implements IAttribute {
 	public String toString() {
 		return "Enum fields: " + fields;
 	}
-
 }

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EnumMapAttr.java

@@ -1,12 +1,14 @@
 package jadx.core.dex.attributes.nodes;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.IAttribute;
 import jadx.core.dex.nodes.FieldNode;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class EnumMapAttr implements IAttribute {
 
 	public static class KeyValueMap {
@@ -21,9 +23,14 @@ public class EnumMapAttr implements IAttribute {
 		}
 	}
 
-	private final Map<FieldNode, KeyValueMap> fieldsMap = new HashMap<>();
+	@Nullable
+	private Map<FieldNode, KeyValueMap> fieldsMap;
 
+	@Nullable
 	public KeyValueMap getMap(FieldNode field) {
+		if (fieldsMap == null) {
+			return null;
+		}
 		return fieldsMap.get(field);
 	}
 
@@ -31,11 +38,18 @@ public class EnumMapAttr implements IAttribute {
 		KeyValueMap map = getMap(field);
 		if (map == null) {
 			map = new KeyValueMap();
+			if (fieldsMap == null) {
+				fieldsMap = new HashMap<>();
+			}
 			fieldsMap.put(field, map);
 		}
 		map.put(key, value);
 	}
 
+	public boolean isEmpty() {
+		return fieldsMap == null || fieldsMap.isEmpty();
+	}
+
 	@Override
 	public AType<EnumMapAttr> getType() {
 		return AType.ENUM_MAP;
@@ -45,5 +59,4 @@ public class EnumMapAttr implements IAttribute {
 	public String toString() {
 		return "Enum fields map: " + fieldsMap;
 	}
-
 }

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/ForceReturnAttr.java

@@ -26,5 +26,4 @@ public class ForceReturnAttr implements IAttribute {
 	public String toString() {
 		return "FORCE_RETURN " + Utils.listToString(returnInsn.getArguments());
 	}
-
 }

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/IgnoreEdgeAttr.java

@@ -1,13 +1,13 @@
 package jadx.core.dex.attributes.nodes;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.IAttribute;
 import jadx.core.dex.nodes.BlockNode;
 import jadx.core.utils.Utils;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public class IgnoreEdgeAttr implements IAttribute {
 
 	private final Set<BlockNode> blocks = new HashSet<>(3);

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxError.java

@@ -1,33 +1,38 @@
 package jadx.core.dex.attributes.nodes;
 
-import jadx.core.dex.attributes.AType;
-import jadx.core.dex.attributes.IAttribute;
 import jadx.core.utils.Utils;
 
-public class JadxErrorAttr implements IAttribute {
+public class JadxError {
 
+	private final String error;
 	private final Throwable cause;
 
-	public JadxErrorAttr(Throwable cause) {
+	public JadxError(Throwable cause) {
+		this(null, cause);
+	}
+
+	public JadxError(String error, Throwable cause) {
+		this.error = error;
 		this.cause = cause;
 	}
 
+	public String getError() {
+		return error;
+	}
+
 	public Throwable getCause() {
 		return cause;
 	}
 
-	@Override
-	public AType<JadxErrorAttr> getType() {
-		return AType.JADX_ERROR;
-	}
-
 	@Override
 	public String toString() {
 		StringBuilder str = new StringBuilder();
 		str.append("JadxError: ");
-		if (cause == null) {
-			str.append("null");
-		} else {
+		if (error != null) {
+			str.append(error);
+			str.append(' ');
+		}
+		if (cause != null) {
 			str.append(cause.getClass());
 			str.append(":");
 			str.append(cause.getMessage());
@@ -36,5 +41,4 @@ public class JadxErrorAttr implements IAttribute {
 		}
 		return str.toString();
 	}
-
 }

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxWarn.java

@@ -0,0 +1,21 @@
+package jadx.core.dex.attributes.nodes;
+
+import java.util.Objects;
+
+public class JadxWarn {
+
+	private final String warn;
+
+	public JadxWarn(String warn) {
+		this.warn = Objects.requireNonNull(warn);
+	}
+
+	public String getWarn() {
+		return warn;
+	}
+
+	@Override
+	public String toString() {
+		return "JadxWarn: " + warn;
+	}
+}

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LoopInfo.java

@@ -1,16 +1,16 @@
 package jadx.core.dex.attributes.nodes;
 
-import jadx.core.dex.attributes.AType;
-import jadx.core.dex.nodes.BlockNode;
-import jadx.core.dex.nodes.Edge;
-import jadx.core.utils.BlockUtils;
-
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.nodes.BlockNode;
+import jadx.core.dex.nodes.Edge;
+import jadx.core.utils.BlockUtils;
+
 public class LoopInfo {
 
 	private final BlockNode start;

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/PhiListAttr.java

@@ -1,12 +1,12 @@
 package jadx.core.dex.attributes.nodes;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.IAttribute;
 import jadx.core.dex.instructions.PhiInsn;
 
-import java.util.LinkedList;
-import java.util.List;
-
 public class PhiListAttr implements IAttribute {
 
 	private final List<PhiInsn> list = new LinkedList<>();

jadx-core/src/main/java/jadx/core/dex/info/AccessInfo.java

@@ -1,11 +1,12 @@
 package jadx.core.dex.info;
 
-import jadx.core.Consts;
-
 import com.android.dx.rop.code.AccessFlags;
 
+import jadx.core.Consts;
+
 public class AccessInfo {
 
+	public static final int VISIBILITY_FLAGS = AccessFlags.ACC_PUBLIC | AccessFlags.ACC_PROTECTED | AccessFlags.ACC_PRIVATE;
 	private final int accFlags;
 
 	public enum AFType {
@@ -30,11 +31,24 @@ public class AccessInfo {
 		return this;
 	}
 
+	public AccessInfo add(int flag) {
+		if (!containsFlag(flag)) {
+			return new AccessInfo(accFlags | flag, type);
+		}
+		return this;
+	}
+
+	public AccessInfo changeVisibility(int flag) {
+		int currentVisFlags = accFlags & VISIBILITY_FLAGS;
+		if (currentVisFlags == flag) {
+			return this;
+		}
+		int unsetAllVisFlags = accFlags & ~VISIBILITY_FLAGS;
+		return new AccessInfo(unsetAllVisFlags | flag, type);
+	}
+
 	public AccessInfo getVisibility() {
-		int f = accFlags & AccessFlags.ACC_PUBLIC
-				| accFlags & AccessFlags.ACC_PROTECTED
-				| accFlags & AccessFlags.ACC_PRIVATE;
-		return new AccessInfo(f, type);
+		return new AccessInfo(accFlags & VISIBILITY_FLAGS, type);
 	}
 
 	public boolean isPublic() {
@@ -140,10 +154,8 @@ public class AccessInfo {
 				if (isBridge()) {
 					code.append("/* bridge */ ");
 				}
-				if (Consts.DEBUG) {
-					if (isVarArgs()) {
-						code.append("/* varargs */ ");
-					}
+				if (Consts.DEBUG && isVarArgs()) {
+					code.append("/* varargs */ ");
 				}
 				break;
 

jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java

@@ -1,12 +1,15 @@
 package jadx.core.dex.info;
 
-import jadx.core.dex.instructions.args.ArgType;
-import jadx.core.dex.nodes.DexNode;
-import jadx.core.utils.exceptions.JadxRuntimeException;
-
 import java.io.File;
 
-public final class ClassInfo {
+import org.jetbrains.annotations.NotNull;
+
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.nodes.DexNode;
+import jadx.core.dex.nodes.RootNode;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+
+public final class ClassInfo implements Comparable<ClassInfo> {
 
 	private final ArgType type;
 	private String pkg;
@@ -17,50 +20,50 @@ public final class ClassInfo {
 	// class info after rename (deobfuscation)
 	private ClassInfo alias;
 
-	private ClassInfo(DexNode dex, ArgType type) {
-		this(dex, type, true);
+	private ClassInfo(RootNode root, ArgType type) {
+		this(root, type, true);
 	}
 
-	private ClassInfo(DexNode dex, ArgType type, boolean inner) {
+	private ClassInfo(RootNode root, ArgType type, boolean inner) {
 		if (!type.isObject() || type.isGeneric()) {
 			throw new JadxRuntimeException("Not class type: " + type);
 		}
 		this.type = type;
 		this.alias = this;
 
-		splitNames(dex, inner);
+		splitNames(root, inner);
 	}
 
-	public static ClassInfo fromType(DexNode dex, ArgType type) {
+	public static ClassInfo fromType(RootNode root, ArgType type) {
 		if (type.isArray()) {
 			type = ArgType.OBJECT;
 		}
-		ClassInfo cls = dex.root().getInfoStorage().getCls(type);
+		ClassInfo cls = root.getInfoStorage().getCls(type);
 		if (cls != null) {
 			return cls;
 		}
-		cls = new ClassInfo(dex, type);
-		return dex.root().getInfoStorage().putCls(cls);
+		cls = new ClassInfo(root, type);
+		return root.getInfoStorage().putCls(cls);
 	}
 
 	public static ClassInfo fromDex(DexNode dex, int clsIndex) {
 		if (clsIndex == DexNode.NO_INDEX) {
 			return null;
 		}
-		return fromType(dex, dex.getType(clsIndex));
+		return fromType(dex.root(), dex.getType(clsIndex));
 	}
 
-	public static ClassInfo fromName(DexNode dex, String clsName) {
-		return fromType(dex, ArgType.object(clsName));
+	public static ClassInfo fromName(RootNode root, String clsName) {
+		return fromType(root, ArgType.object(clsName));
 	}
 
-	public static ClassInfo extCls(DexNode dex, ArgType type) {
-		ClassInfo classInfo = fromName(dex, type.getObject());
+	public static ClassInfo extCls(RootNode root, ArgType type) {
+		ClassInfo classInfo = fromName(root, type.getObject());
 		return classInfo.alias;
 	}
 
-	public void rename(DexNode dex, String fullName) {
-		ClassInfo newAlias = new ClassInfo(dex, ArgType.object(fullName), isInner());
+	public void rename(RootNode root, String fullName) {
+		ClassInfo newAlias = new ClassInfo(root, ArgType.object(fullName), isInner());
 		if (!alias.getFullName().equals(newAlias.getFullName())) {
 			this.alias = newAlias;
 		}
@@ -74,7 +77,7 @@ public final class ClassInfo {
 		return alias;
 	}
 
-	private void splitNames(DexNode dex, boolean canBeInner) {
+	private void splitNames(RootNode root, boolean canBeInner) {
 		String fullObjectName = type.getObject();
 		String clsName;
 		int dot = fullObjectName.lastIndexOf('.');
@@ -93,7 +96,7 @@ public final class ClassInfo {
 				parClsName = clsName.substring(0, sep);
 			}
 
-			parentClass = fromName(dex, parClsName);
+			parentClass = fromName(root, parClsName);
 			clsName = clsName.substring(sep + 1);
 		} else {
 			parentClass = null;
@@ -110,11 +113,15 @@ public final class ClassInfo {
 		return pkg.isEmpty() ? shortName : pkg + "." + shortName;
 	}
 
+	public String makeRawFullName() {
+		return makeFullClsName(this.name, true);
+	}
+
 	public String getFullPath() {
-		ClassInfo alias = getAlias();
-		return alias.getPackage().replace('.', File.separatorChar)
+		ClassInfo usedAlias = getAlias();
+		return usedAlias.getPackage().replace('.', File.separatorChar)
 				+ File.separatorChar
-				+ alias.getNameWithoutPackage().replace('.', '_');
+				+ usedAlias.getNameWithoutPackage().replace('.', '_');
 	}
 
 	public String getFullName() {
@@ -160,8 +167,8 @@ public final class ClassInfo {
 		return parentClass != null;
 	}
 
-	public void notInner(DexNode dex) {
-		splitNames(dex, false);
+	public void notInner(RootNode root) {
+		splitNames(root, false);
 	}
 
 	public ArgType getType() {
@@ -189,4 +196,9 @@ public final class ClassInfo {
 		}
 		return false;
 	}
+
+	@Override
+	public int compareTo(@NotNull ClassInfo o) {
+		return fullName.compareTo(o.fullName);
+	}
 }

jadx-core/src/main/java/jadx/core/dex/info/ConstStorage.java

@@ -15,8 +15,8 @@ import jadx.core.dex.instructions.args.PrimitiveType;
 import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.nodes.DexNode;
 import jadx.core.dex.nodes.FieldNode;
-import jadx.core.dex.nodes.ResRefField;
 import jadx.core.dex.nodes.parser.FieldInitAttr;
+import jadx.core.utils.ErrorsCounter;
 
 public class ConstStorage {
 
@@ -101,16 +101,16 @@ public class ConstStorage {
 
 	@Nullable
 	public FieldNode getConstField(ClassNode cls, Object value, boolean searchGlobal) {
-		DexNode dex = cls.dex();
-		if (value instanceof Integer) {
-			String str = resourcesNames.get(value);
-			if (str != null) {
-				return new ResRefField(dex, str.replace('/', '.'));
-			}
-		}
 		if (!replaceEnabled) {
 			return null;
 		}
+		DexNode dex = cls.dex();
+		if (value instanceof Integer) {
+			FieldNode rField = getResourceField((Integer) value, dex);
+			if (rField != null) {
+				return rField;
+			}
+		}
 		boolean foundInGlobal = globalValues.contains(value);
 		if (foundInGlobal && !searchGlobal) {
 			return null;
@@ -139,6 +139,31 @@ public class ConstStorage {
 		return null;
 	}
 
+	@Nullable
+	private FieldNode getResourceField(Integer value, DexNode dex) {
+		String str = resourcesNames.get(value);
+		if (str == null) {
+			return null;
+		}
+		ClassNode appResClass = dex.root().getAppResClass();
+		if (appResClass == null) {
+			return null;
+		}
+		String[] parts = str.split("/", 2);
+		if (parts.length != 2) {
+			return null;
+		}
+		String typeName = parts[0];
+		String fieldName = parts[1];
+		for (ClassNode innerClass : appResClass.getInnerClasses()) {
+			if (innerClass.getShortName().equals(typeName)) {
+				return innerClass.searchFieldByName(fieldName);
+			}
+		}
+		ErrorsCounter.classWarn(appResClass, "Not found resource field with id: " + value + ", name: " + str.replace('/', '.'));
+		return null;
+	}
+
 	@Nullable
 	public FieldNode getConstFieldByLiteralArg(ClassNode cls, LiteralArg arg) {
 		PrimitiveType type = arg.getType().getPrimitiveType();

jadx-core/src/main/java/jadx/core/dex/info/FieldInfo.java

@@ -1,11 +1,11 @@
 package jadx.core.dex.info;
 
+import com.android.dex.FieldId;
+
 import jadx.core.codegen.TypeGen;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.nodes.DexNode;
 
-import com.android.dex.FieldId;
-
 public final class FieldInfo {
 
 	private final ClassInfo declClass;
@@ -57,10 +57,18 @@ public final class FieldInfo {
 		return declClass.getFullName() + "." + name + ":" + TypeGen.signature(type);
 	}
 
+	public String getRawFullId() {
+		return declClass.makeRawFullName() + "." + name + ":" + TypeGen.signature(type);
+	}
+
 	public boolean isRenamed() {
 		return !name.equals(alias);
 	}
 
+	public boolean equalsNameAndType(FieldInfo other) {
+		return name.equals(other.name) && type.equals(other.type);
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {

jadx-core/src/main/java/jadx/core/dex/info/InfoStorage.java

@@ -1,11 +1,11 @@
 package jadx.core.dex.info;
 
-import jadx.core.dex.instructions.args.ArgType;
-import jadx.core.dex.nodes.DexNode;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.nodes.DexNode;
+
 public class InfoStorage {
 
 	private final Map<ArgType, ClassInfo> classes = new HashMap<>();

jadx-core/src/main/java/jadx/core/dex/info/MethodInfo.java

@@ -1,15 +1,15 @@
 package jadx.core.dex.info;
 
-import jadx.core.codegen.TypeGen;
-import jadx.core.dex.instructions.args.ArgType;
-import jadx.core.dex.nodes.DexNode;
-import jadx.core.utils.Utils;
-
 import java.util.List;
 
 import com.android.dex.MethodId;
 import com.android.dex.ProtoId;
 
+import jadx.core.codegen.TypeGen;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.nodes.DexNode;
+import jadx.core.utils.Utils;
+
 public final class MethodInfo {
 
 	private final String name;
@@ -68,6 +68,10 @@ public final class MethodInfo {
 		return declClass.getFullName() + "." + shortId;
 	}
 
+	public String getRawFullId() {
+		return declClass.makeRawFullName() + "." + shortId;
+	}
+
 	/**
 	 * Method name and signature
 	 */
@@ -146,5 +150,4 @@ public final class MethodInfo {
 		return declClass.getFullName() + "." + name
 				+ "(" + Utils.listToString(args) + "):" + retType;
 	}
-
 }

jadx-core/src/main/java/jadx/core/dex/instructions/ArithNode.java

@@ -1,5 +1,7 @@
 package jadx.core.dex.instructions;
 
+import com.android.dx.io.instructions.DecodedInstruction;
+
 import jadx.core.dex.attributes.AFlag;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.instructions.args.InsnArg;
@@ -7,8 +9,6 @@ import jadx.core.dex.instructions.args.RegisterArg;
 import jadx.core.dex.nodes.InsnNode;
 import jadx.core.utils.InsnUtils;
 
-import com.android.dx.io.instructions.DecodedInstruction;
-
 public class ArithNode extends InsnNode {
 
 	private final ArithOp op;
@@ -80,5 +80,4 @@ public class ArithNode extends InsnNode {
 				+ op.getSymbol() + " "
 				+ getArg(1);
 	}
-
 }

jadx-core/src/main/java/jadx/core/dex/instructions/CallMthInterface.java

@@ -0,0 +1,8 @@
+package jadx.core.dex.instructions;
+
+import jadx.core.dex.info.MethodInfo;
+
+public interface CallMthInterface {
+
+	public MethodInfo getCallMth();
+}

jadx-core/src/main/java/jadx/core/dex/instructions/FillArrayNode.java

@@ -1,5 +1,10 @@
 package jadx.core.dex.instructions;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import com.android.dx.io.instructions.FillArrayDataPayloadDecodedInstruction;
+
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.instructions.args.InsnArg;
 import jadx.core.dex.instructions.args.LiteralArg;
@@ -8,11 +13,6 @@ import jadx.core.dex.nodes.DexNode;
 import jadx.core.dex.nodes.InsnNode;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import com.android.dx.io.instructions.FillArrayDataPayloadDecodedInstruction;
-
 public final class FillArrayNode extends InsnNode {
 
 	private final Object data;

jadx-core/src/main/java/jadx/core/dex/instructions/FilledNewArrayNode.java

@@ -1,10 +1,10 @@
 package jadx.core.dex.instructions;
 
+import org.jetbrains.annotations.NotNull;
+
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.nodes.InsnNode;
 
-import org.jetbrains.annotations.NotNull;
-
 public class FilledNewArrayNode extends InsnNode {
 
 	private final ArgType elemType;

jadx-core/src/main/java/jadx/core/dex/instructions/GotoNode.java

@@ -1,11 +1,10 @@
 package jadx.core.dex.instructions;
 
-import jadx.core.dex.nodes.InsnNode;
 import jadx.core.utils.InsnUtils;
 
-public class GotoNode extends InsnNode {
+public class GotoNode extends TargetInsnNode {
 
-	protected int target;
+	protected final int target;
 
 	public GotoNode(int target) {
 		this(InsnType.GOTO, target, 0);

jadx-core/src/main/java/jadx/core/dex/instructions/IfNode.java

@@ -1,5 +1,9 @@
 package jadx.core.dex.instructions;
 
+import java.util.List;
+
+import com.android.dx.io.instructions.DecodedInstruction;
+
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.instructions.args.InsnArg;
 import jadx.core.dex.instructions.args.PrimitiveType;
@@ -7,8 +11,6 @@ import jadx.core.dex.nodes.BlockNode;
 import jadx.core.dex.nodes.InsnNode;
 import jadx.core.utils.InsnUtils;
 
-import com.android.dx.io.instructions.DecodedInstruction;
-
 import static jadx.core.utils.BlockUtils.getBlockByOffset;
 import static jadx.core.utils.BlockUtils.selectOther;
 
@@ -47,7 +49,6 @@ public class IfNode extends GotoNode {
 		BlockNode tmp = thenBlock;
 		thenBlock = elseBlock;
 		elseBlock = tmp;
-		target = thenBlock.getStartOffset();
 	}
 
 	public void changeCondition(IfOp op, InsnArg arg1, InsnArg arg2) {
@@ -56,15 +57,31 @@ public class IfNode extends GotoNode {
 		setArg(1, arg2);
 	}
 
+	@Override
 	public void initBlocks(BlockNode curBlock) {
-		thenBlock = getBlockByOffset(target, curBlock.getSuccessors());
-		if (curBlock.getSuccessors().size() == 1) {
+		List<BlockNode> successors = curBlock.getSuccessors();
+		thenBlock = getBlockByOffset(target, successors);
+		if (successors.size() == 1) {
 			elseBlock = thenBlock;
 		} else {
-			elseBlock = selectOther(thenBlock, curBlock.getSuccessors());
+			elseBlock = selectOther(thenBlock, successors);
 		}
 	}
 
+	@Override
+	public boolean replaceTargetBlock(BlockNode origin, BlockNode replace) {
+		boolean replaced = false;
+		if (thenBlock == origin) {
+			thenBlock = replace;
+			replaced = true;
+		}
+		if (elseBlock == origin) {
+			elseBlock = replace;
+			replaced = true;
+		}
+		return replaced;
+	}
+
 	public BlockNode getThenBlock() {
 		return thenBlock;
 	}
@@ -73,6 +90,11 @@ public class IfNode extends GotoNode {
 		return elseBlock;
 	}
 
+	@Override
+	public int getTarget() {
+		return thenBlock == null ? target : thenBlock.getStartOffset();
+	}
+
 	@Override
 	public boolean isSame(InsnNode obj) {
 		if (this == obj) {

jadx-core/src/main/java/jadx/core/dex/instructions/InsnDecoder.java

@@ -112,17 +112,15 @@ public class InsnDecoder {
 						InsnArg.lit(insn, ArgType.WIDE));
 
 			case Opcodes.CONST_STRING:
-			case Opcodes.CONST_STRING_JUMBO: {
-				InsnNode node = new ConstStringNode(dex.getString(insn.getIndex()));
-				node.setResult(InsnArg.reg(insn, 0, ArgType.STRING));
-				return node;
-			}
+			case Opcodes.CONST_STRING_JUMBO:
+				InsnNode constStrInsn = new ConstStringNode(dex.getString(insn.getIndex()));
+				constStrInsn.setResult(InsnArg.reg(insn, 0, ArgType.STRING));
+				return constStrInsn;
 
-			case Opcodes.CONST_CLASS: {
-				InsnNode node = new ConstClassNode(dex.getType(insn.getIndex()));
-				node.setResult(InsnArg.reg(insn, 0, ArgType.CLASS));
-				return node;
-			}
+			case Opcodes.CONST_CLASS:
+				InsnNode constClsInsn = new ConstClassNode(dex.getType(insn.getIndex()));
+				constClsInsn.setResult(InsnArg.reg(insn, 0, ArgType.CLASS));
+				return constClsInsn;
 
 			case Opcodes.MOVE:
 			case Opcodes.MOVE_16:
@@ -422,20 +420,18 @@ public class InsnDecoder {
 						null,
 						InsnArg.reg(insn, 0, method.getReturnType()));
 
-			case Opcodes.INSTANCE_OF: {
-				InsnNode node = new IndexInsnNode(InsnType.INSTANCE_OF, dex.getType(insn.getIndex()), 1);
-				node.setResult(InsnArg.reg(insn, 0, ArgType.BOOLEAN));
-				node.addArg(InsnArg.reg(insn, 1, ArgType.UNKNOWN_OBJECT));
-				return node;
-			}
+			case Opcodes.INSTANCE_OF:
+				InsnNode instInsn = new IndexInsnNode(InsnType.INSTANCE_OF, dex.getType(insn.getIndex()), 1);
+				instInsn.setResult(InsnArg.reg(insn, 0, ArgType.BOOLEAN));
+				instInsn.addArg(InsnArg.reg(insn, 1, ArgType.UNKNOWN_OBJECT));
+				return instInsn;
 
-			case Opcodes.CHECK_CAST: {
+			case Opcodes.CHECK_CAST:
 				ArgType castType = dex.getType(insn.getIndex());
-				InsnNode node = new IndexInsnNode(InsnType.CHECK_CAST, castType, 1);
-				node.setResult(InsnArg.reg(insn, 0, castType));
-				node.addArg(InsnArg.reg(insn, 0, ArgType.UNKNOWN_OBJECT));
-				return node;
-			}
+				InsnNode checkCastInsn = new IndexInsnNode(InsnType.CHECK_CAST, castType, 1);
+				checkCastInsn.setResult(InsnArg.reg(insn, 0, castType));
+				checkCastInsn.addArg(InsnArg.reg(insn, 0, ArgType.UNKNOWN_OBJECT));
+				return checkCastInsn;
 
 			case Opcodes.IGET:
 			case Opcodes.IGET_BOOLEAN:
@@ -443,13 +439,12 @@ public class InsnDecoder {
 			case Opcodes.IGET_CHAR:
 			case Opcodes.IGET_SHORT:
 			case Opcodes.IGET_WIDE:
-			case Opcodes.IGET_OBJECT: {
-				FieldInfo field = FieldInfo.fromDex(dex, insn.getIndex());
-				InsnNode node = new IndexInsnNode(InsnType.IGET, field, 1);
-				node.setResult(InsnArg.reg(insn, 0, field.getType()));
-				node.addArg(InsnArg.reg(insn, 1, field.getDeclClass().getType()));
-				return node;
-			}
+			case Opcodes.IGET_OBJECT:
+				FieldInfo igetFld = FieldInfo.fromDex(dex, insn.getIndex());
+				InsnNode igetInsn = new IndexInsnNode(InsnType.IGET, igetFld, 1);
+				igetInsn.setResult(InsnArg.reg(insn, 0, igetFld.getType()));
+				igetInsn.addArg(InsnArg.reg(insn, 1, igetFld.getDeclClass().getType()));
+				return igetInsn;
 
 			case Opcodes.IPUT:
 			case Opcodes.IPUT_BOOLEAN:
@@ -457,13 +452,12 @@ public class InsnDecoder {
 			case Opcodes.IPUT_CHAR:
 			case Opcodes.IPUT_SHORT:
 			case Opcodes.IPUT_WIDE:
-			case Opcodes.IPUT_OBJECT: {
-				FieldInfo field = FieldInfo.fromDex(dex, insn.getIndex());
-				InsnNode node = new IndexInsnNode(InsnType.IPUT, field, 2);
-				node.addArg(InsnArg.reg(insn, 0, field.getType()));
-				node.addArg(InsnArg.reg(insn, 1, field.getDeclClass().getType()));
-				return node;
-			}
+			case Opcodes.IPUT_OBJECT:
+				FieldInfo iputFld = FieldInfo.fromDex(dex, insn.getIndex());
+				InsnNode iputInsn = new IndexInsnNode(InsnType.IPUT, iputFld, 2);
+				iputInsn.addArg(InsnArg.reg(insn, 0, iputFld.getType()));
+				iputInsn.addArg(InsnArg.reg(insn, 1, iputFld.getDeclClass().getType()));
+				return iputInsn;
 
 			case Opcodes.SGET:
 			case Opcodes.SGET_BOOLEAN:
@@ -471,12 +465,11 @@ public class InsnDecoder {
 			case Opcodes.SGET_CHAR:
 			case Opcodes.SGET_SHORT:
 			case Opcodes.SGET_WIDE:
-			case Opcodes.SGET_OBJECT: {
-				FieldInfo field = FieldInfo.fromDex(dex, insn.getIndex());
-				InsnNode node = new IndexInsnNode(InsnType.SGET, field, 0);
-				node.setResult(InsnArg.reg(insn, 0, field.getType()));
-				return node;
-			}
+			case Opcodes.SGET_OBJECT:
+				FieldInfo sgetFld = FieldInfo.fromDex(dex, insn.getIndex());
+				InsnNode sgetInsn = new IndexInsnNode(InsnType.SGET, sgetFld, 0);
+				sgetInsn.setResult(InsnArg.reg(insn, 0, sgetFld.getType()));
+				return sgetInsn;
 
 			case Opcodes.SPUT:
 			case Opcodes.SPUT_BOOLEAN:
@@ -484,19 +477,17 @@ public class InsnDecoder {
 			case Opcodes.SPUT_CHAR:
 			case Opcodes.SPUT_SHORT:
 			case Opcodes.SPUT_WIDE:
-			case Opcodes.SPUT_OBJECT: {
-				FieldInfo field = FieldInfo.fromDex(dex, insn.getIndex());
-				InsnNode node = new IndexInsnNode(InsnType.SPUT, field, 1);
-				node.addArg(InsnArg.reg(insn, 0, field.getType()));
-				return node;
-			}
+			case Opcodes.SPUT_OBJECT:
+				FieldInfo sputFld = FieldInfo.fromDex(dex, insn.getIndex());
+				InsnNode sputInsn = new IndexInsnNode(InsnType.SPUT, sputFld, 1);
+				sputInsn.addArg(InsnArg.reg(insn, 0, sputFld.getType()));
+				return sputInsn;
 
-			case Opcodes.ARRAY_LENGTH: {
-				InsnNode node = new InsnNode(InsnType.ARRAY_LENGTH, 1);
-				node.setResult(InsnArg.reg(insn, 0, ArgType.INT));
-				node.addArg(InsnArg.reg(insn, 1, ArgType.array(ArgType.UNKNOWN)));
-				return node;
-			}
+			case Opcodes.ARRAY_LENGTH:
+				InsnNode arrLenInsn = new InsnNode(InsnType.ARRAY_LENGTH, 1);
+				arrLenInsn.setResult(InsnArg.reg(insn, 0, ArgType.INT));
+				arrLenInsn.addArg(InsnArg.reg(insn, 1, ArgType.array(ArgType.UNKNOWN)));
+				return arrLenInsn;
 
 			case Opcodes.AGET:
 				return arrayGet(insn, ArgType.NARROW);

jadx-core/src/main/java/jadx/core/dex/instructions/InvokeNode.java

@@ -1,5 +1,7 @@
 package jadx.core.dex.instructions;
 
+import com.android.dx.io.instructions.DecodedInstruction;
+
 import jadx.core.dex.info.MethodInfo;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.instructions.args.InsnArg;
@@ -7,9 +9,7 @@ import jadx.core.dex.nodes.InsnNode;
 import jadx.core.utils.InsnUtils;
 import jadx.core.utils.Utils;
 
-import com.android.dx.io.instructions.DecodedInstruction;
-
-public class InvokeNode extends InsnNode {
+public class InvokeNode extends InsnNode implements CallMthInterface {
 
 	private final InvokeType type;
 	private final MethodInfo mth;

jadx-core/src/main/java/jadx/core/dex/instructions/NewArrayNode.java

@@ -1,12 +1,12 @@
 package jadx.core.dex.instructions;
 
+import org.jetbrains.annotations.NotNull;
+
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.instructions.args.InsnArg;
 import jadx.core.dex.instructions.args.RegisterArg;
 import jadx.core.dex.nodes.InsnNode;
 
-import org.jetbrains.annotations.NotNull;
-
 public class NewArrayNode extends InsnNode {
 
 	private final ArgType arrType;

jadx-core/src/main/java/jadx/core/dex/instructions/PhiInsn.java

@@ -1,5 +1,10 @@
 package jadx.core.dex.instructions;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.jetbrains.annotations.NotNull;
+
 import jadx.core.dex.attributes.AFlag;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.instructions.args.InsnArg;
@@ -10,18 +15,13 @@ import jadx.core.utils.InstructionRemover;
 import jadx.core.utils.Utils;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
-import java.util.IdentityHashMap;
-import java.util.Map;
-
-import org.jetbrains.annotations.NotNull;
-
 public final class PhiInsn extends InsnNode {
 
 	private final Map<RegisterArg, BlockNode> blockBinds;
 
 	public PhiInsn(int regNum, int predecessors) {
 		super(InsnType.PHI, predecessors);
-		this.blockBinds = new IdentityHashMap<>(predecessors);
+		this.blockBinds = new LinkedHashMap<>(predecessors);
 		setResult(InsnArg.reg(regNum, ArgType.UNKNOWN));
 		add(AFlag.DONT_INLINE);
 	}

jadx-core/src/main/java/jadx/core/dex/instructions/SwitchNode.java

@@ -1,17 +1,24 @@
 package jadx.core.dex.instructions;
 
+import java.util.Arrays;
+import java.util.List;
+
 import jadx.core.dex.instructions.args.InsnArg;
+import jadx.core.dex.nodes.BlockNode;
 import jadx.core.dex.nodes.InsnNode;
 import jadx.core.utils.InsnUtils;
 
-import java.util.Arrays;
+import static jadx.core.utils.BlockUtils.getBlockByOffset;
 
-public class SwitchNode extends InsnNode {
+public class SwitchNode extends TargetInsnNode {
 
 	private final Object[] keys;
 	private final int[] targets;
 	private final int def; // next instruction
 
+	private BlockNode[] targetBlocks;
+	private BlockNode defTargetBlock;
+
 	public SwitchNode(InsnArg arg, Object[] keys, int[] targets, int def) {
 		super(InsnType.SWITCH, 1);
 		this.keys = keys;
@@ -36,6 +43,42 @@ public class SwitchNode extends InsnNode {
 		return def;
 	}
 
+	public BlockNode[] getTargetBlocks() {
+		return targetBlocks;
+	}
+
+	public BlockNode getDefTargetBlock() {
+		return defTargetBlock;
+	}
+
+	@Override
+	public void initBlocks(BlockNode curBlock) {
+		List<BlockNode> successors = curBlock.getSuccessors();
+		int len = targets.length;
+		targetBlocks = new BlockNode[len];
+		for (int i = 0; i < len; i++) {
+			targetBlocks[i] = getBlockByOffset(targets[i], successors);
+		}
+		defTargetBlock = getBlockByOffset(def, successors);
+	}
+
+	@Override
+	public boolean replaceTargetBlock(BlockNode origin, BlockNode replace) {
+		int count = 0;
+		int len = targetBlocks.length;
+		for (int i = 0; i < len; i++) {
+			if (targetBlocks[i] == origin) {
+				targetBlocks[i] = replace;
+				count++;
+			}
+		}
+		if (defTargetBlock == origin) {
+			defTargetBlock = replace;
+			count++;
+		}
+		return count > 0;
+	}
+
 	@Override
 	public boolean isSame(InsnNode obj) {
 		if (this == obj) {

jadx-core/src/main/java/jadx/core/dex/instructions/TargetInsnNode.java

@@ -0,0 +1,18 @@
+package jadx.core.dex.instructions;
+
+import jadx.core.dex.nodes.BlockNode;
+import jadx.core.dex.nodes.InsnNode;
+
+public abstract class TargetInsnNode extends InsnNode {
+
+	public TargetInsnNode(InsnType type, int argsCount) {
+		super(type, argsCount);
+	}
+
+	public void initBlocks(BlockNode curBlock) {
+	}
+
+	public boolean replaceTargetBlock(BlockNode origin, BlockNode replace) {
+		return false;
+	}
+}

jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java

@@ -1,16 +1,16 @@
 package jadx.core.dex.instructions.args;
 
-import jadx.core.Consts;
-import jadx.core.dex.nodes.DexNode;
-import jadx.core.dex.nodes.parser.SignatureParser;
-import jadx.core.utils.Utils;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import org.jetbrains.annotations.Nullable;
 
+import jadx.core.Consts;
+import jadx.core.dex.nodes.DexNode;
+import jadx.core.dex.nodes.parser.SignatureParser;
+import jadx.core.utils.Utils;
+
 public abstract class ArgType {
 
 	public static final ArgType INT = primitive(PrimitiveType.INT);

jadx-core/src/main/java/jadx/core/dex/instructions/args/FieldArg.java

@@ -1,9 +1,9 @@
 package jadx.core.dex.instructions.args;
 
-import jadx.core.dex.info.FieldInfo;
-
 import org.jetbrains.annotations.Nullable;
 
+import jadx.core.dex.info.FieldInfo;
+
 // TODO: don't extend RegisterArg (now used as a result of instruction)
 public final class FieldArg extends RegisterArg {
 

jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java

@@ -1,17 +1,16 @@
 package jadx.core.dex.instructions.args;
 
-import jadx.core.dex.attributes.AFlag;
-import jadx.core.dex.nodes.InsnNode;
-import jadx.core.utils.InsnUtils;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import com.android.dx.io.instructions.DecodedInstruction;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.android.dx.io.instructions.DecodedInstruction;
+import jadx.core.dex.attributes.AFlag;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.utils.InsnUtils;
 
 /**
  * Instruction argument,
@@ -141,7 +140,6 @@ public abstract class InsnArg extends Typed {
 	}
 
 	public boolean isThis() {
-		// must be implemented in RegisterArg and MthParameterArg
-		return false;
+		return contains(AFlag.THIS);
 	}
 }

jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnWrapArg.java

@@ -1,10 +1,10 @@
 package jadx.core.dex.instructions.args;
 
+import org.jetbrains.annotations.NotNull;
+
 import jadx.core.dex.nodes.InsnNode;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
-import org.jetbrains.annotations.NotNull;
-
 public final class InsnWrapArg extends InsnArg {
 
 	private final InsnNode wrappedInsn;

jadx-core/src/main/java/jadx/core/dex/instructions/args/NamedArg.java

@@ -35,7 +35,6 @@ public final class NamedArg extends InsnArg implements Named {
 			return false;
 		}
 		return name.equals(((NamedArg) o).name);
-
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java

@@ -1,17 +1,19 @@
 package jadx.core.dex.instructions.args;
 
+import java.util.Objects;
+
+import org.jetbrains.annotations.NotNull;
+
 import jadx.core.dex.instructions.InsnType;
 import jadx.core.dex.instructions.PhiInsn;
 import jadx.core.dex.nodes.DexNode;
 import jadx.core.dex.nodes.InsnNode;
 import jadx.core.utils.InsnUtils;
 
-import java.util.Objects;
-
-import org.jetbrains.annotations.NotNull;
-
 public class RegisterArg extends InsnArg implements Named {
 
+	public static final String THIS_ARG_NAME = "this";
+
 	protected final int regNum;
 	// not null after SSATransform pass
 	private SSAVar sVar;
@@ -43,6 +45,9 @@ public class RegisterArg extends InsnArg implements Named {
 	}
 
 	public String getName() {
+		if (isThis()) {
+			return THIS_ARG_NAME;
+		}
 		if (sVar == null) {
 			return null;
 		}
@@ -50,7 +55,7 @@ public class RegisterArg extends InsnArg implements Named {
 	}
 
 	public void setName(String name) {
-		if (sVar != null) {
+		if (sVar != null && name != null) {
 			sVar.setName(name);
 		}
 	}
@@ -63,6 +68,21 @@ public class RegisterArg extends InsnArg implements Named {
 		return n.equals(((Named) arg).getName());
 	}
 
+	public void mergeName(InsnArg arg) {
+		if (arg instanceof Named) {
+			Named otherArg = (Named) arg;
+			String otherName = otherArg.getName();
+			String name = getName();
+			if (!Objects.equals(name, otherName)) {
+				if (name == null) {
+					setName(otherName);
+				} else if (otherName == null) {
+					otherArg.setName(name);
+				}
+			}
+		}
+	}
+
 	@Override
 	public void setType(ArgType type) {
 		if (sVar != null) {
@@ -101,22 +121,6 @@ public class RegisterArg extends InsnArg implements Named {
 		return InsnUtils.getConstValueByInsn(dex, parInsn);
 	}
 
-	@Override
-	public boolean isThis() {
-		if ("this".equals(getName())) {
-			return true;
-		}
-		// maybe it was moved from 'this' register
-		InsnNode ai = getAssignInsn();
-		if (ai != null && ai.getType() == InsnType.MOVE) {
-			InsnArg arg = ai.getArg(0);
-			if (arg != this) {
-				return arg.isThis();
-			}
-		}
-		return false;
-	}
-
 	public InsnNode getAssignInsn() {
 		if (sVar == null) {
 			return null;
@@ -142,7 +146,7 @@ public class RegisterArg extends InsnArg implements Named {
 
 	@Override
 	public int hashCode() {
-		return regNum * 31 + type.hashCode();
+		return regNum;
 	}
 
 	@Override
@@ -172,6 +176,9 @@ public class RegisterArg extends InsnArg implements Named {
 		}
 		sb.append(" ");
 		sb.append(type);
+		if (!isAttrStorageEmpty()) {
+			sb.append(' ').append(getAttributesString());
+		}
 		sb.append(")");
 		return sb.toString();
 	}

jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java

@@ -1,14 +1,14 @@
 package jadx.core.dex.instructions.args;
 
-import jadx.core.dex.attributes.AttrNode;
-import jadx.core.dex.instructions.PhiInsn;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import jadx.core.dex.attributes.AttrNode;
+import jadx.core.dex.instructions.PhiInsn;
+
 public class SSAVar extends AttrNode {
 
 	private final int regNum;

jadx-core/src/main/java/jadx/core/dex/instructions/args/TypeImmutableArg.java

@@ -4,8 +4,6 @@ import org.jetbrains.annotations.NotNull;
 
 public class TypeImmutableArg extends RegisterArg {
 
-	private boolean isThis;
-
 	public TypeImmutableArg(int rn, ArgType type) {
 		super(rn, type);
 	}
@@ -20,48 +18,9 @@ public class TypeImmutableArg extends RegisterArg {
 		// not allowed
 	}
 
-	public void markAsThis() {
-		this.isThis = true;
-	}
-
-	@Override
-	public boolean isThis() {
-		return isThis;
-	}
-
-	@Override
-	public String getName() {
-		if (isThis) {
-			return "this";
-		}
-		return super.getName();
-	}
-
 	@Override
 	void setSVar(@NotNull SSAVar sVar) {
-		if (isThis) {
-			sVar.setName("this");
-		}
 		sVar.setTypeImmutable(type);
 		super.setSVar(sVar);
 	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (!(obj instanceof TypeImmutableArg)) {
-			return false;
-		}
-		if (!super.equals(obj)) {
-			return false;
-		}
-		return isThis == ((TypeImmutableArg) obj).isThis;
-	}
-
-	@Override
-	public int hashCode() {
-		return 31 * super.hashCode() + (isThis ? 1 : 0);
-	}
 }

jadx-core/src/main/java/jadx/core/dex/instructions/mods/ConstructorInsn.java

@@ -2,13 +2,14 @@ package jadx.core.dex.instructions.mods;
 
 import jadx.core.dex.info.ClassInfo;
 import jadx.core.dex.info.MethodInfo;
+import jadx.core.dex.instructions.CallMthInterface;
 import jadx.core.dex.instructions.InsnType;
 import jadx.core.dex.instructions.InvokeNode;
 import jadx.core.dex.instructions.args.RegisterArg;
 import jadx.core.dex.nodes.InsnNode;
 import jadx.core.dex.nodes.MethodNode;
 
-public class ConstructorInsn extends InsnNode {
+public class ConstructorInsn extends InsnNode implements CallMthInterface {
 
 	private final MethodInfo callMth;
 	private final CallType callType;

jadx-core/src/main/java/jadx/core/dex/instructions/mods/TernaryInsn.java

@@ -1,5 +1,7 @@
 package jadx.core.dex.instructions.mods;
 
+import java.util.Collection;
+
 import jadx.core.dex.instructions.InsnType;
 import jadx.core.dex.instructions.args.InsnArg;
 import jadx.core.dex.instructions.args.LiteralArg;
@@ -9,8 +11,6 @@ import jadx.core.dex.regions.conditions.IfCondition;
 import jadx.core.utils.InsnUtils;
 import jadx.core.utils.Utils;
 
-import java.util.Collection;
-
 public final class TernaryInsn extends InsnNode {
 
 	private IfCondition condition;

jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java

@@ -1,5 +1,9 @@
 package jadx.core.dex.nodes;
 
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.List;
+
 import jadx.core.dex.attributes.AFlag;
 import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.AttrNode;
@@ -8,12 +12,9 @@ import jadx.core.dex.attributes.nodes.LoopInfo;
 import jadx.core.utils.BlockUtils;
 import jadx.core.utils.EmptyBitSet;
 import jadx.core.utils.InsnUtils;
+import jadx.core.utils.exceptions.JadxRuntimeException;
 
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
+import static jadx.core.utils.Utils.lockList;
 
 public class BlockNode extends AttrNode implements IBlock {
 
@@ -32,7 +33,7 @@ public class BlockNode extends AttrNode implements IBlock {
 	// immediate dominator
 	private BlockNode idom;
 	// blocks on which dominates this block
-	private List<BlockNode> dominatesOn = Collections.emptyList();
+	private List<BlockNode> dominatesOn = new ArrayList<>(3);
 
 	public BlockNode(int id, int offset) {
 		this.id = id;
@@ -68,13 +69,9 @@ public class BlockNode extends AttrNode implements IBlock {
 		successors = lockList(successors);
 		predecessors = lockList(predecessors);
 		dominatesOn = lockList(dominatesOn);
-	}
-
-	List<BlockNode> lockList(List<BlockNode> list) {
-		if (list.isEmpty()) {
-			return Collections.emptyList();
+		if (domFrontier == null) {
+			throw new JadxRuntimeException("Dominance frontier not set for block: " + this);
 		}
-		return Collections.unmodifiableList(list);
 	}
 
 	/**
@@ -85,7 +82,7 @@ public class BlockNode extends AttrNode implements IBlock {
 		if (sucList.isEmpty()) {
 			return sucList;
 		}
-		List<BlockNode> toRemove = new LinkedList<>();
+		List<BlockNode> toRemove = new ArrayList<>(sucList.size());
 		for (BlockNode b : sucList) {
 			if (BlockUtils.isBlockMustBeCleared(b)) {
 				toRemove.add(b);
@@ -160,9 +157,6 @@ public class BlockNode extends AttrNode implements IBlock {
 	}
 
 	public void addDominatesOn(BlockNode block) {
-		if (dominatesOn.isEmpty()) {
-			dominatesOn = new LinkedList<>();
-		}
 		dominatesOn.add(block);
 	}
 

jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java

@@ -1,9 +1,25 @@
 package jadx.core.dex.nodes;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.android.dex.ClassData;
+import com.android.dex.ClassData.Field;
+import com.android.dex.ClassData.Method;
+import com.android.dex.ClassDef;
+import com.android.dex.Dex;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jadx.core.Consts;
 import jadx.core.codegen.CodeWriter;
 import jadx.core.dex.attributes.annotations.Annotation;
-import jadx.core.dex.attributes.nodes.JadxErrorAttr;
 import jadx.core.dex.attributes.nodes.LineAttrNode;
 import jadx.core.dex.attributes.nodes.SourceFileAttr;
 import jadx.core.dex.info.AccessInfo;
@@ -20,25 +36,7 @@ import jadx.core.dex.nodes.parser.StaticValuesParser;
 import jadx.core.utils.exceptions.DecodeException;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.TestOnly;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.android.dex.ClassData;
-import com.android.dex.ClassData.Field;
-import com.android.dex.ClassData.Method;
-import com.android.dex.ClassDef;
-import com.android.dex.Dex;
-import com.android.dx.rop.code.AccessFlags;
+import static jadx.core.dex.nodes.ProcessState.UNLOADED;
 
 public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 	private static final Logger LOG = LoggerFactory.getLogger(ClassNode.class);
@@ -52,7 +50,7 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 
 	private final List<MethodNode> methods;
 	private final List<FieldNode> fields;
-	private List<ClassNode> innerClasses = Collections.emptyList();
+	private List<ClassNode> innerClasses = new ArrayList<>();
 
 	// store decompiled code
 	private CodeWriter code;
@@ -133,14 +131,16 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 	}
 
 	// empty synthetic class
-	public ClassNode(DexNode dex, ClassInfo clsInfo) {
+	public ClassNode(DexNode dex, String name, int accessFlags) {
 		this.dex = dex;
-		this.clsInfo = clsInfo;
-		this.interfaces = Collections.emptyList();
-		this.methods = Collections.emptyList();
-		this.fields = Collections.emptyList();
-		this.accessFlags = new AccessInfo(AccessFlags.ACC_PUBLIC | AccessFlags.ACC_SYNTHETIC, AFType.CLASS);
+		this.clsInfo = ClassInfo.fromName(dex.root(), name);
+		this.interfaces = new ArrayList<>();
+		this.methods = new ArrayList<>();
+		this.fields = new ArrayList<>();
+		this.accessFlags = new AccessInfo(accessFlags, AFType.CLASS);
 		this.parentClass = this;
+
+		dex.addClassNode(this);
 	}
 
 	private void loadAnnotations(ClassDef cls) {
@@ -191,23 +191,23 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 					break;
 				}
 			}
-		} catch (JadxRuntimeException e) {
+		} catch (Exception e) {
 			LOG.error("Class signature parse error: {}", this, e);
 		}
 	}
 
 	private void setFieldsTypesFromSignature() {
 		for (FieldNode field : fields) {
-			SignatureParser sp = SignatureParser.fromNode(field);
-			if (sp != null) {
-				try {
+			try {
+				SignatureParser sp = SignatureParser.fromNode(field);
+				if (sp != null) {
 					ArgType gType = sp.consumeType();
 					if (gType != null) {
 						field.setType(gType);
 					}
-				} catch (JadxRuntimeException e) {
-					LOG.error("Field signature parse error: {}", field, e);
 				}
+			} catch (Exception e) {
+				LOG.error("Field signature parse error: {}.{}", this.getFullName(), field.getName(), e);
 			}
 		}
 	}
@@ -239,7 +239,6 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 			}
 		}
 		this.addAttr(new SourceFileAttr(fileName));
-		LOG.debug("Class '{}' compiled from '{}'", this, fileName);
 	}
 
 	@Override
@@ -248,8 +247,7 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 			try {
 				mth.load();
 			} catch (Exception e) {
-				LOG.error("Method load error: {}", mth, e);
-				mth.addAttr(new JadxErrorAttr(e));
+				mth.addError("Method load error", e);
 			}
 		}
 		for (ClassNode innerCls : getInnerClasses()) {
@@ -265,6 +263,7 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 		for (ClassNode innerCls : getInnerClasses()) {
 			innerCls.unload();
 		}
+		setState(UNLOADED);
 	}
 
 	private void buildCache() {
@@ -322,7 +321,15 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 		return null;
 	}
 
-	@TestOnly
+	public FieldNode searchFieldByNameAndType(FieldInfo field) {
+		for (FieldNode f : fields) {
+			if (f.getFieldInfo().equalsNameAndType(field)) {
+				return f;
+			}
+		}
+		return null;
+	}
+
 	public FieldNode searchFieldByName(String name) {
 		for (FieldNode f : fields) {
 			if (f.getName().equals(name)) {
@@ -353,8 +360,7 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 		if (parentClass == null) {
 			if (clsInfo.isInner()) {
 				ClassNode parent = dex().resolveClass(clsInfo.getParentClass());
-				parent = parent == null ? this : parent;
-				parentClass = parent;
+				parentClass = parent == null ? this : parent;
 			} else {
 				parentClass = this;
 			}
@@ -364,7 +370,7 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 
 	public ClassNode getTopParentClass() {
 		ClassNode parent = getParentClass();
-		return parent == this ? this : parent.getParentClass();
+		return parent == this ? this : parent.getTopParentClass();
 	}
 
 	public List<ClassNode> getInnerClasses() {
@@ -372,10 +378,8 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 	}
 
 	public void addInnerClass(ClassNode cls) {
-		if (innerClasses.isEmpty()) {
-			innerClasses = new ArrayList<>(3);
-		}
 		innerClasses.add(cls);
+		cls.parentClass = this;
 	}
 
 	public boolean isEnum() {
@@ -419,6 +423,11 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 		return dex.root();
 	}
 
+	@Override
+	public String typeName() {
+		return "class";
+	}
+
 	public String getRawName() {
 		return clsInfo.getRawName();
 	}
@@ -484,7 +493,6 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 			return clsInfo.equals(other.clsInfo);
 		}
 		return false;
-
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/dex/nodes/DexNode.java

@@ -46,12 +46,15 @@ public class DexNode implements IDexNode {
 
 	public void loadClasses() {
 		for (ClassDef cls : dexBuf.classDefs()) {
-			ClassNode clsNode = new ClassNode(this, cls);
-			classes.add(clsNode);
-			clsMap.put(clsNode.getClassInfo(), clsNode);
+			addClassNode(new ClassNode(this, cls));
 		}
 	}
 
+	public void addClassNode(ClassNode clsNode) {
+		classes.add(clsNode);
+		clsMap.put(clsNode.getClassInfo(), clsNode);
+	}
+
 	void initInnerClasses() {
 		// move inner classes
 		List<ClassNode> inner = new ArrayList<>();
@@ -65,7 +68,7 @@ public class DexNode implements IDexNode {
 			ClassNode parent = resolveClass(clsInfo.getParentClass());
 			if (parent == null) {
 				clsMap.remove(clsInfo);
-				clsInfo.notInner(cls.dex());
+				clsInfo.notInner(root);
 				clsMap.put(clsInfo, cls);
 			} else {
 				parent.addInnerClass(cls);
@@ -78,18 +81,24 @@ public class DexNode implements IDexNode {
 	}
 
 	@Nullable
-	public ClassNode resolveClass(ClassInfo clsInfo) {
+	ClassNode resolveClassLocal(ClassInfo clsInfo) {
 		return clsMap.get(clsInfo);
 	}
 
+	@Nullable
+	public ClassNode resolveClass(ClassInfo clsInfo) {
+		return root.resolveClass(clsInfo);
+	}
+
 	@Nullable
 	public ClassNode resolveClass(@NotNull ArgType type) {
 		if (type.isGeneric()) {
 			type = ArgType.object(type.getObject());
 		}
-		return resolveClass(ClassInfo.fromType(this, type));
+		return resolveClass(ClassInfo.fromType(root, type));
 	}
 
+	@Deprecated
 	@Nullable
 	public MethodNode resolveMethod(@NotNull MethodInfo mth) {
 		ClassNode cls = resolveClass(mth.getDeclClass());
@@ -99,20 +108,8 @@ public class DexNode implements IDexNode {
 		return null;
 	}
 
-	/**
-	 * Search method in class hierarchy.
-	 */
 	@Nullable
-	public MethodNode deepResolveMethod(@NotNull MethodInfo mth) {
-		ClassNode cls = resolveClass(mth.getDeclClass());
-		if (cls == null) {
-			return null;
-		}
-		return deepResolveMethod(cls, mth.makeSignature(false));
-	}
-
-	@Nullable
-	private MethodNode deepResolveMethod(@NotNull ClassNode cls, String signature) {
+	MethodNode deepResolveMethod(@NotNull ClassNode cls, String signature) {
 		for (MethodNode m : cls.getMethods()) {
 			if (m.getMethodInfo().getShortId().startsWith(signature)) {
 				return m;
@@ -141,6 +138,7 @@ public class DexNode implements IDexNode {
 		return null;
 	}
 
+	@Deprecated
 	@Nullable
 	public FieldNode resolveField(FieldInfo field) {
 		ClassNode cls = resolveClass(field.getDeclClass());
@@ -150,6 +148,34 @@ public class DexNode implements IDexNode {
 		return null;
 	}
 
+	@Nullable
+	FieldNode deepResolveField(@NotNull ClassNode cls, FieldInfo fieldInfo) {
+		FieldNode field = cls.searchFieldByNameAndType(fieldInfo);
+		if (field != null) {
+			return field;
+		}
+		ArgType superClass = cls.getSuperClass();
+		if (superClass != null) {
+			ClassNode superNode = resolveClass(superClass);
+			if (superNode != null) {
+				FieldNode found = deepResolveField(superNode, fieldInfo);
+				if (found != null) {
+					return found;
+				}
+			}
+		}
+		for (ArgType iFaceType : cls.getInterfaces()) {
+			ClassNode iFaceNode = resolveClass(iFaceType);
+			if (iFaceNode != null) {
+				FieldNode found = deepResolveField(iFaceNode, fieldInfo);
+				if (found != null) {
+					return found;
+				}
+			}
+		}
+		return null;
+	}
+
 	public DexFile getDexFile() {
 		return file;
 	}
@@ -197,6 +223,10 @@ public class DexNode implements IDexNode {
 		return dexBuf.open(offset);
 	}
 
+	public boolean checkOffset(int dataOffset) {
+		return dataOffset >= 0 && dataOffset < dexBuf.getLength();
+	}
+
 	@Override
 	public RootNode root() {
 		return root;
@@ -207,12 +237,17 @@ public class DexNode implements IDexNode {
 		return this;
 	}
 
+	@Override
+	public String typeName() {
+		return "dex";
+	}
+
 	public int getDexId() {
 		return dexId;
 	}
 
 	@Override
 	public String toString() {
-		return "DEX";
+		return "DEX: " + file;
 	}
 }

jadx-core/src/main/java/jadx/core/dex/nodes/Edge.java

@@ -27,7 +27,6 @@ public class Edge {
 		}
 		Edge edge = (Edge) o;
 		return source.equals(edge.source) && target.equals(edge.target);
-
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/dex/nodes/FieldNode.java

@@ -1,13 +1,13 @@
 package jadx.core.dex.nodes;
 
+import com.android.dex.ClassData.Field;
+
 import jadx.core.dex.attributes.nodes.LineAttrNode;
 import jadx.core.dex.info.AccessInfo;
 import jadx.core.dex.info.AccessInfo.AFType;
 import jadx.core.dex.info.FieldInfo;
 import jadx.core.dex.instructions.args.ArgType;
 
-import com.android.dex.ClassData.Field;
-
 public class FieldNode extends LineAttrNode {
 
 	private final ClassNode parent;

jadx-core/src/main/java/jadx/core/dex/nodes/IBranchRegion.java

@@ -9,5 +9,4 @@ public interface IBranchRegion extends IRegion {
 	 * NOTE: Contains 'null' elements for indicate empty branches.
 	 */
 	List<IContainer> getBranches();
-
 }

jadx-core/src/main/java/jadx/core/dex/nodes/IDexNode.java

@@ -2,6 +2,8 @@ package jadx.core.dex.nodes;
 
 public interface IDexNode {
 
+	String typeName();
+
 	DexNode dex();
 
 	RootNode root();