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`)

.codecov.yml

@@ -0,0 +1,14 @@
+coverage:
+  precision: 2
+  round: down
+  range: "50...100"
+
+  status:
+    project:
+      default: on
+    patch:
+      default: on
+    changes:
+      default: off
+
+comment: false

.gitignore

@@ -7,17 +7,25 @@
 .idea/
 out/
 *.iml
+*.ipr
+*.iws
+.attach_pid*
+
+**/.DS_Store
 
 bin/
 target/
 build/
+classes/
 idea/
 .gradle/
+node_modules/
+
+jadx-output/
+*-tmp/
 
 *.dex
-*.jar
 *.class
 *.dump
 *.log
 *.cfg
-

.gitlab-ci.yml

@@ -0,0 +1,25 @@
+image: java:8
+
+variables:
+    GRADLE_OPTS: "-Dorg.gradle.daemon=false"
+    TERM: "dumb"
+
+before_script:
+    - chmod +x gradlew
+
+stages:
+  - build
+
+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:
+    - ./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

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "jadx-test-app/test-app"]
+	path = jadx-test-app/test-app
+	url = git://github.com/skylot/jadx-test-app.git

.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

@@ -0,0 +1,54 @@
+language: java
+sudo: false
+dist: trusty
+
+# don't build on tag push
+if: tag IS blank
+
+git:
+  depth: false
+
+before_install:
+  - 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:
+  - java -version
+  - ./gradlew clean build
+
+deploy:
+  - provider: script
+    skip_cleanup: true
+    on:
+      branch: master
+      tags: false
+      condition: $JDK = oracle-8
+    script: bash scripts/travis-master.sh
+
+  - 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

CONTRIBUTING.md

@@ -0,0 +1,7 @@
+# Contribution
+
+To support this project you can:
+  - Post thoughts about new features/optimizations that important to you
+  - Submit bug using one of following patterns:
+    * Java code examples which decompiles incorrectly
+    * Error log and link to _public available_ apk file or app page on Google play

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

NOTICE

@@ -1,8 +1,8 @@
 The majority of jadx is written and copyrighted by me (Skylot)
-and released under the Apache 2.0 license:
+and released under the Apache 2.0 license (see LICENSE file for full license text):
 
 *******************************************************************************
-Copyright 2013 Skylot
+Copyright 2015, Skylot
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ limitations under the License.
 *******************************************************************************
 
 
-Various portions of the code including dx library are taken from 
-the Android Open Source Project, and are used in accordance with 
+Various portions of the code including dx library are taken from
+the Android Open Source Project, and are used in accordance with
 the following license:
 
 *******************************************************************************
@@ -74,10 +74,10 @@ Copyright (c) 2004-2011 QOS.ch
  distribute,  sublicense, and/or sell  copies of  the Software,  and to
  permit persons to whom the Software  is furnished to do so, subject to
  the following conditions:
- 
+
  The  above  copyright  notice  and  this permission  notice  shall  be
  included in all copies or substantial portions of the Software.
- 
+
  THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
  EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
  MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
@@ -92,15 +92,122 @@ Logback source code and binaries are dual-licensed under the EPL v1.0 and the LG
 
 *******************************************************************************
 Logback: the reliable, generic, fast and flexible logging framework.
-Copyright (C) 1999-2012, QOS.ch. All rights reserved. 
+Copyright (C) 1999-2012, QOS.ch. All rights reserved.
 
 This program and the accompanying materials are dual-licensed under
 either the terms of the Eclipse Public License v1.0 as published by
 the Eclipse Foundation
- 
+
   or (per the licensee's choosing)
- 
+
 under the terms of the GNU Lesser General Public License version 2.1
 as published by the Free Software Foundation.
 *******************************************************************************
 
+
+ASM library:
+
+*******************************************************************************
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************
+
+
+
+Jadx-gui components
+===================
+
+RSyntaxTextArea library (https://github.com/bobbylight/RSyntaxTextArea)
+licensed under modified BSD license:
+
+*******************************************************************************
+Copyright (c) 2012, Robert Futrell
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the names of its contributors may
+      be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************
+
+
+Concurrent Trees (https://code.google.com/p/concurrent-trees/)
+licenced under Apache License 2.0:
+
+*******************************************************************************
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*******************************************************************************
+
+
+Image Viewer (https://github.com/kazocsaba/imageviewer)
+
+*******************************************************************************
+Copyright (c) 2008-2012 Kazó Csaba
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*******************************************************************************
+
+JFontChooser Component - http://sourceforge.jp/projects/jfontchooser/
+
+Icons copied from several places:
+ - Eclipse Project (JDT UI) - licensed under EPL v1.0 (http://www.eclipse.org/legal/epl-v10.html)
+ - famfamfam silk icon set (http://www.famfamfam.com/lab/icons/silk/) - licensed
+     under Creative Commons Attribution 2.5 License (http://creativecommons.org/licenses/by/2.5/)

README.md

@@ -1,46 +1,97 @@
-## JADX  [![Build Status](https://buildhive.cloudbees.com/job/skylot/job/jadx/badge/icon)](https://buildhive.cloudbees.com/job/skylot/job/jadx/)
+## JADX
+
+[![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/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
 
-Command line tool for produce Java sources from Android Dex and Jar files
+Command line and GUI tools for produce Java source code from Android Dex and Apk files
+
+![jadx-gui screenshot](https://i.imgur.com/h917IBZ.png)
+
 
 ### Downloads
-Latest version available at 
-[sourceforge](http://sourceforge.net/projects/jadx/files/) 
-or
-[bintray](http://bintray.com/pkg/show/general/skylot/jadx/jadx-cli)
+- 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)
 
-### Build
+After download unpack zip file go to `bin` directory and run:
+- `jadx` - command line version
+- `jadx-gui` - graphical version
+
+On Windows run `.bat` files with double-click\
+**Note:** ensure you have installed Java 8 64-bit version
+
+
+### 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
-    ./gradlew build
-    
+    ./gradlew dist
+
 (on Windows, use `gradlew.bat` instead of `./gradlew`)
 
-Scripts for run jadx will be placed in `build/install/jadx/bin`
-and also packed to `build/distributions/jadx-<version>.zip`
+Scripts for run jadx will be placed in `build/jadx/bin`
+and also packed to `build/jadx-<version>.zip`
+
 
 ### Run
 Run **jadx** on itself:
 
-    cd build/install/jadx/
-    bin/jadx -d out lib/jadx-*.jar
+    cd build/jadx/
+    bin/jadx -d out lib/jadx-core-*.jar
+    # or
+    bin/jadx-gui lib/jadx-core-*.jar
+
 
 ### Usage
 ```
-jadx [options] <input files> (.dex, .apk or .jar)
+jadx[-gui] [options] <input file> (.dex, .apk, .jar or .class)
 options:
- -d, --output-dir     - output directory
- -j, --threads-count  - processing threads count
- -f, --fallback       - make simple dump (using goto instead of 'if', 'for', etc)
-     --cfg            - save methods control flow graph
-     --raw-cfg        - save methods control flow graph (use raw instructions)
- -v, --verbose        - verbose output
- -h, --help           - print this help
+ -d,  --output-dir           - output directory
+ -ds, --output-dir-src       - output directory for sources
+ -dr, --output-dir-res       - output directory for resources
+ -j,  --threads-count        - processing threads count
+ -r,  --no-res               - do not decode resources
+ -s,  --no-src               - do not decompile source code
+ -e,  --export-gradle        - save as android gradle project
+      --show-bad-code        - show inconsistent code (incorrectly decompiled)
+      --no-imports           - disable use of imports, always write entire package name
+      --no-replace-consts    - don't replace constant value with matching constant field
+      --escape-unicode       - escape non latin characters in strings (with \u)
+      --deobf                - activate deobfuscation
+      --deobf-min            - min length of name
+      --deobf-max            - max length of name
+      --deobf-rewrite-cfg    - force to save deobfuscation map
+      --deobf-use-sourcename - use source file name as class name alias
+      --cfg                  - save methods control flow graph to dot file
+      --raw-cfg              - save methods control flow graph (use raw instructions)
+ -f,  --fallback             - make simple dump (using goto instead of 'if', 'for', etc)
+ -v,  --verbose              - verbose output
+ -h,  --help                 - print this help
 Example:
  jadx -d out classes.dex
 ```
+These options also worked on jadx-gui running from command line and override options from preferences dialog
 
+### Troubleshooting
+##### Out of memory error:
+  - Reduce processing threads count (`-j` option)
+  - Increase maximum java heap size:
+    * command line (example for linux):
+      `JAVA_OPTS="-Xmx4G" jadx -j 1 some.apk`
+    * edit 'jadx' script (jadx.bat on Windows) and setup bigger heap size:
+      `DEFAULT_JVM_OPTS="-Xmx2500M"`
+
+---------------------------------------
 *Licensed under the Apache 2.0 License*
 
-*Copyright 2013 by Skylot*
+*Copyright 2018 by Skylot*

build.gradle

@@ -1,94 +1,127 @@
-apply plugin: 'java'
-apply plugin: 'application'
-
-apply plugin: 'eclipse'
-apply plugin: 'idea'
-
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
-
-version = file('version').readLines().get(0)
-
-mainClassName = "jadx.Main"
-manifest.mainAttributes("jadx-version" : version)
-
-project.ext {
-    mainSamplesClass = "jadx.samples.RunTests"  
-    samplesJadxSrcDir = "${buildDir}/samples-jadx/src"
+plugins {
+    id 'org.sonarqube' version '2.7'
+    id 'com.github.ben-manes.versions' version '0.20.0'
 }
 
-dependencies {
-    compile 'com.google.android.tools:dx:1.7'
-    compile 'com.beust:jcommander:1.30'
-    compile 'org.slf4j:slf4j-api:1.7.5'
-    compile 'ch.qos.logback:logback-classic:1.0.13'
-    testCompile 'junit:junit:4.11'
-}
+ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
+version = jadxVersion
+println("jadx version: ${jadxVersion}")
 
-repositories {
-    mavenCentral()
-}
+allprojects {
+    apply plugin: 'java'
+    apply plugin: 'groovy'
+    apply plugin: 'jacoco'
 
-sourceSets {
-    samples
-    //TODO don't add to eclipse classpath
-    samplesJadx {
-        java {
-            srcDir samplesJadxSrcDir
-            output.classesDir "${buildDir}/samples-jadx/output"
+    version = jadxVersion
+
+    tasks.withType(JavaCompile) {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+
+        if (!"$it".contains(':jadx-samples:')) {
+            options.compilerArgs << '-Xlint' << '-Xlint:unchecked' << '-Xlint:deprecation'
+        }
+    }
+
+    compileJava {
+        options.encoding = "UTF-8"
+    }
+
+    jar {
+        version = jadxVersion
+        manifest {
+            mainAttributes('jadx-version': jadxVersion)
+        }
+    }
+
+    dependencies {
+        compile 'org.slf4j:slf4j-api:1.7.25'
+
+        testCompile 'ch.qos.logback:logback-classic:1.2.3'
+        testCompile 'junit:junit:4.12'
+        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'
+    }
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        jcenter()
+        google()
+    }
+
+    jacoco {
+        toolVersion = "0.8.2"
+    }
+    jacocoTestReport {
+        reports {
+            xml.enabled = true
+            html.enabled = true
         }
     }
 }
 
-task samplesRun(type: JavaExec, dependsOn: compileSamplesJava) {  
-    classpath = sourceSets.samples.output
-    main = mainSamplesClass  
-}
-
-task samplesJar(type: Jar, dependsOn: samplesRun) {
-    baseName = 'samples'
-    from sourceSets.samples.output
-}
-
-task samplesJadxCreate(type: JavaExec, dependsOn: [compileJava, samplesJar]) {  
-    classpath = sourceSets.main.output + configurations.compile
-    main = mainClassName 
-    args = ['-d', samplesJadxSrcDir, samplesJar.archivePath]
-}
-
-compileSamplesJadxJava.dependsOn samplesJadxCreate
-
-task samplesJadxRun(type: JavaExec, dependsOn: compileSamplesJadxJava) {  
-    classpath = sourceSets.samplesJadx.output
-    main = mainSamplesClass  
-}
-
-task samples (dependsOn: samplesJadxRun) {
-}
-
-//check.dependsOn samples
-build.dependsOn distZip
-build.dependsOn installApp
-
-startScripts {
-    doLast {
-        // increase default max heap size
-        String var = 'DEFAULT_JVM_OPTS='
-        String args = '-Xmx1400M'
-        unixScript.text = unixScript.text.replace(var + '""', var + '"' + args + '"')
-        windowsScript.text = windowsScript.text.replace(var, var + args)
+sonarqube {
+    properties {
+        property 'sonar.exclusions', '**/jadx/samples/**/*,**/test-app/**/*'
+        property 'sonar.coverage.exclusions', '**/jadx/gui/**/*'
     }
 }
 
-applicationDistribution.with {
-    into('') {
-        from '.'
-        include 'README.md'
-        include 'NOTICE'
+dependencyUpdates.resolutionStrategy = {
+    componentSelection { rules ->
+        rules.all { ComponentSelection selection ->
+            boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'atlassian'].any { qualifier ->
+                selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
+            }
+            if (rejected) {
+                selection.reject('Release candidate')
+            }
+        }
     }
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '1.6'
+task copyArtifacts(type: Sync, dependsOn: ['jadx-cli:installDist', 'jadx-gui:installDist']) {
+    destinationDir file("$buildDir/jadx")
+    ['jadx-cli', 'jadx-gui'].each {
+        from tasks.getByPath(":${it}:installDist").destinationDir
+    }
 }
 
+task pack(type: Zip, dependsOn: copyArtifacts) {
+    destinationDir buildDir
+    archiveName "jadx-${jadxVersion}.zip"
+    from copyArtifacts.destinationDir
+}
+
+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
+}
+
+build.dependsOn(dist, samples)
+
+clean.dependsOn(cleanBuildDir)
+

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=http\://services.gradle.org/distributions/gradle-1.6-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,47 +6,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +20,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

jadx-cli/build.gradle

@@ -0,0 +1,23 @@
+apply plugin: 'application'
+
+mainClassName = 'jadx.cli.JadxCLI'
+applicationName = 'jadx'
+
+dependencies {
+    compile(project(':jadx-core'))
+    compile 'com.beust:jcommander:1.74'
+    compile 'ch.qos.logback:logback-classic:1.2.3'
+}
+
+applicationDistribution.with {
+    into('') {
+        from '../.'
+        include 'README.md'
+        include 'NOTICE'
+        include 'LICENSE'
+    }
+}
+
+startScripts {
+    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

@@ -0,0 +1,45 @@
+package jadx.cli;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jadx.api.JadxDecompiler;
+import jadx.core.utils.exceptions.JadxArgsValidateException;
+
+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)) {
+				result = processAndSave(jadxArgs);
+			}
+		} catch (Exception e) {
+			LOG.error("jadx error: {}", e.getMessage(), e);
+			result = 1;
+		} finally {
+			System.exit(result);
+		}
+	}
+
+	static int processAndSave(JadxCLIArgs inputArgs) {
+		JadxDecompiler jadx = new JadxDecompiler(inputArgs.toJadxArgs());
+		try {
+			jadx.load();
+		} catch (JadxArgsValidateException e) {
+			LOG.error("Incorrect arguments: {}", e.getMessage());
+			return 1;
+		}
+		jadx.save();
+		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

@@ -0,0 +1,253 @@
+package jadx.cli;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.Appender;
+import com.beust.jcommander.Parameter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jadx.api.JadxArgs;
+import jadx.api.JadxDecompiler;
+import jadx.core.utils.exceptions.JadxException;
+import jadx.core.utils.files.FileUtils;
+
+public class JadxCLIArgs {
+
+	@Parameter(description = "<input file> (.apk, .dex, .jar or .class)")
+	protected List<String> files = new ArrayList<>(1);
+
+	@Parameter(names = {"-d", "--output-dir"}, description = "output directory")
+	protected String outDir;
+
+	@Parameter(names = {"-ds", "--output-dir-src"}, description = "output directory for sources")
+	protected String outDirSrc;
+
+	@Parameter(names = {"-dr", "--output-dir-res"}, description = "output directory for resources")
+	protected String outDirRes;
+
+	@Parameter(names = {"-r", "--no-res"}, description = "do not decode resources")
+	protected boolean skipResources = false;
+
+	@Parameter(names = {"-s", "--no-src"}, description = "do not decompile source code")
+	protected boolean skipSources = false;
+
+	@Parameter(names = {"-e", "--export-gradle"}, description = "save as android gradle project")
+	protected boolean exportAsGradleProject = false;
+
+	@Parameter(names = {"-j", "--threads-count"}, description = "processing threads count")
+	protected int threadsCount = JadxArgs.DEFAULT_THREADS_COUNT;
+
+	@Parameter(names = {"--show-bad-code"}, description = "show inconsistent code (incorrectly decompiled)")
+	protected boolean showInconsistentCode = false;
+
+	@Parameter(names = {"--no-imports"}, description = "disable use of imports, always write entire package name")
+	protected boolean useImports = true;
+
+	@Parameter(names = "--no-replace-consts", description = "don't replace constant value with matching constant field")
+	protected boolean replaceConsts = true;
+
+	@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, renamed if shorter")
+	protected int deobfuscationMinLength = 3;
+
+	@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 = true;
+
+	@Parameter(names = {"--cfg"}, description = "save methods control flow graph to dot file")
+	protected boolean cfgOutput = false;
+
+	@Parameter(names = {"--raw-cfg"}, description = "save methods control flow graph (use raw instructions)")
+	protected boolean rawCfgOutput = false;
+
+	@Parameter(names = {"-f", "--fallback"}, description = "make simple dump (using goto instead of 'if', 'for', etc)")
+	protected boolean fallbackMode = false;
+
+	@Parameter(names = {"-v", "--verbose"}, description = "verbose output")
+	protected boolean verbose = false;
+
+	@Parameter(names = {"--version"}, description = "print jadx version")
+	protected boolean printVersion = false;
+
+	@Parameter(names = {"-h", "--help"}, description = "print this help", help = true)
+	protected boolean printHelp = false;
+
+	public boolean processArgs(String[] args) {
+		JCommanderWrapper<JadxCLIArgs> jcw = new JCommanderWrapper<>(this);
+		return jcw.parse(args) && process(jcw);
+	}
+
+	/**
+	 * 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 boolean process(JCommanderWrapper jcw) {
+		if (printHelp) {
+			jcw.printUsage();
+			return false;
+		}
+		if (printVersion) {
+			System.out.println(JadxDecompiler.getVersion());
+			return false;
+		}
+		try {
+			if (threadsCount <= 0) {
+				throw new JadxException("Threads count must be positive, got: " + threadsCount);
+			}
+			if (verbose) {
+				ch.qos.logback.classic.Logger rootLogger =
+						(ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+				// remove INFO ThresholdFilter
+				Appender<ILoggingEvent> appender = rootLogger.getAppender("STDOUT");
+				if (appender != null) {
+					appender.clearAllFilters();
+				}
+			}
+		} catch (JadxException e) {
+			System.err.println("ERROR: " + e.getMessage());
+			jcw.printUsage();
+			return false;
+		}
+		return true;
+	}
+
+	public JadxArgs toJadxArgs() {
+		JadxArgs args = new JadxArgs();
+		args.setInputFiles(files.stream().map(FileUtils::toFile).collect(Collectors.toList()));
+		args.setOutDir(FileUtils.toFile(outDir));
+		args.setOutDirSrc(FileUtils.toFile(outDirSrc));
+		args.setOutDirRes(FileUtils.toFile(outDirRes));
+		args.setThreadsCount(threadsCount);
+		args.setSkipSources(skipSources);
+		args.setSkipResources(skipResources);
+		args.setFallbackMode(fallbackMode);
+		args.setShowInconsistentCode(showInconsistentCode);
+		args.setCfgOutput(cfgOutput);
+		args.setRawCFGOutput(rawCfgOutput);
+		args.setReplaceConsts(replaceConsts);
+		args.setDeobfuscationOn(deobfuscationOn);
+		args.setDeobfuscationForceSave(deobfuscationForceSave);
+		args.setDeobfuscationMinLength(deobfuscationMinLength);
+		args.setDeobfuscationMaxLength(deobfuscationMaxLength);
+		args.setUseSourceNameAsClassAlias(deobfuscationUseSourceNameAsAlias);
+		args.setEscapeUnicode(escapeUnicode);
+		args.setRespectBytecodeAccModifiers(respectBytecodeAccessModifiers);
+		args.setExportAsGradleProject(exportAsGradleProject);
+		args.setUseImports(useImports);
+		return args;
+	}
+
+	public List<String> getFiles() {
+		return files;
+	}
+
+	public String getOutDir() {
+		return outDir;
+	}
+
+	public String getOutDirSrc() {
+		return outDirSrc;
+	}
+
+	public String getOutDirRes() {
+		return outDirRes;
+	}
+
+	public boolean isSkipResources() {
+		return skipResources;
+	}
+
+	public boolean isSkipSources() {
+		return skipSources;
+	}
+
+	public int getThreadsCount() {
+		return threadsCount;
+	}
+
+	public boolean isFallbackMode() {
+		return fallbackMode;
+	}
+
+	public boolean isShowInconsistentCode() {
+		return showInconsistentCode;
+	}
+
+	public boolean isUseImports() {
+		return useImports;
+	}
+
+	public boolean isDeobfuscationOn() {
+		return deobfuscationOn;
+	}
+
+	public int getDeobfuscationMinLength() {
+		return deobfuscationMinLength;
+	}
+
+	public int getDeobfuscationMaxLength() {
+		return deobfuscationMaxLength;
+	}
+
+	public boolean isDeobfuscationForceSave() {
+		return deobfuscationForceSave;
+	}
+
+	public boolean isDeobfuscationUseSourceNameAsAlias() {
+		return deobfuscationUseSourceNameAsAlias;
+	}
+
+	public boolean escapeUnicode() {
+		return escapeUnicode;
+	}
+
+	public boolean isEscapeUnicode() {
+		return escapeUnicode;
+	}
+
+	public boolean isCfgOutput() {
+		return cfgOutput;
+	}
+
+	public boolean isRawCfgOutput() {
+		return rawCfgOutput;
+	}
+
+	public boolean isReplaceConsts() {
+		return replaceConsts;
+	}
+
+	public boolean isRespectBytecodeAccessModifiers() {
+		return respectBytecodeAccessModifiers;
+	}
+
+	public boolean isExportAsGradleProject() {
+		return exportAsGradleProject;
+	}
+}

jadx-cli/src/main/resources/logback.xml

@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%-5level - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="DEBUG">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>

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

@@ -0,0 +1,64 @@
+package jadx.cli;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class JadxCLIArgsTest {
+
+	private static final Logger LOG = LoggerFactory.getLogger(JadxCLIArgsTest.class);
+
+	@Test
+	public void testInvertedBooleanOption() {
+		assertThat(parse("--no-replace-consts").isReplaceConsts(), is(false));
+		assertThat(parse("").isReplaceConsts(), is(true));
+	}
+
+	@Test
+	public void testEscapeUnicodeOption() {
+		assertThat(parse("--escape-unicode").isEscapeUnicode(), is(true));
+		assertThat(parse("").isEscapeUnicode(), is(false));
+	}
+
+	@Test
+	public void testSrcOption() {
+		assertThat(parse("--no-src").isSkipSources(), is(true));
+		assertThat(parse("-s").isSkipSources(), is(true));
+		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) {
+		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

@@ -0,0 +1,17 @@
+ext.jadxClasspath = 'clsp-data/android-5.1.jar'
+
+dependencies {
+    runtime files(jadxClasspath)
+
+    compile files('lib/dx-1.16.jar')
+    compile 'commons-io:commons-io:2.6'
+    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.5'
+    testCompile 'org.smali:baksmali:2.2.5'
+
+    testCompile 'org.apache.commons:commons-lang3:3.8.1'
+}
+

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

@@ -0,0 +1,62 @@
+package jadx.api;
+
+public final class CodePosition {
+
+	private final JavaNode node;
+	private final int line;
+	private final int offset;
+
+	public CodePosition(JavaNode node, int line, int offset) {
+		this.node = node;
+		this.line = line;
+		this.offset = offset;
+	}
+
+	public CodePosition(int line, int offset) {
+		this.node = null;
+		this.line = line;
+		this.offset = offset;
+	}
+
+	public JavaNode getNode() {
+		return node;
+	}
+
+	public JavaClass getJavaClass() {
+		JavaClass parent = node.getDeclaringClass();
+		if (parent == null && node instanceof JavaClass) {
+			return (JavaClass) node;
+		}
+		return parent;
+	}
+
+	public int getLine() {
+		return line;
+	}
+
+	public int getOffset() {
+		return offset;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		CodePosition that = (CodePosition) o;
+		return line == that.line && offset == that.offset;
+	}
+
+	@Override
+	public int hashCode() {
+		return line + 31 * offset;
+	}
+
+	@Override
+	public String toString() {
+		return line + ":" + offset + (node != null ? " " + node : "");
+	}
+}

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

@@ -0,0 +1,252 @@
+package jadx.api;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class JadxArgs {
+
+	public static final int DEFAULT_THREADS_COUNT = Math.max(1, Runtime.getRuntime().availableProcessors() / 2);
+
+	public static final String DEFAULT_OUT_DIR = "jadx-output";
+	public static final String DEFAULT_SRC_DIR = "sources";
+	public static final String DEFAULT_RES_DIR = "resources";
+
+	private List<File> inputFiles = new ArrayList<>(1);
+
+	private File outDir;
+	private File outDirSrc;
+	private File outDirRes;
+
+	private int threadsCount = DEFAULT_THREADS_COUNT;
+
+	private boolean cfgOutput = false;
+	private boolean rawCFGOutput = false;
+
+	private boolean fallbackMode = false;
+	private boolean showInconsistentCode = false;
+
+	private boolean useImports = true;
+
+	private boolean isSkipResources = false;
+	private boolean isSkipSources = false;
+
+	private boolean isDeobfuscationOn = false;
+	private boolean isDeobfuscationForceSave = false;
+	private boolean useSourceNameAsClassAlias = false;
+
+	private int deobfuscationMinLength = 0;
+	private int deobfuscationMaxLength = Integer.MAX_VALUE;
+
+	private boolean escapeUnicode = false;
+	private boolean replaceConsts = true;
+	private boolean respectBytecodeAccModifiers = false;
+	private boolean exportAsGradleProject = false;
+
+	public JadxArgs() {
+		// use default options
+	}
+
+	public void setRootDir(File rootDir) {
+		setOutDir(rootDir);
+		setOutDirSrc(new File(rootDir, DEFAULT_SRC_DIR));
+		setOutDirRes(new File(rootDir, DEFAULT_RES_DIR));
+	}
+
+	public List<File> getInputFiles() {
+		return inputFiles;
+	}
+
+	public void setInputFiles(List<File> inputFiles) {
+		this.inputFiles = inputFiles;
+	}
+
+	public File getOutDir() {
+		return outDir;
+	}
+
+	public void setOutDir(File outDir) {
+		this.outDir = outDir;
+	}
+
+	public File getOutDirSrc() {
+		return outDirSrc;
+	}
+
+	public void setOutDirSrc(File outDirSrc) {
+		this.outDirSrc = outDirSrc;
+	}
+
+	public File getOutDirRes() {
+		return outDirRes;
+	}
+
+	public void setOutDirRes(File outDirRes) {
+		this.outDirRes = outDirRes;
+	}
+
+	public int getThreadsCount() {
+		return threadsCount;
+	}
+
+	public void setThreadsCount(int threadsCount) {
+		this.threadsCount = threadsCount;
+	}
+
+	public boolean isCfgOutput() {
+		return cfgOutput;
+	}
+
+	public void setCfgOutput(boolean cfgOutput) {
+		this.cfgOutput = cfgOutput;
+	}
+
+	public boolean isRawCFGOutput() {
+		return rawCFGOutput;
+	}
+
+	public void setRawCFGOutput(boolean rawCFGOutput) {
+		this.rawCFGOutput = rawCFGOutput;
+	}
+
+	public boolean isFallbackMode() {
+		return fallbackMode;
+	}
+
+	public void setFallbackMode(boolean fallbackMode) {
+		this.fallbackMode = fallbackMode;
+	}
+
+	public boolean isShowInconsistentCode() {
+		return showInconsistentCode;
+	}
+
+	public void setShowInconsistentCode(boolean showInconsistentCode) {
+		this.showInconsistentCode = showInconsistentCode;
+	}
+
+	public boolean isUseImports() {
+		return useImports;
+	}
+
+	public void setUseImports(boolean useImports) {
+		this.useImports = useImports;
+	}
+
+	public boolean isSkipResources() {
+		return isSkipResources;
+	}
+
+	public void setSkipResources(boolean skipResources) {
+		isSkipResources = skipResources;
+	}
+
+	public boolean isSkipSources() {
+		return isSkipSources;
+	}
+
+	public void setSkipSources(boolean skipSources) {
+		isSkipSources = skipSources;
+	}
+
+	public boolean isDeobfuscationOn() {
+		return isDeobfuscationOn;
+	}
+
+	public void setDeobfuscationOn(boolean deobfuscationOn) {
+		isDeobfuscationOn = deobfuscationOn;
+	}
+
+	public boolean isDeobfuscationForceSave() {
+		return isDeobfuscationForceSave;
+	}
+
+	public void setDeobfuscationForceSave(boolean deobfuscationForceSave) {
+		isDeobfuscationForceSave = deobfuscationForceSave;
+	}
+
+	public boolean isUseSourceNameAsClassAlias() {
+		return useSourceNameAsClassAlias;
+	}
+
+	public void setUseSourceNameAsClassAlias(boolean useSourceNameAsClassAlias) {
+		this.useSourceNameAsClassAlias = useSourceNameAsClassAlias;
+	}
+
+	public int getDeobfuscationMinLength() {
+		return deobfuscationMinLength;
+	}
+
+	public void setDeobfuscationMinLength(int deobfuscationMinLength) {
+		this.deobfuscationMinLength = deobfuscationMinLength;
+	}
+
+	public int getDeobfuscationMaxLength() {
+		return deobfuscationMaxLength;
+	}
+
+	public void setDeobfuscationMaxLength(int deobfuscationMaxLength) {
+		this.deobfuscationMaxLength = deobfuscationMaxLength;
+	}
+
+	public boolean isEscapeUnicode() {
+		return escapeUnicode;
+	}
+
+	public void setEscapeUnicode(boolean escapeUnicode) {
+		this.escapeUnicode = escapeUnicode;
+	}
+
+	public boolean isReplaceConsts() {
+		return replaceConsts;
+	}
+
+	public void setReplaceConsts(boolean replaceConsts) {
+		this.replaceConsts = replaceConsts;
+	}
+
+	public boolean isRespectBytecodeAccModifiers() {
+		return respectBytecodeAccModifiers;
+	}
+
+	public void setRespectBytecodeAccModifiers(boolean respectBytecodeAccModifiers) {
+		this.respectBytecodeAccModifiers = respectBytecodeAccModifiers;
+	}
+
+	public boolean isExportAsGradleProject() {
+		return exportAsGradleProject;
+	}
+
+	public void setExportAsGradleProject(boolean exportAsGradleProject) {
+		this.exportAsGradleProject = exportAsGradleProject;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("JadxArgs{");
+		sb.append("inputFiles=").append(inputFiles);
+		sb.append(", outDir=").append(outDir);
+		sb.append(", outDirSrc=").append(outDirSrc);
+		sb.append(", outDirRes=").append(outDirRes);
+		sb.append(", threadsCount=").append(threadsCount);
+		sb.append(", cfgOutput=").append(cfgOutput);
+		sb.append(", rawCFGOutput=").append(rawCFGOutput);
+		sb.append(", fallbackMode=").append(fallbackMode);
+		sb.append(", showInconsistentCode=").append(showInconsistentCode);
+		sb.append(", useImports=").append(useImports);
+		sb.append(", isSkipResources=").append(isSkipResources);
+		sb.append(", isSkipSources=").append(isSkipSources);
+		sb.append(", isDeobfuscationOn=").append(isDeobfuscationOn);
+		sb.append(", isDeobfuscationForceSave=").append(isDeobfuscationForceSave);
+		sb.append(", useSourceNameAsClassAlias=").append(useSourceNameAsClassAlias);
+		sb.append(", deobfuscationMinLength=").append(deobfuscationMinLength);
+		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/JadxArgsValidator.java

@@ -0,0 +1,108 @@
+package jadx.api;
+
+import java.io.File;
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jadx.core.utils.exceptions.JadxArgsValidateException;
+
+public class JadxArgsValidator {
+
+	private static final Logger LOG = LoggerFactory.getLogger(JadxArgsValidator.class);
+
+	public static void validate(JadxArgs args) {
+		checkInputFiles(args);
+		validateOutDirs(args);
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("Effective jadx args: {}", args);
+		}
+	}
+
+	private static void checkInputFiles(JadxArgs args) {
+		List<File> inputFiles = args.getInputFiles();
+		if (inputFiles.isEmpty()) {
+			throw new JadxArgsValidateException("Please specify input file");
+		}
+		if (inputFiles.size() > 1) {
+			for (File inputFile : inputFiles) {
+				String fileName = inputFile.getName();
+				if (fileName.startsWith("--")) {
+					throw new JadxArgsValidateException("Unknown argument: " + fileName);
+				}
+			}
+			throw new JadxArgsValidateException("Only one input file supported");
+		}
+		for (File file : inputFiles) {
+			checkFile(file);
+		}
+	}
+
+	private static void validateOutDirs(JadxArgs args) {
+		File outDir = args.getOutDir();
+		File srcDir = args.getOutDirSrc();
+		File resDir = args.getOutDirRes();
+		if (outDir == null) {
+			if (srcDir != null) {
+				outDir = srcDir;
+			} else if (resDir != null) {
+				outDir = resDir;
+			} else {
+				outDir = makeDirFromInput(args);
+			}
+		}
+		args.setOutDir(outDir);
+		setFromOut(args);
+
+		checkDir(args.getOutDir());
+		checkDir(args.getOutDirSrc());
+		checkDir(args.getOutDirRes());
+	}
+
+	@NotNull
+	private static File makeDirFromInput(JadxArgs args) {
+		File outDir;
+		String outDirName;
+		File file = args.getInputFiles().get(0);
+		String name = file.getName();
+		int pos = name.lastIndexOf('.');
+		if (pos != -1) {
+			outDirName = name.substring(0, pos);
+		} else {
+			outDirName = name + "-" + JadxArgs.DEFAULT_OUT_DIR;
+		}
+		LOG.info("output directory: {}", outDirName);
+		outDir = new File(outDirName);
+		return outDir;
+	}
+
+	private static void setFromOut(JadxArgs args) {
+		if (args.getOutDirSrc() == null) {
+			args.setOutDirSrc(new File(args.getOutDir(), JadxArgs.DEFAULT_SRC_DIR));
+		}
+		if (args.getOutDirRes() == null) {
+			args.setOutDirRes(new File(args.getOutDir(), JadxArgs.DEFAULT_RES_DIR));
+		}
+	}
+
+	private static void checkFile(File file) {
+		if (!file.exists()) {
+			throw new JadxArgsValidateException("File not found " + file.getAbsolutePath());
+		}
+		if (file.isDirectory()) {
+			throw new JadxArgsValidateException("Expected file but found directory instead: " + file.getAbsolutePath());
+		}
+	}
+
+	private static void checkDir(File dir) {
+		if (dir != null && dir.exists() && !dir.isDirectory()) {
+			throw new JadxArgsValidateException("Output directory exists as file " + dir);
+		}
+	}
+
+	private JadxArgsValidator() {
+	}
+}

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

@@ -0,0 +1,354 @@
+package jadx.api;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jadx.core.Jadx;
+import jadx.core.ProcessClass;
+import jadx.core.codegen.CodeGen;
+import jadx.core.dex.attributes.AFlag;
+import jadx.core.dex.nodes.ClassNode;
+import jadx.core.dex.nodes.FieldNode;
+import jadx.core.dex.nodes.MethodNode;
+import jadx.core.dex.nodes.RootNode;
+import jadx.core.dex.visitors.IDexTreeVisitor;
+import jadx.core.dex.visitors.SaveCode;
+import jadx.core.export.ExportGradleProject;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+import jadx.core.utils.files.InputFile;
+import jadx.core.xmlgen.BinaryXMLParser;
+import jadx.core.xmlgen.ResourcesSaver;
+
+/**
+ * Jadx API usage example:
+ * <pre><code>
+ * JadxArgs args = new JadxArgs();
+ * args.getInputFiles().add(new File("test.apk"));
+ * args.setOutDir(new File("jadx-test-output"));
+ *
+ * JadxDecompiler jadx = new JadxDecompiler(args);
+ * jadx.load();
+ * jadx.save();
+ * </code></pre>
+ * <p>
+ * Instead of 'save()' you can iterate over decompiled classes:
+ * <pre><code>
+ *  for(JavaClass cls : jadx.getClasses()) {
+ *      System.out.println(cls.getCode());
+ *  }
+ * </code></pre>
+ */
+public final class JadxDecompiler {
+	private static final Logger LOG = LoggerFactory.getLogger(JadxDecompiler.class);
+
+	private JadxArgs args;
+
+	private final List<InputFile> inputFiles = new ArrayList<>();
+
+	private RootNode root;
+	private List<IDexTreeVisitor> passes;
+	private CodeGen codeGen;
+
+	private List<JavaClass> classes;
+	private List<ResourceFile> resources;
+
+	private BinaryXMLParser xmlParser;
+
+	private Map<ClassNode, JavaClass> classesMap = new ConcurrentHashMap<>();
+	private Map<MethodNode, JavaMethod> methodsMap = new ConcurrentHashMap<>();
+	private Map<FieldNode, JavaField> fieldsMap = new ConcurrentHashMap<>();
+
+	public JadxDecompiler() {
+		this(new JadxArgs());
+	}
+
+	public JadxDecompiler(JadxArgs args) {
+		this.args = args;
+	}
+
+	public void load() {
+		reset();
+		JadxArgsValidator.validate(args);
+		init();
+		LOG.info("loading ...");
+
+		loadFiles(args.getInputFiles());
+
+		root = new RootNode(args);
+		root.load(inputFiles);
+
+		root.initClassPath();
+		root.loadResources(getResources());
+
+		initVisitors();
+	}
+
+	void init() {
+		this.passes = Jadx.getPassesList(args);
+		this.codeGen = new CodeGen();
+	}
+
+	void reset() {
+		classes = null;
+		resources = null;
+		xmlParser = null;
+		root = null;
+		passes = null;
+		codeGen = null;
+	}
+
+	public static String getVersion() {
+		return Jadx.getVersion();
+	}
+
+	private void loadFiles(List<File> files) {
+		if (files.isEmpty()) {
+			throw new JadxRuntimeException("Empty file list");
+		}
+		inputFiles.clear();
+		for (File file : files) {
+			try {
+				InputFile.addFilesFrom(file, inputFiles, args.isSkipSources());
+			} catch (Exception e) {
+				throw new JadxRuntimeException("Error load file: " + file, e);
+			}
+		}
+	}
+
+	public void save() {
+		save(!args.isSkipSources(), !args.isSkipResources());
+	}
+
+	public void saveSources() {
+		save(true, false);
+	}
+
+	public void saveResources() {
+		save(false, true);
+	}
+
+	private void save(boolean saveSources, boolean saveResources) {
+		ExecutorService ex = getSaveExecutor(saveSources, saveResources);
+		ex.shutdown();
+		try {
+			ex.awaitTermination(1, TimeUnit.DAYS);
+		} catch (InterruptedException e) {
+			LOG.error("Save interrupted", e);
+			Thread.currentThread().interrupt();
+		}
+	}
+
+	public ExecutorService getSaveExecutor() {
+		return getSaveExecutor(!args.isSkipSources(), !args.isSkipResources());
+	}
+
+	private ExecutorService getSaveExecutor(boolean saveSources, boolean saveResources) {
+		if (root == null) {
+			throw new JadxRuntimeException("No loaded files");
+		}
+		int threadsCount = args.getThreadsCount();
+		LOG.debug("processing threads count: {}", threadsCount);
+
+		LOG.info("processing ...");
+		ExecutorService executor = Executors.newFixedThreadPool(threadsCount);
+
+		File sourcesOutDir;
+		File resOutDir;
+		if (args.isExportAsGradleProject()) {
+			ExportGradleProject export = new ExportGradleProject(root, args.getOutDir());
+			export.init();
+			sourcesOutDir = export.getSrcOutDir();
+			resOutDir = export.getResOutDir();
+		} else {
+			sourcesOutDir = args.getOutDirSrc();
+			resOutDir = args.getOutDirRes();
+		}
+		if (saveResources) {
+			appendResourcesSave(executor, resOutDir);
+		}
+		if (saveSources) {
+			appendSourcesSave(executor, sourcesOutDir);
+		}
+		return executor;
+	}
+
+	private void appendResourcesSave(ExecutorService executor, File outDir) {
+		for (ResourceFile resourceFile : getResources()) {
+			executor.execute(new ResourcesSaver(outDir, resourceFile));
+		}
+	}
+
+	private void appendSourcesSave(ExecutorService executor, File outDir) {
+		for (JavaClass cls : getClasses()) {
+			if (cls.getClassNode().contains(AFlag.DONT_GENERATE)) {
+				continue;
+			}
+			executor.execute(() -> {
+				try {
+					cls.decompile();
+					SaveCode.save(outDir, args, cls.getClassNode());
+				} catch (Exception e) {
+					LOG.error("Error saving class: {}", cls.getFullName(), e);
+				}
+			});
+		}
+	}
+
+	public List<JavaClass> getClasses() {
+		if (root == null) {
+			return Collections.emptyList();
+		}
+		if (classes == null) {
+			List<ClassNode> classNodeList = root.getClasses(false);
+			List<JavaClass> clsList = new ArrayList<>(classNodeList.size());
+			classesMap.clear();
+			for (ClassNode classNode : classNodeList) {
+				JavaClass javaClass = new JavaClass(classNode, this);
+				clsList.add(javaClass);
+				classesMap.put(classNode, javaClass);
+			}
+			classes = Collections.unmodifiableList(clsList);
+		}
+		return classes;
+	}
+
+	public List<ResourceFile> getResources() {
+		if (resources == null) {
+			if (root == null) {
+				return Collections.emptyList();
+			}
+			resources = new ResourcesLoader(this).load(inputFiles);
+		}
+		return resources;
+	}
+
+	public List<JavaPackage> getPackages() {
+		List<JavaClass> classList = getClasses();
+		if (classList.isEmpty()) {
+			return Collections.emptyList();
+		}
+		Map<String, List<JavaClass>> map = new HashMap<>();
+		for (JavaClass javaClass : classList) {
+			String pkg = javaClass.getPackage();
+			List<JavaClass> clsList = map.computeIfAbsent(pkg, k -> new ArrayList<>());
+			clsList.add(javaClass);
+		}
+		List<JavaPackage> packages = new ArrayList<>(map.size());
+		for (Map.Entry<String, List<JavaClass>> entry : map.entrySet()) {
+			packages.add(new JavaPackage(entry.getKey(), entry.getValue()));
+		}
+		Collections.sort(packages);
+		for (JavaPackage pkg : packages) {
+			pkg.getClasses().sort(Comparator.comparing(JavaClass::getName));
+		}
+		return Collections.unmodifiableList(packages);
+	}
+
+	public int getErrorsCount() {
+		if (root == null) {
+			return 0;
+		}
+		return root.getErrorsCounter().getErrorCount();
+	}
+
+	public int getWarnsCount() {
+		if (root == null) {
+			return 0;
+		}
+		return root.getErrorsCounter().getWarnsCount();
+	}
+
+	public void printErrorsReport() {
+		if (root == null) {
+			return;
+		}
+		root.getClsp().printMissingClasses();
+		root.getErrorsCounter().printReport();
+	}
+
+	private void initVisitors() {
+		for (IDexTreeVisitor pass : passes) {
+			try {
+				pass.init(root);
+			} catch (Exception e) {
+				LOG.error("Visitor init failed: {}", pass.getClass().getSimpleName(), e);
+			}
+		}
+	}
+
+	void processClass(ClassNode cls) {
+		ProcessClass.process(cls, passes, codeGen);
+	}
+
+	RootNode getRoot() {
+		return root;
+	}
+
+	synchronized BinaryXMLParser getXmlParser() {
+		if (xmlParser == null) {
+			xmlParser = new BinaryXMLParser(root);
+		}
+		return xmlParser;
+	}
+
+	Map<ClassNode, JavaClass> getClassesMap() {
+		return classesMap;
+	}
+
+	Map<MethodNode, JavaMethod> getMethodsMap() {
+		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;
+	}
+
+	@Override
+	public String toString() {
+		return "jadx decompiler " + getVersion();
+	}
+}

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

@@ -0,0 +1,261 @@
+package jadx.api;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+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;
+	private final ClassNode cls;
+	private final JavaClass parent;
+
+	private List<JavaClass> innerClasses = Collections.emptyList();
+	private List<JavaField> fields = Collections.emptyList();
+	private List<JavaMethod> methods = Collections.emptyList();
+
+	JavaClass(ClassNode classNode, JadxDecompiler decompiler) {
+		this.decompiler = decompiler;
+		this.cls = classNode;
+		this.parent = null;
+	}
+
+	/**
+	 * Inner classes constructor
+	 */
+	JavaClass(ClassNode classNode, JavaClass parent) {
+		this.decompiler = null;
+		this.cls = classNode;
+		this.parent = parent;
+	}
+
+	public String getCode() {
+		CodeWriter code = cls.getCode();
+		if (code == null) {
+			decompile();
+			code = cls.getCode();
+			if (code == null) {
+				return "";
+			}
+		}
+		return code.getCodeStr();
+	}
+
+	public synchronized void decompile() {
+		if (decompiler == null) {
+			return;
+		}
+		if (cls.getCode() == null) {
+			decompiler.processClass(cls);
+			load();
+		}
+	}
+
+	public synchronized void unload() {
+		cls.unload();
+	}
+
+	ClassNode getClassNode() {
+		return cls;
+	}
+
+	private void load() {
+		JadxDecompiler rootDecompiler = getRootDecompiler();
+		int inClsCount = cls.getInnerClasses().size();
+		if (inClsCount != 0) {
+			List<JavaClass> list = new ArrayList<>(inClsCount);
+			for (ClassNode inner : cls.getInnerClasses()) {
+				if (!inner.contains(AFlag.DONT_GENERATE)) {
+					JavaClass javaClass = new JavaClass(inner, this);
+					javaClass.load();
+					list.add(javaClass);
+					rootDecompiler.getClassesMap().put(inner, javaClass);
+				}
+			}
+			this.innerClasses = Collections.unmodifiableList(list);
+		}
+
+		int fieldsCount = cls.getFields().size();
+		if (fieldsCount != 0) {
+			List<JavaField> flds = new ArrayList<>(fieldsCount);
+			for (FieldNode f : cls.getFields()) {
+				if (!f.contains(AFlag.DONT_GENERATE)) {
+					JavaField javaField = new JavaField(f, this);
+					flds.add(javaField);
+					rootDecompiler.getFieldsMap().put(f, javaField);
+				}
+			}
+			this.fields = Collections.unmodifiableList(flds);
+		}
+
+		int methodsCount = cls.getMethods().size();
+		if (methodsCount != 0) {
+			List<JavaMethod> mths = new ArrayList<>(methodsCount);
+			for (MethodNode m : cls.getMethods()) {
+				if (!m.contains(AFlag.DONT_GENERATE)) {
+					JavaMethod javaMethod = new JavaMethod(this, m);
+					mths.add(javaMethod);
+					rootDecompiler.getMethodsMap().put(m, javaMethod);
+				}
+			}
+			mths.sort(Comparator.comparing(JavaMethod::getName));
+			this.methods = Collections.unmodifiableList(mths);
+		}
+	}
+
+	private JadxDecompiler getRootDecompiler() {
+		if (parent != null) {
+			return parent.getRootDecompiler();
+		}
+		return decompiler;
+	}
+
+	private Map<CodePosition, Object> getCodeAnnotations() {
+		decompile();
+		CodeWriter code = cls.getCode();
+		if (code == null) {
+			return Collections.emptyMap();
+		}
+		return code.getAnnotations();
+	}
+
+	public Map<CodePosition, JavaNode> getUsageMap() {
+		Map<CodePosition, Object> map = getCodeAnnotations();
+		if (map.isEmpty() || decompiler == null) {
+			return Collections.emptyMap();
+		}
+		Map<CodePosition, JavaNode> resultMap = new HashMap<>(map.size());
+		for (Map.Entry<CodePosition, Object> entry : map.entrySet()) {
+			CodePosition codePosition = entry.getKey();
+			Object obj = entry.getValue();
+			if (obj instanceof LineAttrNode) {
+				JavaNode node = convertNode(obj);
+				if (node != null) {
+					resultMap.put(codePosition, node);
+				}
+			}
+		}
+		return resultMap;
+	}
+
+	@Nullable
+	private JavaNode convertNode(Object obj) {
+		if (!(obj instanceof LineAttrNode)) {
+			return null;
+		}
+		if (obj instanceof ClassNode) {
+			return getRootDecompiler().getClassesMap().get(obj);
+		}
+		if (obj instanceof MethodNode) {
+			return getRootDecompiler().getJavaMethodByNode(((MethodNode) obj));
+		}
+		if (obj instanceof FieldNode) {
+			return getRootDecompiler().getJavaFieldByNode((FieldNode) obj);
+		}
+		return null;
+	}
+
+	@Nullable
+	public JavaNode getJavaNodeAtPosition(int line, int offset) {
+		Map<CodePosition, Object> map = getCodeAnnotations();
+		if (map.isEmpty()) {
+			return null;
+		}
+		Object obj = map.get(new CodePosition(line, offset));
+		if (obj == null) {
+			return null;
+		}
+		return convertNode(obj);
+	}
+
+	@Nullable
+	public CodePosition getDefinitionPosition(JavaNode javaNode) {
+		JavaClass jCls = javaNode.getTopParentClass();
+		jCls.decompile();
+		int defLine = javaNode.getDecompiledLine();
+		if (defLine == 0) {
+			return null;
+		}
+		return new CodePosition(jCls, defLine, 0);
+	}
+
+	public Integer getSourceLine(int decompiledLine) {
+		decompile();
+		return cls.getCode().getLineMapping().get(decompiledLine);
+	}
+
+	@Override
+	public String getName() {
+		return cls.getShortName();
+	}
+
+	@Override
+	public String getFullName() {
+		return cls.getFullName();
+	}
+
+	public String getPackage() {
+		return cls.getPackage();
+	}
+
+	@Override
+	public JavaClass getDeclaringClass() {
+		return parent;
+	}
+
+	@Override
+	public JavaClass getTopParentClass() {
+		return parent == null ? this : parent.getTopParentClass();
+	}
+
+	public AccessInfo getAccessInfo() {
+		return cls.getAccessFlags();
+	}
+
+	public List<JavaClass> getInnerClasses() {
+		decompile();
+		return innerClasses;
+	}
+
+	public List<JavaField> getFields() {
+		decompile();
+		return fields;
+	}
+
+	public List<JavaMethod> getMethods() {
+		decompile();
+		return methods;
+	}
+
+	public int getDecompiledLine() {
+		return cls.getDecompiledLine();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		return this == o || o instanceof JavaClass && cls.equals(((JavaClass) o).cls);
+	}
+
+	@Override
+	public int hashCode() {
+		return cls.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return getFullName();
+	}
+}

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

@@ -0,0 +1,63 @@
+package jadx.api;
+
+import jadx.core.dex.info.AccessInfo;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.nodes.FieldNode;
+
+public final class JavaField implements JavaNode {
+
+	private final FieldNode field;
+	private final JavaClass parent;
+
+	JavaField(FieldNode f, JavaClass cls) {
+		this.field = f;
+		this.parent = cls;
+	}
+
+	@Override
+	public String getName() {
+		return field.getAlias();
+	}
+
+	@Override
+	public String getFullName() {
+		return parent.getFullName() + "." + getName();
+	}
+
+	@Override
+	public JavaClass getDeclaringClass() {
+		return parent;
+	}
+
+	@Override
+	public JavaClass getTopParentClass() {
+		return parent.getTopParentClass();
+	}
+
+	public AccessInfo getAccessFlags() {
+		return field.getAccessFlags();
+	}
+
+	public ArgType getType() {
+		return field.getType();
+	}
+
+	public int getDecompiledLine() {
+		return field.getDecompiledLine();
+	}
+
+	@Override
+	public int hashCode() {
+		return field.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		return this == o || o instanceof JavaField && field.equals(((JavaField) o).field);
+	}
+
+	@Override
+	public String toString() {
+		return field.toString();
+	}
+}

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

@@ -0,0 +1,76 @@
+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;
+
+public final class JavaMethod implements JavaNode {
+	private final MethodNode mth;
+	private final JavaClass parent;
+
+	JavaMethod(JavaClass cls, MethodNode m) {
+		this.parent = cls;
+		this.mth = m;
+	}
+
+	@Override
+	public String getName() {
+		return mth.getAlias();
+	}
+
+	@Override
+	public String getFullName() {
+		return mth.getMethodInfo().getFullName();
+	}
+
+	@Override
+	public JavaClass getDeclaringClass() {
+		return parent;
+	}
+
+	@Override
+	public JavaClass getTopParentClass() {
+		return parent.getTopParentClass();
+	}
+
+	public AccessInfo getAccessFlags() {
+		return mth.getAccessFlags();
+	}
+
+	public List<ArgType> getArguments() {
+		return mth.getMethodInfo().getArgumentsTypes();
+	}
+
+	public ArgType getReturnType() {
+		return mth.getReturnType();
+	}
+
+	public boolean isConstructor() {
+		return mth.getMethodInfo().isConstructor();
+	}
+
+	public boolean isClassInit() {
+		return mth.getMethodInfo().isClassInit();
+	}
+
+	public int getDecompiledLine() {
+		return mth.getDecompiledLine();
+	}
+
+	@Override
+	public int hashCode() {
+		return mth.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		return this == o || o instanceof JavaMethod && mth.equals(((JavaMethod) o).mth);
+	}
+
+	@Override
+	public String toString() {
+		return mth.toString();
+	}
+}

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

@@ -0,0 +1,14 @@
+package jadx.api;
+
+public interface JavaNode {
+
+	String getName();
+
+	String getFullName();
+
+	JavaClass getDeclaringClass();
+
+	JavaClass getTopParentClass();
+
+	int getDecompiledLine();
+}

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

@@ -0,0 +1,72 @@
+package jadx.api;
+
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
+
+public final class JavaPackage implements JavaNode, Comparable<JavaPackage> {
+	private final String name;
+	private final List<JavaClass> classes;
+
+	JavaPackage(String name, List<JavaClass> classes) {
+		this.name = name;
+		this.classes = classes;
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public String getFullName() {
+		// TODO: store full package name
+		return name;
+	}
+
+	public List<JavaClass> getClasses() {
+		return classes;
+	}
+
+	@Override
+	public JavaClass getDeclaringClass() {
+		return null;
+	}
+
+	@Override
+	public JavaClass getTopParentClass() {
+		return null;
+	}
+
+	@Override
+	public int getDecompiledLine() {
+		return 0;
+	}
+
+	@Override
+	public int compareTo(@NotNull JavaPackage o) {
+		return name.compareTo(o.name);
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		JavaPackage that = (JavaPackage) o;
+		return name.equals(that.name);
+	}
+
+	@Override
+	public int hashCode() {
+		return name.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+}

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

@@ -0,0 +1,75 @@
+package jadx.api;
+
+import java.io.File;
+
+import jadx.core.utils.files.ZipSecurity;
+import jadx.core.xmlgen.ResContainer;
+
+public class ResourceFile {
+
+	public static final class ZipRef {
+		private final File zipFile;
+		private final String entryName;
+
+		public ZipRef(File zipFile, String entryName) {
+			this.zipFile = zipFile;
+			this.entryName = entryName;
+		}
+
+		public File getZipFile() {
+			return zipFile;
+		}
+
+		public String getEntryName() {
+			return entryName;
+		}
+
+		@Override
+		public String toString() {
+			return "ZipRef{" + zipFile + ", '" + entryName + "'}";
+		}
+	}
+
+	private final JadxDecompiler decompiler;
+	private final String name;
+	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;
+		this.type = type;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public ResourceType getType() {
+		return type;
+	}
+
+	public ResContainer loadContent() {
+		return ResourcesLoader.loadContent(decompiler, this);
+	}
+
+	void setZipRef(ZipRef zipRef) {
+		this.zipRef = zipRef;
+	}
+
+	public ZipRef getZipRef() {
+		return zipRef;
+	}
+
+	@Override
+	public String toString() {
+		return "ResourceFile{name='" + name + '\'' + ", type=" + type + "}";
+	}
+}

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

@@ -0,0 +1,18 @@
+package jadx.api;
+
+import jadx.core.codegen.CodeWriter;
+import jadx.core.xmlgen.ResContainer;
+
+public class ResourceFileContent extends ResourceFile {
+	private final CodeWriter content;
+
+	public ResourceFileContent(String name, ResourceType type, CodeWriter content) {
+		super(null, name, type);
+		this.content = content;
+	}
+
+	@Override
+	public ResContainer loadContent() {
+		return ResContainer.textResource(getName(), content);
+	}
+}

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

@@ -0,0 +1,33 @@
+package jadx.api;
+
+public enum ResourceType {
+	CODE(".dex", ".jar", ".class"),
+	MANIFEST("AndroidManifest.xml"),
+	XML(".xml"),
+	ARSC(".arsc"),
+	FONT(".ttf"),
+	IMG(".png", ".gif", ".jpg"),
+	LIB(".so"),
+	UNKNOWN;
+
+	private final String[] exts;
+
+	ResourceType(String... exts) {
+		this.exts = exts;
+	}
+
+	public String[] getExts() {
+		return exts;
+	}
+
+	public static ResourceType getFileType(String fileName) {
+		for (ResourceType type : ResourceType.values()) {
+			for (String ext : type.getExts()) {
+				if (fileName.endsWith(ext)) {
+					return type;
+				}
+			}
+		}
+		return UNKNOWN;
+	}
+}

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

@@ -0,0 +1,173 @@
+package jadx.api;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.slf4j.Logger;
+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;
+import jadx.core.xmlgen.ResContainer;
+import jadx.core.xmlgen.ResTableParser;
+
+import static jadx.core.utils.files.FileUtils.READ_BUFFER_SIZE;
+import static jadx.core.utils.files.FileUtils.copyStream;
+
+// TODO: move to core package
+public final class ResourcesLoader {
+	private static final Logger LOG = LoggerFactory.getLogger(ResourcesLoader.class);
+
+	private final JadxDecompiler jadxRef;
+
+	ResourcesLoader(JadxDecompiler jadxRef) {
+		this.jadxRef = jadxRef;
+	}
+
+	List<ResourceFile> load(List<InputFile> inputFiles) {
+		List<ResourceFile> list = new ArrayList<>(inputFiles.size());
+		for (InputFile file : inputFiles) {
+			loadFile(list, file.getFile());
+		}
+		return list;
+	}
+
+	public interface ResourceDecoder<T> {
+		T decode(long size, InputStream is) throws IOException;
+	}
+
+	public static <T> T decodeStream(ResourceFile rf, ResourceDecoder<T> decoder) throws JadxException {
+		try {
+			ZipRef zipRef = rf.getZipRef();
+			if (zipRef == null) {
+				File file = new File(rf.getName());
+				try (InputStream inputStream = new BufferedInputStream(new FileInputStream(file))) {
+					return decoder.decode(file.length(), inputStream);
+				}
+			} else {
+				try (ZipFile zipFile = new ZipFile(zipRef.getZipFile())) {
+					ZipEntry entry = zipFile.getEntry(zipRef.getEntryName());
+					if (entry == null) {
+						throw new IOException("Zip entry not found: " + zipRef);
+					}
+					if (!ZipSecurity.isValidZipEntry(entry)) {
+						return null;
+					}
+					try (InputStream inputStream = new BufferedInputStream(zipFile.getInputStream(entry))) {
+						return decoder.decode(entry.getSize(), inputStream);
+					}
+				}
+			}
+		} catch (Exception e) {
+			throw new JadxException("Error decode: " + rf.getName(), e);
+		}
+	}
+
+	static ResContainer loadContent(JadxDecompiler jadxRef, ResourceFile rf) {
+		try {
+			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.textResource(rf.getName(), cw);
+		}
+	}
+
+	private static ResContainer loadContent(JadxDecompiler jadxRef, ResourceFile rf,
+	                                        InputStream inputStream) throws IOException {
+		switch (rf.getType()) {
+			case MANIFEST:
+			case XML:
+				CodeWriter content = jadxRef.getXmlParser().parse(inputStream);
+				return ResContainer.textResource(rf.getName(), content);
+
+			case ARSC:
+				return new ResTableParser().decodeFiles(inputStream);
+
+			case IMG:
+				return decodeImage(rf, inputStream);
+
+			default:
+				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;
+		}
+		try (ZipFile zip = new ZipFile(file)) {
+			Enumeration<? extends ZipEntry> entries = zip.entries();
+			while (entries.hasMoreElements()) {
+				ZipEntry entry = entries.nextElement();
+				if (ZipSecurity.isValidZipEntry(entry)) {
+					addEntry(list, file, entry);
+				}
+			}
+		} catch (Exception e) {
+			LOG.debug("Not a zip file: {}", file.getAbsolutePath());
+			addResourceFile(list, file);
+		}
+	}
+
+	private void addResourceFile(List<ResourceFile> list, File file) {
+		String name = file.getAbsolutePath();
+		ResourceType type = ResourceType.getFileType(name);
+		ResourceFile rf = ResourceFile.createResourceFile(jadxRef, name, type);
+		if (rf != null) {
+			list.add(rf);
+		}
+	}
+
+	private void addEntry(List<ResourceFile> list, File zipFile, ZipEntry entry) {
+		if (entry.isDirectory()) {
+			return;
+		}
+		String name = entry.getName();
+		ResourceType type = ResourceType.getFileType(name);
+		ResourceFile rf = ResourceFile.createResourceFile(jadxRef, name, type);
+		if (rf != null) {
+			rf.setZipRef(new ZipRef(zipFile, name));
+			list.add(rf);
+		}
+	}
+
+	public static CodeWriter loadToCodeWriter(InputStream is) throws IOException {
+		CodeWriter cw = new CodeWriter();
+		ByteArrayOutputStream baos = new ByteArrayOutputStream(READ_BUFFER_SIZE);
+		copyStream(is, baos);
+		cw.add(baos.toString("UTF-8"));
+		return cw;
+	}
+}

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

@@ -1,10 +1,6 @@
-package jadx;
-
-import jadx.utils.Utils;
+package jadx.core;
 
 public class Consts {
-	public static final String JADX_VERSION = Utils.getJadxVersion();
-
 	public static final boolean DEBUG = false;
 
 	public static final String CLASS_OBJECT = "java.lang.Object";
@@ -22,4 +18,10 @@ public class Consts {
 	public static final String DALVIK_ANNOTATION_DEFAULT = "dalvik.annotation.AnnotationDefault";
 
 	public static final String DEFAULT_PACKAGE_NAME = "defpackage";
+	public static final String ANONYMOUS_CLASS_PREFIX = "AnonymousClass";
+
+	public static final String MTH_TOSTRING_SIGNATURE = "toString()Ljava/lang/String;";
+
+	private Consts() {
+	}
 }

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

@@ -0,0 +1,136 @@
+package jadx.core;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.jar.Manifest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jadx.api.JadxArgs;
+import jadx.core.dex.visitors.ClassModifier;
+import jadx.core.dex.visitors.CodeShrinker;
+import jadx.core.dex.visitors.ConstInlineVisitor;
+import jadx.core.dex.visitors.DebugInfoVisitor;
+import jadx.core.dex.visitors.DependencyCollector;
+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;
+import jadx.core.dex.visitors.PrepareForCodeGen;
+import jadx.core.dex.visitors.ReSugarCode;
+import jadx.core.dex.visitors.RenameVisitor;
+import jadx.core.dex.visitors.SimplifyVisitor;
+import jadx.core.dex.visitors.blocksmaker.BlockExceptionHandler;
+import jadx.core.dex.visitors.blocksmaker.BlockFinallyExtract;
+import jadx.core.dex.visitors.blocksmaker.BlockFinish;
+import jadx.core.dex.visitors.blocksmaker.BlockProcessor;
+import jadx.core.dex.visitors.blocksmaker.BlockSplitter;
+import jadx.core.dex.visitors.regions.CheckRegions;
+import jadx.core.dex.visitors.regions.IfRegionVisitor;
+import jadx.core.dex.visitors.regions.LoopRegionVisitor;
+import jadx.core.dex.visitors.regions.ProcessVariables;
+import jadx.core.dex.visitors.regions.RegionMakerVisitor;
+import jadx.core.dex.visitors.regions.ReturnVisitor;
+import jadx.core.dex.visitors.ssa.EliminatePhiNodes;
+import jadx.core.dex.visitors.ssa.SSATransform;
+import jadx.core.dex.visitors.typeinference.FinishTypeInference;
+import jadx.core.dex.visitors.typeinference.TypeInference;
+
+public class Jadx {
+	private static final Logger LOG = LoggerFactory.getLogger(Jadx.class);
+
+	private Jadx() {
+	}
+
+	static {
+		if (Consts.DEBUG) {
+			LOG.info("debug enabled");
+		}
+	}
+
+	public static List<IDexTreeVisitor> getPassesList(JadxArgs args) {
+		List<IDexTreeVisitor> passes = new ArrayList<>();
+		if (args.isFallbackMode()) {
+			passes.add(new FallbackModeVisitor());
+		} else {
+			passes.add(new BlockSplitter());
+			passes.add(new BlockProcessor());
+			passes.add(new BlockExceptionHandler());
+			passes.add(new BlockFinallyExtract());
+			passes.add(new BlockFinish());
+
+			passes.add(new SSATransform());
+			passes.add(new DebugInfoVisitor());
+			passes.add(new TypeInference());
+
+			if (args.isRawCFGOutput()) {
+				passes.add(DotGraphVisitor.dumpRaw());
+			}
+
+			passes.add(new ConstInlineVisitor());
+			passes.add(new FinishTypeInference());
+			passes.add(new EliminatePhiNodes());
+
+			passes.add(new ModVisitor());
+
+			passes.add(new CodeShrinker());
+			passes.add(new ReSugarCode());
+
+			if (args.isCfgOutput()) {
+				passes.add(DotGraphVisitor.dump());
+			}
+
+			passes.add(new RegionMakerVisitor());
+			passes.add(new IfRegionVisitor());
+			passes.add(new ReturnVisitor());
+
+			passes.add(new CodeShrinker());
+			passes.add(new SimplifyVisitor());
+			passes.add(new CheckRegions());
+
+			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());
+		}
+		return passes;
+	}
+
+	public static String getVersion() {
+		try {
+			ClassLoader classLoader = Jadx.class.getClassLoader();
+			if (classLoader != null) {
+				Enumeration<URL> resources = classLoader.getResources("META-INF/MANIFEST.MF");
+				while (resources.hasMoreElements()) {
+					Manifest manifest = new Manifest(resources.nextElement().openStream());
+					String ver = manifest.getMainAttributes().getValue("jadx-version");
+					if (ver != null) {
+						return ver;
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Can't get manifest file", e);
+		}
+		return "dev";
+	}
+}

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

@@ -0,0 +1,53 @@
+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 static jadx.core.dex.nodes.ProcessState.NOT_LOADED;
+import static jadx.core.dex.nodes.ProcessState.PROCESSED;
+import static jadx.core.dex.nodes.ProcessState.STARTED;
+
+public final class ProcessClass {
+
+	private ProcessClass() {
+	}
+
+	public static void process(ClassNode cls, List<IDexTreeVisitor> passes, @Nullable CodeGen codeGen) {
+		if (codeGen == null && cls.getState() == PROCESSED) {
+			return;
+		}
+		synchronized (getSyncObj(cls)) {
+			try {
+				if (cls.getState() == NOT_LOADED) {
+					cls.load();
+					cls.setState(STARTED);
+					for (IDexTreeVisitor visitor : passes) {
+						DepthTraversal.visit(visitor, cls);
+					}
+					cls.setState(PROCESSED);
+				}
+				if (cls.getState() == PROCESSED && codeGen != null) {
+					processDependencies(cls, passes);
+					codeGen.visit(cls);
+				}
+			} catch (Exception e) {
+				ErrorsCounter.classError(cls, e.getClass().getSimpleName(), e);
+			}
+		}
+	}
+
+	public static Object getSyncObj(ClassNode cls) {
+		return cls.getClassInfo();
+	}
+
+	private static void processDependencies(ClassNode cls, List<IDexTreeVisitor> passes) {
+		cls.getDependencies().forEach(depCls -> process(depCls, passes, null));
+	}
+}

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

@@ -0,0 +1,234 @@
+package jadx.core.clsp;
+
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+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;
+
+/**
+ * Classes list for import into classpath graph
+ */
+public class ClsSet {
+	private static final Logger LOG = LoggerFactory.getLogger(ClsSet.class);
+
+	private static final String CLST_EXTENSION = ".jcst";
+	private static final String CLST_FILENAME = "core" + CLST_EXTENSION;
+	private static final String CLST_PKG_PATH = ClsSet.class.getPackage().getName().replace('.', '/');
+
+	private static final String JADX_CLS_SET_HEADER = "jadx-cst";
+	private static final int VERSION = 1;
+
+	private static final String STRING_CHARSET = "US-ASCII";
+
+	private NClass[] classes;
+
+	public void load(RootNode root) {
+		List<ClassNode> list = root.getClasses(true);
+		Map<String, NClass> names = new HashMap<>(list.size());
+		int k = 0;
+		for (ClassNode cls : list) {
+			String clsRawName = cls.getRawName();
+			if (cls.getAccessFlags().isPublic()) {
+				NClass nClass = new NClass(clsRawName, k);
+				if (names.put(clsRawName, nClass) != null) {
+					throw new JadxRuntimeException("Duplicate class: " + clsRawName);
+				}
+				k++;
+			} else {
+				names.put(clsRawName, null);
+			}
+		}
+		classes = new NClass[k];
+		k = 0;
+		for (ClassNode cls : list) {
+			if (cls.getAccessFlags().isPublic()) {
+				NClass nClass = getCls(cls.getRawName(), names);
+				if (nClass == null) {
+					throw new JadxRuntimeException("Missing class: " + cls);
+				}
+				nClass.setParents(makeParentsArray(cls, names));
+				classes[k] = nClass;
+				k++;
+			}
+		}
+	}
+
+	public static NClass[] makeParentsArray(ClassNode cls, Map<String, NClass> names) {
+		List<NClass> parents = new ArrayList<>(1 + cls.getInterfaces().size());
+		ArgType superClass = cls.getSuperClass();
+		if (superClass != null) {
+			NClass c = getCls(superClass.getObject(), names);
+			if (c != null) {
+				parents.add(c);
+			}
+		}
+		for (ArgType iface : cls.getInterfaces()) {
+			NClass c = getCls(iface.getObject(), names);
+			if (c != null) {
+				parents.add(c);
+			}
+		}
+		return parents.toArray(new NClass[parents.size()]);
+	}
+
+	private static NClass getCls(String fullName, Map<String, NClass> names) {
+		NClass id = names.get(fullName);
+		if (id == null && !names.containsKey(fullName)) {
+			LOG.debug("Class not found: {}", fullName);
+		}
+		return id;
+	}
+
+	void save(File output) throws IOException {
+		FileUtils.makeDirsForFile(output);
+		try (BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(output))) {
+			String outputName = output.getName();
+			if (outputName.endsWith(CLST_EXTENSION)) {
+				save(outputStream);
+			} else if (outputName.endsWith(".jar")) {
+				ZipOutputStream out = new ZipOutputStream(outputStream);
+				try {
+					out.putNextEntry(new ZipEntry(CLST_PKG_PATH + "/" + CLST_FILENAME));
+					save(out);
+				} finally {
+					close(out);
+				}
+			} else {
+				throw new JadxRuntimeException("Unknown file format: " + outputName);
+			}
+		}
+	}
+
+	public void save(OutputStream output) throws IOException {
+		try (DataOutputStream out = new DataOutputStream(output)) {
+			out.writeBytes(JADX_CLS_SET_HEADER);
+			out.writeByte(VERSION);
+
+			LOG.info("Classes count: {}", classes.length);
+			out.writeInt(classes.length);
+			for (NClass cls : classes) {
+				writeString(out, cls.getName());
+			}
+			for (NClass cls : classes) {
+				NClass[] parents = cls.getParents();
+				out.writeByte(parents.length);
+				for (NClass parent : parents) {
+					out.writeInt(parent.getId());
+				}
+			}
+		}
+	}
+
+	public void load() throws IOException, DecodeException {
+		try (InputStream input = getClass().getResourceAsStream(CLST_FILENAME)) {
+			if (input == null) {
+				throw new JadxRuntimeException("Can't load classpath file: " + CLST_FILENAME);
+			}
+			load(input);
+		}
+	}
+
+	public void load(File input) throws IOException, DecodeException {
+		String name = input.getName();
+		try (InputStream inputStream = new FileInputStream(input)) {
+			if (name.endsWith(CLST_EXTENSION)) {
+				load(inputStream);
+			} else if (name.endsWith(".jar")) {
+				try (ZipInputStream in = new ZipInputStream(inputStream)) {
+					ZipEntry entry = in.getNextEntry();
+					while (entry != null) {
+						if (entry.getName().endsWith(CLST_EXTENSION) && ZipSecurity.isValidZipEntry(entry)) {
+							load(in);
+						}
+						entry = in.getNextEntry();
+					}
+				}
+			} else {
+				throw new JadxRuntimeException("Unknown file format: " + name);
+			}
+		}
+	}
+
+	public void load(InputStream input) throws IOException, DecodeException {
+		try (DataInputStream in = new DataInputStream(input)) {
+			byte[] header = new byte[JADX_CLS_SET_HEADER.length()];
+			int readHeaderLength = in.read(header);
+			int version = in.readByte();
+			if (readHeaderLength != JADX_CLS_SET_HEADER.length()
+					|| !JADX_CLS_SET_HEADER.equals(new String(header, STRING_CHARSET))
+					|| version != VERSION) {
+				throw new DecodeException("Wrong jadx class set header");
+			}
+			int count = in.readInt();
+			classes = new NClass[count];
+			for (int i = 0; i < count; i++) {
+				String name = readString(in);
+				classes[i] = new NClass(name, i);
+			}
+			for (int i = 0; i < count; i++) {
+				int pCount = in.readByte();
+				NClass[] parents = new NClass[pCount];
+				for (int j = 0; j < pCount; j++) {
+					parents[j] = classes[in.readInt()];
+				}
+				classes[i].setParents(parents);
+			}
+		}
+	}
+
+	private void writeString(DataOutputStream out, String name) throws IOException {
+		byte[] bytes = name.getBytes(STRING_CHARSET);
+		out.writeByte(bytes.length);
+		out.write(bytes);
+	}
+
+	private static String readString(DataInputStream in) throws IOException {
+		int len = in.readByte();
+		byte[] bytes = new byte[len];
+		int count = in.read(bytes);
+		while (count != len) {
+			int res = in.read(bytes, count, len - count);
+			if (res == -1) {
+				throw new IOException("String read error");
+			} else {
+				count += res;
+			}
+		}
+		return new String(bytes, STRING_CHARSET);
+	}
+
+	public int getClassesCount() {
+		return classes.length;
+	}
+
+	public void addToMap(Map<String, NClass> nameMap) {
+		for (NClass cls : classes) {
+			nameMap.put(cls.getName(), cls);
+		}
+	}
+}

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

@@ -0,0 +1,145 @@
+package jadx.core.clsp;
+
+import java.io.IOException;
+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 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
+ */
+public class ClspGraph {
+	private static final Logger LOG = LoggerFactory.getLogger(ClspGraph.class);
+
+	private final Map<String, Set<String>> ancestorCache = Collections.synchronizedMap(new WeakHashMap<String, Set<String>>());
+	private Map<String, NClass> nameMap;
+
+	private final Set<String> missingClasses = new HashSet<>();
+
+	public void load() throws IOException, DecodeException {
+		ClsSet set = new ClsSet();
+		set.load();
+		addClasspath(set);
+	}
+
+	public void addClasspath(ClsSet set) {
+		if (nameMap == null) {
+			nameMap = new HashMap<>(set.getClassesCount());
+			set.addToMap(nameMap);
+		} else {
+			throw new JadxRuntimeException("Classpath already loaded");
+		}
+	}
+
+	public void addApp(List<ClassNode> classes) {
+		if (nameMap == null) {
+			throw new JadxRuntimeException("Classpath must be loaded first");
+		}
+		int size = classes.size();
+		NClass[] nClasses = new NClass[size];
+		int k = 0;
+		for (ClassNode cls : classes) {
+			nClasses[k++] = addClass(cls);
+		}
+		for (int i = 0; i < size; i++) {
+			nClasses[i].setParents(ClsSet.makeParentsArray(classes.get(i), nameMap));
+		}
+	}
+
+	private NClass addClass(ClassNode cls) {
+		String rawName = cls.getRawName();
+		NClass nClass = new NClass(rawName, -1);
+		nameMap.put(rawName, nClass);
+		return nClass;
+	}
+
+	public boolean isImplements(String clsName, String implClsName) {
+		Set<String> anc = getAncestors(clsName);
+		return anc.contains(implClsName);
+	}
+
+	public String getCommonAncestor(String clsName, String implClsName) {
+		if (clsName.equals(implClsName)) {
+			return clsName;
+		}
+		NClass cls = nameMap.get(implClsName);
+		if (cls == null) {
+			missingClasses.add(clsName);
+			return null;
+		}
+		if (isImplements(clsName, implClsName)) {
+			return implClsName;
+		}
+		Set<String> anc = getAncestors(clsName);
+		return searchCommonParent(anc, cls);
+	}
+
+	private String searchCommonParent(Set<String> anc, NClass cls) {
+		for (NClass p : cls.getParents()) {
+			String name = p.getName();
+			if (anc.contains(name)) {
+				return name;
+			}
+			String r = searchCommonParent(anc, p);
+			if (r != null) {
+				return r;
+			}
+		}
+		return null;
+	}
+
+	private Set<String> getAncestors(String clsName) {
+		Set<String> result = ancestorCache.get(clsName);
+		if (result != null) {
+			return result;
+		}
+		NClass cls = nameMap.get(clsName);
+		if (cls == null) {
+			missingClasses.add(clsName);
+			return Collections.emptySet();
+		}
+		result = new HashSet<>();
+		addAncestorsNames(cls, result);
+		if (result.isEmpty()) {
+			result = Collections.emptySet();
+		}
+		ancestorCache.put(clsName, result);
+		return result;
+	}
+
+	private void addAncestorsNames(NClass cls, Set<String> result) {
+		boolean isNew = result.add(cls.getName());
+		if (isNew) {
+			for (NClass p : cls.getParents()) {
+				addAncestorsNames(p, result);
+			}
+		}
+	}
+
+	public void printMissingClasses() {
+		int count = missingClasses.size();
+		if (count == 0) {
+			return;
+		}
+		LOG.warn("Found {} references to unknown classes", count);
+		if (LOG.isDebugEnabled()) {
+			List<String> clsNames = new ArrayList<>(missingClasses);
+			Collections.sort(clsNames);
+			for (String cls : clsNames) {
+				LOG.debug("  {}", cls);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,73 @@
+package jadx.core.clsp;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+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)
+ */
+public class ConvertToClsSet {
+	private static final Logger LOG = LoggerFactory.getLogger(ConvertToClsSet.class);
+
+	public static void usage() {
+		LOG.info("<output .jcst or .jar file> <several input dex or jar files> ");
+	}
+
+	public static void main(String[] args) throws IOException, DecodeException {
+		if (args.length < 2) {
+			usage();
+			System.exit(1);
+		}
+		File output = new File(args[0]);
+
+		List<InputFile> inputFiles = new ArrayList<>(args.length - 1);
+		for (int i = 1; i < args.length; i++) {
+			File f = new File(args[i]);
+			if (f.isDirectory()) {
+				addFilesFromDirectory(f, inputFiles);
+			} else {
+				InputFile.addFilesFrom(f, inputFiles);
+			}
+		}
+		for (InputFile inputFile : inputFiles) {
+			LOG.info("Loaded: {}", inputFile.getFile());
+		}
+
+		RootNode root = new RootNode(new JadxArgs());
+		root.load(inputFiles);
+
+		ClsSet set = new ClsSet();
+		set.load(root);
+		set.save(output);
+		LOG.info("Output: {}", output);
+		LOG.info("done");
+	}
+
+	private static void addFilesFromDirectory(File dir, List<InputFile> inputFiles) {
+		File[] files = dir.listFiles();
+		if (files == null) {
+			return;
+		}
+		for (File file : files) {
+			if (file.isDirectory()) {
+				addFilesFromDirectory(file, inputFiles);
+			} else {
+				try {
+					InputFile.addFilesFrom(file, inputFiles);
+				} catch (Exception e) {
+					LOG.warn("Skip file: {}, load error: {}", file, e.getMessage());
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,58 @@
+package jadx.core.clsp;
+
+/**
+ * Class node in classpath graph
+ */
+public class NClass {
+
+	private final String name;
+	private NClass[] parents;
+	private int id;
+
+	public NClass(String name, int id) {
+		this.name = name;
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public NClass[] getParents() {
+		return parents;
+	}
+
+	public void setParents(NClass[] parents) {
+		this.parents = parents;
+	}
+
+	@Override
+	public int hashCode() {
+		return name.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		NClass nClass = (NClass) o;
+		return name.equals(nClass.name);
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+}

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

@@ -0,0 +1,179 @@
+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;
+import jadx.core.dex.attributes.annotations.Annotation;
+import jadx.core.dex.attributes.annotations.AnnotationsList;
+import jadx.core.dex.attributes.annotations.MethodParameters;
+import jadx.core.dex.info.FieldInfo;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.nodes.ClassNode;
+import jadx.core.dex.nodes.FieldNode;
+import jadx.core.dex.nodes.MethodNode;
+import jadx.core.utils.StringUtils;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+
+public class AnnotationGen {
+
+	private final ClassNode cls;
+	private final ClassGen classGen;
+
+	public AnnotationGen(ClassNode cls, ClassGen classGen) {
+		this.cls = cls;
+		this.classGen = classGen;
+	}
+
+	public void addForClass(CodeWriter code) {
+		add(cls, code);
+	}
+
+	public void addForMethod(CodeWriter code, MethodNode mth) {
+		add(mth, code);
+	}
+
+	public void addForField(CodeWriter code, FieldNode field) {
+		add(field, code);
+	}
+
+	public void addForParameter(CodeWriter code, MethodParameters paramsAnnotations, int n) {
+		List<AnnotationsList> paramList = paramsAnnotations.getParamList();
+		if (n >= paramList.size()) {
+			return;
+		}
+		AnnotationsList aList = paramList.get(n);
+		if (aList == null || aList.isEmpty()) {
+			return;
+		}
+		for (Annotation a : aList.getAll()) {
+			formatAnnotation(code, a);
+			code.add(' ');
+		}
+	}
+
+	private void add(IAttributeNode node, CodeWriter code) {
+		AnnotationsList aList = node.get(AType.ANNOTATION_LIST);
+		if (aList == null || aList.isEmpty()) {
+			return;
+		}
+		for (Annotation a : aList.getAll()) {
+			String aCls = a.getAnnotationClass();
+			if (aCls.startsWith(Consts.DALVIK_ANNOTATION_PKG)) {
+				// skip
+				if (Consts.DEBUG) {
+					code.startLine("// " + a);
+				}
+			} else {
+				code.startLine();
+				formatAnnotation(code, a);
+			}
+		}
+	}
+
+	private void formatAnnotation(CodeWriter code, Annotation a) {
+		code.add('@');
+		classGen.useType(code, a.getType());
+		Map<String, Object> vl = a.getValues();
+		if (!vl.isEmpty()) {
+			code.add('(');
+			if (vl.size() == 1 && vl.containsKey("value")) {
+				encodeValue(code, vl.get("value"));
+			} else {
+				for (Iterator<Entry<String, Object>> it = vl.entrySet().iterator(); it.hasNext(); ) {
+					Entry<String, Object> e = it.next();
+					code.add(e.getKey());
+					code.add(" = ");
+					encodeValue(code, e.getValue());
+					if (it.hasNext()) {
+						code.add(", ");
+					}
+				}
+			}
+			code.add(')');
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	public void addThrows(MethodNode mth, CodeWriter code) {
+		Annotation an = mth.getAnnotation(Consts.DALVIK_THROWS);
+		if (an != null) {
+			Object exs = an.getDefaultValue();
+			code.add(" throws ");
+			for (Iterator<ArgType> it = ((List<ArgType>) exs).iterator(); it.hasNext(); ) {
+				ArgType ex = it.next();
+				classGen.useType(code, ex);
+				if (it.hasNext()) {
+					code.add(", ");
+				}
+			}
+		}
+	}
+
+	public Object getAnnotationDefaultValue(String name) {
+		Annotation an = cls.getAnnotation(Consts.DALVIK_ANNOTATION_DEFAULT);
+		if (an != null) {
+			Annotation defAnnotation = (Annotation) an.getDefaultValue();
+			return defAnnotation.getValues().get(name);
+		}
+		return null;
+	}
+
+	// TODO: refactor this boilerplate code
+	public void encodeValue(CodeWriter code, Object val) {
+		if (val == null) {
+			code.add("null");
+			return;
+		}
+		if (val instanceof String) {
+			code.add(getStringUtils().unescapeString((String) val));
+		} else if (val instanceof Integer) {
+			code.add(TypeGen.formatInteger((Integer) val));
+		} else if (val instanceof Character) {
+			code.add(getStringUtils().unescapeChar((Character) val));
+		} else if (val instanceof Boolean) {
+			code.add(Boolean.TRUE.equals(val) ? "true" : "false");
+		} else if (val instanceof Float) {
+			code.add(TypeGen.formatFloat((Float) val));
+		} else if (val instanceof Double) {
+			code.add(TypeGen.formatDouble((Double) val));
+		} else if (val instanceof Long) {
+			code.add(TypeGen.formatLong((Long) val));
+		} else if (val instanceof Short) {
+			code.add(TypeGen.formatShort((Short) val));
+		} else if (val instanceof Byte) {
+			code.add(TypeGen.formatByte((Byte) val));
+		} else if (val instanceof ArgType) {
+			classGen.useType(code, (ArgType) val);
+			code.add(".class");
+		} else if (val instanceof FieldInfo) {
+			// must be a static field
+			FieldInfo field = (FieldInfo) val;
+			InsnGen.makeStaticFieldAccess(code, field, classGen);
+		} else if (val instanceof Iterable) {
+			code.add('{');
+			Iterator<?> it = ((Iterable) val).iterator();
+			while (it.hasNext()) {
+				Object obj = it.next();
+				encodeValue(code, obj);
+				if (it.hasNext()) {
+					code.add(", ");
+				}
+			}
+			code.add('}');
+		} else if (val instanceof Annotation) {
+			formatAnnotation(code, (Annotation) val);
+		} else {
+			// TODO: also can be method values
+			throw new JadxRuntimeException("Can't decode value: " + val + " (" + val.getClass() + ")");
+		}
+	}
+
+	private StringUtils getStringUtils() {
+		return cls.dex().root().getStringUtils();
+	}
+}

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

@@ -0,0 +1,623 @@
+package jadx.core.codegen;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import com.android.dx.rop.code.AccessFlags;
+
+import jadx.api.JadxArgs;
+import jadx.core.dex.attributes.AFlag;
+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;
+import jadx.core.dex.info.ClassInfo;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.instructions.args.PrimitiveType;
+import jadx.core.dex.instructions.mods.ConstructorInsn;
+import jadx.core.dex.nodes.ClassNode;
+import jadx.core.dex.nodes.DexNode;
+import jadx.core.dex.nodes.FieldNode;
+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;
+
+public class ClassGen {
+
+	private final ClassNode cls;
+	private final ClassGen parentGen;
+	private final AnnotationGen annotationGen;
+	private final boolean fallback;
+	private final boolean useImports;
+	private final boolean showInconsistentCode;
+
+	private final Set<ClassInfo> imports = new HashSet<>();
+	private int clsDeclLine;
+
+	public ClassGen(ClassNode cls, JadxArgs jadxArgs) {
+		this(cls, null, jadxArgs.isUseImports(), jadxArgs.isFallbackMode(), jadxArgs.isShowInconsistentCode());
+	}
+
+	public ClassGen(ClassNode cls, ClassGen parentClsGen) {
+		this(cls, parentClsGen, parentClsGen.useImports, parentClsGen.fallback, parentClsGen.showInconsistentCode);
+	}
+
+	public ClassGen(ClassNode cls, ClassGen parentClsGen, boolean useImports, boolean fallback, boolean showBadCode) {
+		this.cls = cls;
+		this.parentGen = parentClsGen;
+		this.fallback = fallback;
+		this.useImports = useImports;
+		this.showInconsistentCode = showBadCode;
+
+		this.annotationGen = new AnnotationGen(cls, this);
+	}
+
+	public ClassNode getClassNode() {
+		return cls;
+	}
+
+	public CodeWriter makeClass() throws CodegenException {
+		CodeWriter clsBody = new CodeWriter();
+		addClassCode(clsBody);
+
+		CodeWriter clsCode = new CodeWriter();
+		if (!"".equals(cls.getPackage())) {
+			clsCode.add("package ").add(cls.getPackage()).add(';');
+			clsCode.newLine();
+		}
+		int importsCount = imports.size();
+		if (importsCount != 0) {
+			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();
+			imports.clear();
+		}
+		clsCode.add(clsBody);
+		return clsCode;
+	}
+
+	public void addClassCode(CodeWriter code) throws CodegenException {
+		if (cls.contains(AFlag.DONT_GENERATE)) {
+			return;
+		}
+		CodegenUtils.addComments(code, cls);
+		insertDecompilationProblems(code, cls);
+		addClassDeclaration(code);
+		addClassBody(code);
+	}
+
+	public void addClassDeclaration(CodeWriter clsCode) {
+		AccessInfo af = cls.getAccessFlags();
+		if (af.isInterface()) {
+			af = af.remove(AccessFlags.ACC_ABSTRACT)
+					.remove(AccessFlags.ACC_STATIC);
+		} else if (af.isEnum()) {
+			af = af.remove(AccessFlags.ACC_FINAL)
+					.remove(AccessFlags.ACC_ABSTRACT)
+					.remove(AccessFlags.ACC_STATIC);
+		}
+
+		// 'static' and 'private' modifier not allowed for top classes (not inner)
+		if (!cls.getAlias().isInner()) {
+			af = af.remove(AccessFlags.ACC_STATIC).remove(AccessFlags.ACC_PRIVATE);
+		}
+
+		annotationGen.addForClass(clsCode);
+		insertSourceFileInfo(clsCode, cls);
+		insertRenameInfo(clsCode, cls);
+		clsCode.startLine(af.makeString());
+		if (af.isInterface()) {
+			if (af.isAnnotation()) {
+				clsCode.add('@');
+			}
+			clsCode.add("interface ");
+		} else if (af.isEnum()) {
+			clsCode.add("enum ");
+		} else {
+			clsCode.add("class ");
+		}
+		clsCode.attachDefinition(cls);
+		clsCode.add(cls.getShortName());
+
+		addGenericMap(clsCode, cls.getGenericMap());
+		clsCode.add(' ');
+
+		ArgType sup = cls.getSuperClass();
+		if (sup != null
+				&& !sup.equals(ArgType.OBJECT)
+				&& !sup.getObject().equals(ArgType.ENUM.getObject())) {
+			clsCode.add("extends ");
+			useClass(clsCode, sup);
+			clsCode.add(' ');
+		}
+
+		if (!cls.getInterfaces().isEmpty() && !af.isAnnotation()) {
+			if (cls.getAccessFlags().isInterface()) {
+				clsCode.add("extends ");
+			} else {
+				clsCode.add("implements ");
+			}
+			for (Iterator<ArgType> it = cls.getInterfaces().iterator(); it.hasNext(); ) {
+				ArgType interf = it.next();
+				useClass(clsCode, interf);
+				if (it.hasNext()) {
+					clsCode.add(", ");
+				}
+			}
+			if (!cls.getInterfaces().isEmpty()) {
+				clsCode.add(' ');
+			}
+		}
+	}
+
+	public boolean addGenericMap(CodeWriter code, Map<ArgType, List<ArgType>> gmap) {
+		if (gmap == null || gmap.isEmpty()) {
+			return false;
+		}
+		code.add('<');
+		int i = 0;
+		for (Entry<ArgType, List<ArgType>> e : gmap.entrySet()) {
+			ArgType type = e.getKey();
+			List<ArgType> list = e.getValue();
+			if (i != 0) {
+				code.add(", ");
+			}
+			if (type.isGenericType()) {
+				code.add(type.getObject());
+			} else {
+				useClass(code, type);
+			}
+			if (list != null && !list.isEmpty()) {
+				code.add(" extends ");
+				for (Iterator<ArgType> it = list.iterator(); it.hasNext(); ) {
+					ArgType g = it.next();
+					if (g.isGenericType()) {
+						code.add(g.getObject());
+					} else {
+						useClass(code, g);
+					}
+					if (it.hasNext()) {
+						code.add(" & ");
+					}
+				}
+			}
+			i++;
+		}
+		code.add('>');
+		return true;
+	}
+
+	public void addClassBody(CodeWriter clsCode) throws CodegenException {
+		clsCode.add('{');
+		clsDeclLine = clsCode.getLine();
+		clsCode.incIndent();
+		addFields(clsCode);
+		addInnerClasses(clsCode, cls);
+		addMethods(clsCode);
+		clsCode.decIndent();
+		clsCode.startLine('}');
+	}
+
+	private void addInnerClasses(CodeWriter code, ClassNode cls) throws CodegenException {
+		for (ClassNode innerCls : cls.getInnerClasses()) {
+			if (innerCls.contains(AFlag.DONT_GENERATE)
+					|| innerCls.contains(AFlag.ANONYMOUS_CLASS)) {
+				continue;
+			}
+			ClassGen inClGen = new ClassGen(innerCls, getParentGen());
+			code.newLine();
+			inClGen.addClassCode(code);
+			imports.addAll(inClGen.getImports());
+		}
+	}
+
+	private boolean isInnerClassesPresents() {
+		for (ClassNode innerCls : cls.getInnerClasses()) {
+			if (!innerCls.contains(AFlag.ANONYMOUS_CLASS)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private void addMethods(CodeWriter code) {
+		List<MethodNode> methods = sortMethodsByLine(cls.getMethods());
+		for (MethodNode mth : methods) {
+			if (mth.contains(AFlag.DONT_GENERATE)) {
+				continue;
+			}
+			if (code.getLine() != clsDeclLine) {
+				code.newLine();
+			}
+			int savedIndent = code.getIndent();
+			try {
+				addMethod(code, mth);
+			} catch (Exception e) {
+				code.newLine().add("/*");
+				code.newLine().add(ErrorsCounter.methodError(mth, "Method generation error", e));
+				code.newLine().add(Utils.getStackTrace(e));
+				code.newLine().add("*/");
+				code.setIndent(savedIndent);
+			}
+		}
+	}
+
+	private static List<MethodNode> sortMethodsByLine(List<MethodNode> methods) {
+		List<MethodNode> out = new ArrayList<>(methods);
+		out.sort(Comparator.comparingInt(LineAttrNode::getSourceLine));
+		return out;
+	}
+
+	private boolean isMethodsPresents() {
+		for (MethodNode mth : cls.getMethods()) {
+			if (!mth.contains(AFlag.DONT_GENERATE)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private void addMethod(CodeWriter code, MethodNode mth) throws CodegenException {
+		if (mth.getAccessFlags().isAbstract() || mth.getAccessFlags().isNative()) {
+			MethodGen mthGen = new MethodGen(this, mth);
+			mthGen.addDefinition(code);
+			if (cls.getAccessFlags().isAnnotation()) {
+				Object def = annotationGen.getAnnotationDefaultValue(mth.getName());
+				if (def != null) {
+					code.add(" default ");
+					annotationGen.encodeValue(code, def);
+				}
+			}
+			code.add(';');
+		} else {
+			CodegenUtils.addComments(code, mth);
+			insertDecompilationProblems(code, mth);
+			boolean badCode = mth.contains(AFlag.INCONSISTENT_CODE);
+			if (badCode && showInconsistentCode) {
+				code.startLine("/* Code decompiled incorrectly, please refer to instructions dump. */");
+				mth.remove(AFlag.INCONSISTENT_CODE);
+				badCode = false;
+			}
+			MethodGen mthGen;
+			if (badCode || mth.contains(AType.JADX_ERROR) || fallback) {
+				mthGen = MethodGen.getFallbackMethodGen(mth);
+			} else {
+				mthGen = new MethodGen(this, mth);
+			}
+			if (mthGen.addDefinition(code)) {
+				code.add(' ');
+			}
+			code.add('{');
+			code.incIndent();
+			insertSourceFileInfo(code, mth);
+			if (fallback) {
+				mthGen.addFallbackMethodCode(code);
+			} else {
+				mthGen.addInstructions(code);
+			}
+			code.decIndent();
+			code.startLine('}');
+		}
+	}
+
+	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()) {
+				code.startLine("/* renamed from: ").add(f.getName()).add(" */");
+			}
+			code.startLine(f.getAccessFlags().makeString());
+			useType(code, f.getType());
+			code.add(' ');
+			code.attachDefinition(f);
+			code.add(f.getAlias());
+			FieldInitAttr fv = f.get(AType.FIELD_INIT);
+			if (fv != null) {
+				code.add(" = ");
+				if (fv.getValue() == null) {
+					code.add(TypeGen.literalToString(0, f.getType(), cls));
+				} else {
+					if (fv.getValueType() == InitType.CONST) {
+						annotationGen.encodeValue(code, fv.getValue());
+					} else if (fv.getValueType() == InitType.INSN) {
+						InsnGen insnGen = makeInsnGen(fv.getInsnMth());
+						addInsnBody(insnGen, code, fv.getInsn());
+					}
+				}
+			}
+			code.add(';');
+		}
+	}
+
+	private boolean isFieldsPresents() {
+		for (FieldNode field : cls.getFields()) {
+			if (!field.contains(AFlag.DONT_GENERATE)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private void addEnumFields(CodeWriter code) throws CodegenException {
+		EnumClassAttr enumFields = cls.get(AType.ENUM_CLASS);
+		if (enumFields == null) {
+			return;
+		}
+		InsnGen igen = null;
+		for (Iterator<EnumField> it = enumFields.getFields().iterator(); it.hasNext(); ) {
+			EnumField f = it.next();
+			code.startLine(f.getField().getAlias());
+			ConstructorInsn constrInsn = f.getConstrInsn();
+			if (constrInsn.getArgsCount() > f.getStartArg()) {
+				if (igen == null) {
+					igen = makeInsnGen(enumFields.getStaticMethod());
+				}
+				MethodNode callMth = cls.dex().resolveMethod(constrInsn.getCallMth());
+				igen.generateMethodArguments(code, constrInsn, f.getStartArg(), callMth);
+			}
+			if (f.getCls() != null) {
+				code.add(' ');
+				new ClassGen(f.getCls(), this).addClassBody(code);
+			}
+			if (it.hasNext()) {
+				code.add(',');
+			}
+		}
+		if (isMethodsPresents() || isFieldsPresents() || isInnerClassesPresents()) {
+			if (enumFields.getFields().isEmpty()) {
+				code.startLine();
+			}
+			code.add(';');
+			if (isFieldsPresents()) {
+				code.startLine();
+			}
+		}
+	}
+
+	private InsnGen makeInsnGen(MethodNode mth) {
+		MethodGen mthGen = new MethodGen(this, mth);
+		return new InsnGen(mthGen, false);
+	}
+
+	private void addInsnBody(InsnGen insnGen, CodeWriter code, InsnNode insn) {
+		try {
+			insnGen.makeInsn(insn, code, InsnGen.Flags.BODY_ONLY_NOWRAP);
+		} catch (Exception e) {
+			ErrorsCounter.classError(cls, "Failed to generate init code", e);
+		}
+	}
+
+	public void useType(CodeWriter code, ArgType type) {
+		PrimitiveType stype = type.getPrimitiveType();
+		if (stype == null) {
+			code.add(type.toString());
+		} else if (stype == PrimitiveType.OBJECT) {
+			if (type.isGenericType()) {
+				code.add(type.getObject());
+			} else {
+				useClass(code, type);
+			}
+		} else if (stype == PrimitiveType.ARRAY) {
+			useType(code, type.getArrayElement());
+			code.add("[]");
+		} else {
+			code.add(stype.getLongName());
+		}
+	}
+
+	public void useClass(CodeWriter code, ArgType type) {
+		useClass(code, ClassInfo.extCls(cls.root(), type));
+		ArgType[] generics = type.getGenericTypes();
+		if (generics != null) {
+			code.add('<');
+			int len = generics.length;
+			for (int i = 0; i < len; i++) {
+				if (i != 0) {
+					code.add(", ");
+				}
+				ArgType gt = generics[i];
+				ArgType wt = gt.getWildcardType();
+				if (wt != null) {
+					code.add('?');
+					int bounds = gt.getWildcardBounds();
+					if (bounds != 0) {
+						code.add(bounds == -1 ? " super " : " extends ");
+						useType(code, wt);
+					}
+				} else {
+					useType(code, gt);
+				}
+			}
+			code.add('>');
+		}
+	}
+
+	public void useClass(CodeWriter code, ClassInfo classInfo) {
+		ClassNode classNode = cls.dex().resolveClass(classInfo);
+		if (classNode != null) {
+			code.attachAnnotation(classNode);
+		}
+		String baseClass = useClassInternal(cls.getAlias(), classInfo.getAlias());
+		code.add(baseClass);
+	}
+
+	private String useClassInternal(ClassInfo useCls, ClassInfo extClsInfo) {
+		String fullName = extClsInfo.getFullName();
+		if (fallback || !useImports) {
+			return fullName;
+		}
+		String shortName = extClsInfo.getShortName();
+		if (extClsInfo.getPackage().equals("java.lang") && extClsInfo.getParentClass() == null) {
+			return shortName;
+		}
+		if (isClassInnerFor(useCls, extClsInfo)) {
+			return shortName;
+		}
+		if (isBothClassesInOneTopClass(useCls, extClsInfo)) {
+			return shortName;
+		}
+		// don't add import if this class from same package
+		if (extClsInfo.getPackage().equals(useCls.getPackage()) && !extClsInfo.isInner()) {
+			return shortName;
+		}
+		// don't add import if class not public (must be accessed using inheritance)
+		ClassNode classNode = cls.dex().resolveClass(extClsInfo);
+		if (classNode != null && !classNode.getAccessFlags().isPublic()) {
+			return shortName;
+		}
+		if (searchCollision(cls.dex(), useCls, extClsInfo)) {
+			return fullName;
+		}
+		// ignore classes from default package
+		if (extClsInfo.isDefaultPackage()) {
+			return shortName;
+		}
+		if (extClsInfo.getPackage().equals(useCls.getPackage())) {
+			fullName = extClsInfo.getNameWithoutPackage();
+		}
+		for (ClassInfo importCls : getImports()) {
+			if (!importCls.equals(extClsInfo)
+					&& importCls.getShortName().equals(shortName)) {
+				if (extClsInfo.isInner()) {
+					String parent = useClassInternal(useCls, extClsInfo.getParentClass().getAlias());
+					return parent + "." + shortName;
+				} else {
+					return fullName;
+				}
+			}
+		}
+		addImport(extClsInfo);
+		return shortName;
+	}
+
+	private void addImport(ClassInfo classInfo) {
+		if (parentGen != null) {
+			parentGen.addImport(classInfo.getAlias());
+		} else {
+			imports.add(classInfo);
+		}
+	}
+
+	private Set<ClassInfo> getImports() {
+		if (parentGen != null) {
+			return parentGen.getImports();
+		} else {
+			return imports;
+		}
+	}
+
+	private static boolean isBothClassesInOneTopClass(ClassInfo useCls, ClassInfo extClsInfo) {
+		ClassInfo a = useCls.getTopParentClass();
+		ClassInfo b = extClsInfo.getTopParentClass();
+		if (a != null) {
+			return a.equals(b);
+		}
+		// useCls - is a top class
+		return useCls.equals(b);
+	}
+
+	private static boolean isClassInnerFor(ClassInfo inner, ClassInfo parent) {
+		if (inner.isInner()) {
+			ClassInfo p = inner.getParentClass();
+			return p.equals(parent) || isClassInnerFor(p, parent);
+		}
+		return false;
+	}
+
+	private static boolean searchCollision(DexNode dex, ClassInfo useCls, ClassInfo searchCls) {
+		if (useCls == null) {
+			return false;
+		}
+		String shortName = searchCls.getShortName();
+		if (useCls.getShortName().equals(shortName)) {
+			return true;
+		}
+		ClassNode classNode = dex.resolveClass(useCls);
+		if (classNode != null) {
+			for (ClassNode inner : classNode.getInnerClasses()) {
+				if (inner.getShortName().equals(shortName)
+						&& !inner.getAlias().equals(searchCls)) {
+					return true;
+				}
+			}
+		}
+		return searchCollision(dex, useCls.getParentClass(), searchCls);
+	}
+
+	private void insertSourceFileInfo(CodeWriter code, AttrNode node) {
+		SourceFileAttr sourceFileAttr = node.get(AType.SOURCE_FILE);
+		if (sourceFileAttr != null) {
+			code.startLine("/* compiled from: ").add(sourceFileAttr.getFileName()).add(" */");
+		}
+	}
+
+	private void insertRenameInfo(CodeWriter code, ClassNode cls) {
+		ClassInfo classInfo = cls.getClassInfo();
+		if (classInfo.isRenamed()) {
+			code.startLine("/* renamed from: ").add(classInfo.getType().getObject()).add(" */");
+		}
+	}
+
+	public ClassGen getParentGen() {
+		return parentGen == null ? this : parentGen;
+	}
+
+	public AnnotationGen getAnnotationGen() {
+		return annotationGen;
+	}
+
+	public boolean isFallbackMode() {
+		return fallback;
+	}
+}

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

@@ -0,0 +1,15 @@
+package jadx.core.codegen;
+
+import jadx.core.dex.nodes.ClassNode;
+import jadx.core.utils.exceptions.CodegenException;
+
+public class CodeGen {
+
+	public boolean visit(ClassNode cls) throws CodegenException {
+		ClassGen clsGen = new ClassGen(cls, cls.root().getArgs());
+		CodeWriter clsCode = clsGen.makeClass();
+		clsCode.finish();
+		cls.setCode(clsCode);
+		return false;
+	}
+}

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

@@ -0,0 +1,316 @@
+package jadx.core.codegen;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+
+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);
+
+	public static final String NL = System.getProperty("line.separator");
+	public static final String INDENT_STR = "    ";
+
+	private static final boolean ADD_LINE_NUMBERS = false;
+
+	private static final String[] INDENT_CACHE = {
+			"",
+			INDENT_STR,
+			INDENT_STR + INDENT_STR,
+			INDENT_STR + INDENT_STR + INDENT_STR,
+			INDENT_STR + INDENT_STR + INDENT_STR + INDENT_STR,
+			INDENT_STR + INDENT_STR + INDENT_STR + INDENT_STR + INDENT_STR,
+	};
+
+	private StringBuilder buf = new StringBuilder();
+	@Nullable
+	private String code;
+	private String indentStr;
+	private int indent;
+
+	private int line = 1;
+	private int offset = 0;
+	private Map<CodePosition, Object> annotations = Collections.emptyMap();
+	private Map<Integer, Integer> lineMap = Collections.emptyMap();
+
+	public CodeWriter() {
+		this.indent = 0;
+		this.indentStr = "";
+		if (ADD_LINE_NUMBERS) {
+			incIndent(2);
+		}
+	}
+
+	public CodeWriter startLine() {
+		addLine();
+		addLineIndent();
+		return this;
+	}
+
+	public CodeWriter startLine(char c) {
+		addLine();
+		addLineIndent();
+		add(c);
+		return this;
+	}
+
+	public CodeWriter startLine(String str) {
+		addLine();
+		addLineIndent();
+		add(str);
+		return this;
+	}
+
+	public CodeWriter startLineWithNum(int sourceLine) {
+		if (sourceLine == 0) {
+			startLine();
+			return this;
+		}
+		if (ADD_LINE_NUMBERS) {
+			newLine();
+			attachSourceLine(sourceLine);
+			String ln = "/* " + sourceLine + " */ ";
+			add(ln);
+			if (indentStr.length() > ln.length()) {
+				add(indentStr.substring(ln.length()));
+			}
+		} else {
+			startLine();
+			attachSourceLine(sourceLine);
+		}
+		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();
+		return this;
+	}
+
+	public CodeWriter add(char c) {
+		buf.append(c);
+		offset++;
+		return this;
+	}
+
+	CodeWriter add(CodeWriter code) {
+		line--;
+		for (Map.Entry<CodePosition, Object> entry : code.annotations.entrySet()) {
+			CodePosition pos = entry.getKey();
+			attachAnnotation(entry.getValue(), new CodePosition(line + pos.getLine(), pos.getOffset()));
+		}
+		for (Map.Entry<Integer, Integer> entry : code.lineMap.entrySet()) {
+			attachSourceLine(line + entry.getKey(), entry.getValue());
+		}
+		line += code.line;
+		offset = code.offset;
+		buf.append(code.buf);
+		return this;
+	}
+
+	public CodeWriter newLine() {
+		addLine();
+		return this;
+	}
+
+	public CodeWriter addIndent() {
+		add(INDENT_STR);
+		return this;
+	}
+
+	private void addLine() {
+		buf.append(NL);
+		line++;
+		offset = 0;
+	}
+
+	private CodeWriter addLineIndent() {
+		buf.append(indentStr);
+		offset += indentStr.length();
+		return this;
+	}
+
+	private void updateIndent() {
+		int curIndent = indent;
+		if (curIndent < INDENT_CACHE.length) {
+			this.indentStr = INDENT_CACHE[curIndent];
+		} else {
+			StringBuilder s = new StringBuilder(curIndent * INDENT_STR.length());
+			for (int i = 0; i < curIndent; i++) {
+				s.append(INDENT_STR);
+			}
+			this.indentStr = s.toString();
+		}
+	}
+
+	public void incIndent() {
+		incIndent(1);
+	}
+
+	public void decIndent() {
+		decIndent(1);
+	}
+
+	public void incIndent(int c) {
+		this.indent += c;
+		updateIndent();
+	}
+
+	public void decIndent(int c) {
+		this.indent -= c;
+		if (this.indent < 0) {
+			LOG.warn("Indent < 0");
+			this.indent = 0;
+		}
+		updateIndent();
+	}
+
+	public int getIndent() {
+		return indent;
+	}
+
+	public void setIndent(int indent) {
+		this.indent = indent;
+		updateIndent();
+	}
+
+	public int getLine() {
+		return line;
+	}
+
+	private static class DefinitionWrapper {
+		private final LineAttrNode node;
+
+		private DefinitionWrapper(LineAttrNode node) {
+			this.node = node;
+		}
+
+		public LineAttrNode getNode() {
+			return node;
+		}
+	}
+
+	public void attachDefinition(LineAttrNode obj) {
+		attachAnnotation(obj);
+		attachAnnotation(new DefinitionWrapper(obj), new CodePosition(line, offset));
+	}
+
+	public void attachAnnotation(Object obj) {
+		attachAnnotation(obj, new CodePosition(line, offset + 1));
+	}
+
+	private Object attachAnnotation(Object obj, CodePosition pos) {
+		if (annotations.isEmpty()) {
+			annotations = new HashMap<>();
+		}
+		return annotations.put(pos, obj);
+	}
+
+	public Map<CodePosition, Object> getAnnotations() {
+		return annotations;
+	}
+
+	public void attachSourceLine(int sourceLine) {
+		if (sourceLine == 0) {
+			return;
+		}
+		attachSourceLine(line, sourceLine);
+	}
+
+	private void attachSourceLine(int decompiledLine, int sourceLine) {
+		if (lineMap.isEmpty()) {
+			lineMap = new TreeMap<>();
+		}
+		lineMap.put(decompiledLine, sourceLine);
+	}
+
+	public Map<Integer, Integer> getLineMapping() {
+		return lineMap;
+	}
+
+	public void finish() {
+		removeFirstEmptyLine();
+		buf.trimToSize();
+		code = buf.toString();
+		buf = null;
+
+		Iterator<Map.Entry<CodePosition, Object>> it = annotations.entrySet().iterator();
+		while (it.hasNext()) {
+			Map.Entry<CodePosition, Object> entry = it.next();
+			Object v = entry.getValue();
+			if (v instanceof DefinitionWrapper) {
+				LineAttrNode l = ((DefinitionWrapper) v).getNode();
+				l.setDecompiledLine(entry.getKey().getLine());
+				it.remove();
+			}
+		}
+	}
+
+	private void removeFirstEmptyLine() {
+		int len = NL.length();
+		if (buf.substring(0, len).equals(NL)) {
+			buf.delete(0, len);
+		}
+	}
+
+	public int bufLength() {
+		return buf.length();
+	}
+
+	public String getCodeStr() {
+		return code;
+	}
+
+	@Override
+	public String toString() {
+		return buf == null ? code : buf.toString();
+	}
+
+	public void save(File dir, String subDir, String 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)) {
+			return;
+		}
+		save(new File(dir, fileName));
+	}
+
+	public void save(File file) {
+		if (code == null) {
+			finish();
+		}
+		File outFile = FileUtils.prepareFile(file);
+		try (PrintWriter out = new PrintWriter(outFile, "UTF-8")) {
+			out.println(code);
+		} catch (Exception e) {
+			LOG.error("Save file error", e);
+		}
+	}
+}

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

@@ -0,0 +1,197 @@
+package jadx.core.codegen;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Queue;
+
+import jadx.core.dex.instructions.ArithNode;
+import jadx.core.dex.instructions.IfOp;
+import jadx.core.dex.instructions.InsnType;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.instructions.args.InsnArg;
+import jadx.core.dex.instructions.args.InsnWrapArg;
+import jadx.core.dex.instructions.args.LiteralArg;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.dex.regions.conditions.Compare;
+import jadx.core.dex.regions.conditions.IfCondition;
+import jadx.core.dex.regions.conditions.IfCondition.Mode;
+import jadx.core.utils.ErrorsCounter;
+import jadx.core.utils.exceptions.CodegenException;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+
+public class ConditionGen extends InsnGen {
+
+	private static class CondStack {
+		private final Queue<IfCondition> stack = new LinkedList<>();
+
+		public Queue<IfCondition> getStack() {
+			return stack;
+		}
+
+		public void push(IfCondition cond) {
+			stack.add(cond);
+		}
+
+		public IfCondition pop() {
+			return stack.poll();
+		}
+	}
+
+	public ConditionGen(InsnGen insnGen) {
+		super(insnGen.mgen, insnGen.fallback);
+	}
+
+	void add(CodeWriter code, IfCondition condition) throws CodegenException {
+		add(code, new CondStack(), condition);
+	}
+
+	void wrap(CodeWriter code, IfCondition condition) throws CodegenException {
+		wrap(code, new CondStack(), condition);
+	}
+
+	private void add(CodeWriter code, CondStack stack, IfCondition condition) throws CodegenException {
+		stack.push(condition);
+		switch (condition.getMode()) {
+			case COMPARE:
+				addCompare(code, stack, condition.getCompare());
+				break;
+
+			case TERNARY:
+				addTernary(code, stack, condition);
+				break;
+
+			case NOT:
+				addNot(code, stack, condition);
+				break;
+
+			case AND:
+			case OR:
+				addAndOr(code, stack, condition);
+				break;
+
+			default:
+				throw new JadxRuntimeException("Unknown condition mode: " + condition.getMode());
+		}
+		stack.pop();
+	}
+
+	private void wrap(CodeWriter code, CondStack stack, IfCondition cond) throws CodegenException {
+		boolean wrap = isWrapNeeded(cond);
+		if (wrap) {
+			code.add('(');
+		}
+		add(code, stack, cond);
+		if (wrap) {
+			code.add(')');
+		}
+	}
+
+	private void wrap(CodeWriter code, InsnArg firstArg) throws CodegenException {
+		boolean wrap = isArgWrapNeeded(firstArg);
+		if (wrap) {
+			code.add('(');
+		}
+		addArg(code, firstArg, false);
+		if (wrap) {
+			code.add(')');
+		}
+	}
+
+	private void addCompare(CodeWriter code, CondStack stack, Compare compare) throws CodegenException {
+		IfOp op = compare.getOp();
+		InsnArg firstArg = compare.getA();
+		InsnArg secondArg = compare.getB();
+		if (firstArg.getType().equals(ArgType.BOOLEAN)
+				&& secondArg.isLiteral()
+				&& secondArg.getType().equals(ArgType.BOOLEAN)) {
+			LiteralArg lit = (LiteralArg) secondArg;
+			if (lit.getLiteral() == 0) {
+				op = op.invert();
+			}
+			if (op == IfOp.EQ) {
+				// == true
+				if (stack.getStack().size() == 1) {
+					addArg(code, firstArg, false);
+				} else {
+					wrap(code, firstArg);
+				}
+				return;
+			} else if (op == IfOp.NE) {
+				// != true
+				code.add('!');
+				wrap(code, firstArg);
+				return;
+			}
+			ErrorsCounter.methodWarn(mth, "Unsupported boolean condition " + op.getSymbol());
+		}
+
+		addArg(code, firstArg, isArgWrapNeeded(firstArg));
+		code.add(' ').add(op.getSymbol()).add(' ');
+		addArg(code, secondArg, isArgWrapNeeded(secondArg));
+	}
+
+	private void addTernary(CodeWriter code, CondStack stack, IfCondition condition) throws CodegenException {
+		add(code, stack, condition.first());
+		code.add(" ? ");
+		add(code, stack, condition.second());
+		code.add(" : ");
+		add(code, stack, condition.third());
+	}
+
+	private void addNot(CodeWriter code, CondStack stack, IfCondition condition) throws CodegenException {
+		code.add('!');
+		wrap(code, stack, condition.getArgs().get(0));
+	}
+
+	private void addAndOr(CodeWriter code, CondStack stack, IfCondition condition) throws CodegenException {
+		String mode = condition.getMode() == Mode.AND ? " && " : " || ";
+		Iterator<IfCondition> it = condition.getArgs().iterator();
+		while (it.hasNext()) {
+			wrap(code, stack, it.next());
+			if (it.hasNext()) {
+				code.add(mode);
+			}
+		}
+	}
+
+	private boolean isWrapNeeded(IfCondition condition) {
+		if (condition.isCompare()) {
+			return false;
+		}
+		return condition.getMode() != Mode.NOT;
+	}
+
+	private static boolean isArgWrapNeeded(InsnArg arg) {
+		if (!arg.isInsnWrap()) {
+			return false;
+		}
+		InsnNode insn = ((InsnWrapArg) arg).getWrapInsn();
+		InsnType insnType = insn.getType();
+		if (insnType == InsnType.ARITH) {
+			switch (((ArithNode) insn).getOp()) {
+				case ADD:
+				case SUB:
+				case MUL:
+				case DIV:
+				case REM:
+					return false;
+
+				default:
+					return true;
+			}
+		} else {
+			switch (insnType) {
+				case INVOKE:
+				case SGET:
+				case IGET:
+				case AGET:
+				case CONST:
+				case ARRAY_LENGTH:
+					return false;
+
+				default:
+					return true;
+			}
+		}
+	}
+}

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

@@ -0,0 +1,844 @@
+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;
+import jadx.core.dex.attributes.nodes.LoopLabelAttr;
+import jadx.core.dex.attributes.nodes.MethodInlineAttr;
+import jadx.core.dex.info.ClassInfo;
+import jadx.core.dex.info.FieldInfo;
+import jadx.core.dex.info.MethodInfo;
+import jadx.core.dex.instructions.ArithNode;
+import jadx.core.dex.instructions.ArithOp;
+import jadx.core.dex.instructions.ConstClassNode;
+import jadx.core.dex.instructions.ConstStringNode;
+import jadx.core.dex.instructions.FillArrayNode;
+import jadx.core.dex.instructions.FilledNewArrayNode;
+import jadx.core.dex.instructions.GotoNode;
+import jadx.core.dex.instructions.IfNode;
+import jadx.core.dex.instructions.IndexInsnNode;
+import jadx.core.dex.instructions.InsnType;
+import jadx.core.dex.instructions.InvokeNode;
+import jadx.core.dex.instructions.InvokeType;
+import jadx.core.dex.instructions.NewArrayNode;
+import jadx.core.dex.instructions.SwitchNode;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.instructions.args.FieldArg;
+import jadx.core.dex.instructions.args.InsnArg;
+import jadx.core.dex.instructions.args.InsnWrapArg;
+import jadx.core.dex.instructions.args.LiteralArg;
+import jadx.core.dex.instructions.args.Named;
+import jadx.core.dex.instructions.args.RegisterArg;
+import jadx.core.dex.instructions.mods.ConstructorInsn;
+import jadx.core.dex.instructions.mods.TernaryInsn;
+import jadx.core.dex.nodes.ClassNode;
+import jadx.core.dex.nodes.FieldNode;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.dex.nodes.MethodNode;
+import jadx.core.dex.nodes.RootNode;
+import jadx.core.utils.ErrorsCounter;
+import jadx.core.utils.RegionUtils;
+import jadx.core.utils.exceptions.CodegenException;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+
+import static jadx.core.utils.android.AndroidResourcesUtils.handleAppResField;
+
+public class InsnGen {
+	private static final Logger LOG = LoggerFactory.getLogger(InsnGen.class);
+
+	protected final MethodGen mgen;
+	protected final MethodNode mth;
+	protected final RootNode root;
+	protected final boolean fallback;
+
+	protected enum Flags {
+		BODY_ONLY,
+		BODY_ONLY_NOWRAP,
+		INLINE
+	}
+
+	public InsnGen(MethodGen mgen, boolean fallback) {
+		this.mgen = mgen;
+		this.mth = mgen.getMethodNode();
+		this.root = mth.dex().root();
+		this.fallback = fallback;
+	}
+
+	private boolean isFallback() {
+		return fallback;
+	}
+
+	public void addArgDot(CodeWriter code, InsnArg arg) throws CodegenException {
+		int len = code.bufLength();
+		addArg(code, arg, true);
+		if (len != code.bufLength()) {
+			code.add('.');
+		}
+	}
+
+	public void addArg(CodeWriter code, InsnArg arg) throws CodegenException {
+		addArg(code, arg, true);
+	}
+
+	public void addArg(CodeWriter code, InsnArg arg, boolean wrap) throws CodegenException {
+		if (arg.isRegister()) {
+			code.add(mgen.getNameGen().useArg((RegisterArg) arg));
+		} else if (arg.isLiteral()) {
+			code.add(lit((LiteralArg) arg));
+		} else if (arg.isInsnWrap()) {
+			Flags flag = wrap ? Flags.BODY_ONLY : Flags.BODY_ONLY_NOWRAP;
+			makeInsn(((InsnWrapArg) arg).getWrapInsn(), code, flag);
+		} else if (arg.isNamed()) {
+			code.add(((Named) arg).getName());
+		} else if (arg.isField()) {
+			FieldArg f = (FieldArg) arg;
+			if (f.isStatic()) {
+				staticField(code, f.getField());
+			} else {
+				instanceField(code, f.getField(), f.getInstanceArg());
+			}
+		} else {
+			throw new CodegenException("Unknown arg type " + arg);
+		}
+	}
+
+	public void assignVar(CodeWriter code, InsnNode insn) throws CodegenException {
+		RegisterArg arg = insn.getResult();
+		if (insn.contains(AFlag.DECLARE_VAR)) {
+			declareVar(code, arg);
+		} else {
+			addArg(code, arg, false);
+		}
+	}
+
+	public void declareVar(CodeWriter code, RegisterArg arg) {
+		if (arg.getSVar().contains(AFlag.FINAL)) {
+			code.add("final ");
+		}
+		useType(code, arg.getType());
+		code.add(' ');
+		code.add(mgen.getNameGen().assignArg(arg));
+	}
+
+	private String lit(LiteralArg arg) {
+		return TypeGen.literalToString(arg.getLiteral(), arg.getType(), mth);
+	}
+
+	private void instanceField(CodeWriter code, FieldInfo field, InsnArg arg) throws CodegenException {
+		ClassNode pCls = mth.getParentClass();
+		FieldNode fieldNode = pCls.dex().root().deepResolveField(field);
+		if (fieldNode != null) {
+			FieldReplaceAttr replace = fieldNode.get(AType.FIELD_REPLACE);
+			if (replace != null) {
+				switch (replace.getReplaceType()) {
+					case CLASS_INSTANCE:
+						useClass(code, replace.getClsRef());
+						code.add(".this");
+						break;
+					case VAR:
+						addArg(code, replace.getVarRef());
+						break;
+				}
+				return;
+			}
+		}
+		addArgDot(code, arg);
+		if (fieldNode != null) {
+			code.attachAnnotation(fieldNode);
+		}
+		if (fieldNode == null) {
+			code.add(field.getAlias());
+		} else {
+			code.add(fieldNode.getAlias());
+		}
+	}
+
+	public static void makeStaticFieldAccess(CodeWriter code, FieldInfo field, ClassGen clsGen) {
+		ClassInfo declClass = field.getDeclClass();
+		boolean fieldFromThisClass = clsGen.getClassNode().getClassInfo().equals(declClass);
+		if (!fieldFromThisClass) {
+			// Android specific resources class handler
+			if (!handleAppResField(code, clsGen, declClass)) {
+				clsGen.useClass(code, declClass);
+			}
+			code.add('.');
+		}
+		FieldNode fieldNode = clsGen.getClassNode().dex().root().deepResolveField(field);
+		if (fieldNode != null) {
+			code.attachAnnotation(fieldNode);
+		}
+		if (fieldNode == null) {
+			code.add(field.getAlias());
+		} else {
+			code.add(fieldNode.getAlias());
+		}
+	}
+
+	protected void staticField(CodeWriter code, FieldInfo field) {
+		makeStaticFieldAccess(code, field, mgen.getClassGen());
+	}
+
+	public void useClass(CodeWriter code, ArgType type) {
+		mgen.getClassGen().useClass(code, type);
+	}
+
+	public void useClass(CodeWriter code, ClassInfo cls) {
+		mgen.getClassGen().useClass(code, cls);
+	}
+
+	protected void useType(CodeWriter code, ArgType type) {
+		mgen.getClassGen().useType(code, type);
+	}
+
+	public boolean makeInsn(InsnNode insn, CodeWriter code) throws CodegenException {
+		return makeInsn(insn, code, null);
+	}
+
+	protected boolean makeInsn(InsnNode insn, CodeWriter code, Flags flag) throws CodegenException {
+		try {
+			Set<Flags> state = EnumSet.noneOf(Flags.class);
+			if (flag == Flags.BODY_ONLY || flag == Flags.BODY_ONLY_NOWRAP) {
+				state.add(flag);
+				makeInsnBody(code, insn, state);
+			} else {
+				if (flag != Flags.INLINE) {
+					code.startLineWithNum(insn.getSourceLine());
+				}
+				if (insn.getResult() != null && !insn.contains(AFlag.ARITH_ONEARG)) {
+					assignVar(code, insn);
+					code.add(" = ");
+				}
+				makeInsnBody(code, insn, state);
+				if (flag != Flags.INLINE) {
+					code.add(';');
+				}
+			}
+		} catch (Exception th) {
+			throw new CodegenException(mth, "Error generate insn: " + insn, th);
+		}
+		return true;
+	}
+
+	private void makeInsnBody(CodeWriter code, InsnNode insn, Set<Flags> state) throws CodegenException {
+		switch (insn.getType()) {
+			case CONST_STR:
+				String str = ((ConstStringNode) insn).getString();
+				code.add(mth.dex().root().getStringUtils().unescapeString(str));
+				break;
+
+			case CONST_CLASS:
+				ArgType clsType = ((ConstClassNode) insn).getClsType();
+				useType(code, clsType);
+				code.add(".class");
+				break;
+
+			case CONST:
+				LiteralArg arg = (LiteralArg) insn.getArg(0);
+				code.add(lit(arg));
+				break;
+
+			case MOVE:
+				addArg(code, insn.getArg(0), false);
+				break;
+
+			case CHECK_CAST:
+			case CAST: {
+				boolean wrap = state.contains(Flags.BODY_ONLY);
+				if (wrap) {
+					code.add('(');
+				}
+				code.add('(');
+				useType(code, (ArgType) ((IndexInsnNode) insn).getIndex());
+				code.add(") ");
+				addArg(code, insn.getArg(0), true);
+				if (wrap) {
+					code.add(')');
+				}
+				break;
+			}
+
+			case ARITH:
+				makeArith((ArithNode) insn, code, state);
+				break;
+
+			case NEG:
+				oneArgInsn(code, insn, state, '-');
+				break;
+
+			case NOT:
+				oneArgInsn(code, insn, state, '~');
+				break;
+
+			case RETURN:
+				if (insn.getArgsCount() != 0) {
+					code.add("return ");
+					addArg(code, insn.getArg(0), false);
+				} else {
+					code.add("return");
+				}
+				break;
+
+			case BREAK:
+				code.add("break");
+				LoopLabelAttr labelAttr = insn.get(AType.LOOP_LABEL);
+				if (labelAttr != null) {
+					code.add(' ').add(mgen.getNameGen().getLoopLabel(labelAttr));
+				}
+				break;
+
+			case CONTINUE:
+				code.add("continue");
+				break;
+
+			case THROW:
+				code.add("throw ");
+				addArg(code, insn.getArg(0), true);
+				break;
+
+			case CMP_L:
+			case CMP_G:
+				code.add('(');
+				addArg(code, insn.getArg(0));
+				code.add(" > ");
+				addArg(code, insn.getArg(1));
+				code.add(" ? 1 : (");
+				addArg(code, insn.getArg(0));
+				code.add(" == ");
+				addArg(code, insn.getArg(1));
+				code.add(" ? 0 : -1))");
+				break;
+
+			case INSTANCE_OF: {
+				boolean wrap = state.contains(Flags.BODY_ONLY);
+				if (wrap) {
+					code.add('(');
+				}
+				addArg(code, insn.getArg(0));
+				code.add(" instanceof ");
+				useType(code, (ArgType) ((IndexInsnNode) insn).getIndex());
+				if (wrap) {
+					code.add(')');
+				}
+				break;
+			}
+			case CONSTRUCTOR:
+				makeConstructor((ConstructorInsn) insn, code);
+				break;
+
+			case INVOKE:
+				makeInvoke((InvokeNode) insn, code);
+				break;
+
+			case NEW_ARRAY: {
+				ArgType arrayType = ((NewArrayNode) insn).getArrayType();
+				code.add("new ");
+				useType(code, arrayType.getArrayRootElement());
+				code.add('[');
+				addArg(code, insn.getArg(0));
+				code.add(']');
+				int dim = arrayType.getArrayDimension();
+				for (int i = 0; i < dim - 1; i++) {
+					code.add("[]");
+				}
+				break;
+			}
+
+			case ARRAY_LENGTH:
+				addArg(code, insn.getArg(0));
+				code.add(".length");
+				break;
+
+			case FILLED_NEW_ARRAY:
+				filledNewArray((FilledNewArrayNode) insn, code);
+				break;
+
+			case AGET:
+				addArg(code, insn.getArg(0));
+				code.add('[');
+				addArg(code, insn.getArg(1), false);
+				code.add(']');
+				break;
+
+			case APUT:
+				addArg(code, insn.getArg(0));
+				code.add('[');
+				addArg(code, insn.getArg(1), false);
+				code.add("] = ");
+				addArg(code, insn.getArg(2), false);
+				break;
+
+			case IGET: {
+				FieldInfo fieldInfo = (FieldInfo) ((IndexInsnNode) insn).getIndex();
+				instanceField(code, fieldInfo, insn.getArg(0));
+				break;
+			}
+			case IPUT: {
+				FieldInfo fieldInfo = (FieldInfo) ((IndexInsnNode) insn).getIndex();
+				instanceField(code, fieldInfo, insn.getArg(1));
+				code.add(" = ");
+				addArg(code, insn.getArg(0), false);
+				break;
+			}
+
+			case SGET:
+				staticField(code, (FieldInfo) ((IndexInsnNode) insn).getIndex());
+				break;
+			case SPUT:
+				FieldInfo field = (FieldInfo) ((IndexInsnNode) insn).getIndex();
+				staticField(code, field);
+				code.add(" = ");
+				addArg(code, insn.getArg(0), false);
+				break;
+
+			case STR_CONCAT:
+				boolean wrap = state.contains(Flags.BODY_ONLY);
+				if (wrap) {
+					code.add('(');
+				}
+				for (Iterator<InsnArg> it = insn.getArguments().iterator(); it.hasNext(); ) {
+					addArg(code, it.next());
+					if (it.hasNext()) {
+						code.add(" + ");
+					}
+				}
+				if (wrap) {
+					code.add(')');
+				}
+				break;
+
+			case MONITOR_ENTER:
+				if (isFallback()) {
+					code.add("monitor-enter(");
+					addArg(code, insn.getArg(0));
+					code.add(')');
+				}
+				break;
+
+			case MONITOR_EXIT:
+				if (isFallback()) {
+					code.add("monitor-exit(");
+					addArg(code, insn.getArg(0));
+					code.add(')');
+				}
+				break;
+
+			case TERNARY:
+				makeTernary((TernaryInsn) insn, code, state);
+				break;
+
+			case ONE_ARG:
+				addArg(code, insn.getArg(0));
+				break;
+
+			/* fallback mode instructions */
+			case IF:
+				fallbackOnlyInsn(insn);
+				IfNode ifInsn = (IfNode) insn;
+				code.add("if (");
+				addArg(code, insn.getArg(0));
+				code.add(' ');
+				code.add(ifInsn.getOp().getSymbol()).add(' ');
+				addArg(code, insn.getArg(1));
+				code.add(") goto ").add(MethodGen.getLabelName(ifInsn.getTarget()));
+				break;
+
+			case GOTO:
+				fallbackOnlyInsn(insn);
+				code.add("goto ").add(MethodGen.getLabelName(((GotoNode) insn).getTarget()));
+				break;
+
+			case MOVE_EXCEPTION:
+				fallbackOnlyInsn(insn);
+				code.add("move-exception");
+				break;
+
+			case SWITCH:
+				fallbackOnlyInsn(insn);
+				SwitchNode sw = (SwitchNode) insn;
+				code.add("switch(");
+				addArg(code, insn.getArg(0));
+				code.add(") {");
+				code.incIndent();
+				for (int i = 0; i < sw.getCasesCount(); i++) {
+					String key = sw.getKeys()[i].toString();
+					code.startLine("case ").add(key).add(": goto ");
+					code.add(MethodGen.getLabelName(sw.getTargets()[i])).add(';');
+				}
+				code.startLine("default: goto ");
+				code.add(MethodGen.getLabelName(sw.getDefaultCaseOffset())).add(';');
+				code.decIndent();
+				code.startLine('}');
+				break;
+
+			case FILL_ARRAY:
+				fallbackOnlyInsn(insn);
+				FillArrayNode arrayNode = (FillArrayNode) insn;
+				Object data = arrayNode.getData();
+				String arrStr;
+				if (data instanceof int[]) {
+					arrStr = Arrays.toString((int[]) data);
+				} else if (data instanceof short[]) {
+					arrStr = Arrays.toString((short[]) data);
+				} else if (data instanceof byte[]) {
+					arrStr = Arrays.toString((byte[]) data);
+				} else if (data instanceof long[]) {
+					arrStr = Arrays.toString((long[]) data);
+				} else {
+					arrStr = "?";
+				}
+				code.add('{').add(arrStr.substring(1, arrStr.length() - 1)).add('}');
+				break;
+
+			case NEW_INSTANCE:
+				// only fallback - make new instance in constructor invoke
+				fallbackOnlyInsn(insn);
+				code.add("new ").add(insn.getResult().getType().toString());
+				break;
+
+			case PHI:
+			case MERGE:
+				fallbackOnlyInsn(insn);
+				code.add(insn.getType().toString()).add("(");
+				for (InsnArg insnArg : insn.getArguments()) {
+					addArg(code, insnArg);
+					code.add(' ');
+				}
+				code.add(")");
+				break;
+
+			default:
+				throw new CodegenException(mth, "Unknown instruction: " + insn.getType());
+		}
+	}
+
+	private void oneArgInsn(CodeWriter code, InsnNode insn, Set<Flags> state, char op) throws CodegenException {
+		boolean wrap = state.contains(Flags.BODY_ONLY);
+		if (wrap) {
+			code.add('(');
+		}
+		code.add(op);
+		addArg(code, insn.getArg(0));
+		if (wrap) {
+			code.add(')');
+		}
+	}
+
+	private void fallbackOnlyInsn(InsnNode insn) throws CodegenException {
+		if (!fallback) {
+			throw new CodegenException(insn.getType() + " can be used only in fallback mode");
+		}
+	}
+
+	private void filledNewArray(FilledNewArrayNode insn, CodeWriter code) throws CodegenException {
+		code.add("new ");
+		useType(code, insn.getArrayType());
+		code.add('{');
+		int c = insn.getArgsCount();
+		for (int i = 0; i < c; i++) {
+			addArg(code, insn.getArg(i), false);
+			if (i + 1 < c) {
+				code.add(", ");
+			}
+		}
+		code.add('}');
+	}
+
+	private void makeConstructor(ConstructorInsn insn, CodeWriter code)
+			throws CodegenException {
+		ClassNode cls = mth.dex().resolveClass(insn.getClassType());
+		if (cls != null && cls.contains(AFlag.ANONYMOUS_CLASS) && !fallback) {
+			inlineAnonymousConstr(code, cls, insn);
+			return;
+		}
+		if (insn.isSelf()) {
+			throw new JadxRuntimeException("Constructor 'self' invoke must be removed!");
+		}
+		if (insn.isSuper()) {
+			code.add("super");
+		} else if (insn.isThis()) {
+			code.add("this");
+		} else {
+			code.add("new ");
+			useClass(code, insn.getClassType());
+		}
+		MethodNode callMth = mth.dex().resolveMethod(insn.getCallMth());
+		generateMethodArguments(code, insn, 0, callMth);
+	}
+
+	private void inlineAnonymousConstr(CodeWriter code, ClassNode cls, ConstructorInsn insn) throws CodegenException {
+		// anonymous class construction
+		if (cls.contains(AFlag.DONT_GENERATE)) {
+			code.add("/* anonymous class already generated */");
+			ErrorsCounter.methodWarn(mth, "Anonymous class already generated: " + cls);
+			return;
+		}
+		ArgType parent;
+		if (cls.getInterfaces().size() == 1) {
+			parent = cls.getInterfaces().get(0);
+		} else {
+			parent = cls.getSuperClass();
+		}
+		cls.add(AFlag.DONT_GENERATE);
+		MethodNode defCtr = cls.getDefaultConstructor();
+		if (defCtr != null) {
+			if (RegionUtils.notEmpty(defCtr.getRegion())) {
+				defCtr.add(AFlag.ANONYMOUS_CONSTRUCTOR);
+			} else {
+				defCtr.add(AFlag.DONT_GENERATE);
+			}
+		}
+		code.add("new ");
+		if (parent == null) {
+			code.add("Object");
+		} else {
+			useClass(code, parent);
+		}
+		MethodNode callMth = mth.dex().resolveMethod(insn.getCallMth());
+		generateMethodArguments(code, insn, 0, callMth);
+		code.add(' ');
+		new ClassGen(cls, mgen.getClassGen().getParentGen()).addClassBody(code);
+	}
+
+	private void makeInvoke(InvokeNode insn, CodeWriter code) throws CodegenException {
+		MethodInfo callMth = insn.getCallMth();
+
+		// inline method
+		MethodNode callMthNode = mth.root().deepResolveMethod(callMth);
+		if (callMthNode != null) {
+			if (inlineMethod(callMthNode, insn, code)) {
+				return;
+			}
+			callMth = callMthNode.getMethodInfo();
+		}
+
+		int k = 0;
+		InvokeType type = insn.getInvokeType();
+		switch (type) {
+			case DIRECT:
+			case VIRTUAL:
+			case INTERFACE:
+				InsnArg arg = insn.getArg(0);
+				// FIXME: add 'this' for equals methods in scope
+				if (!arg.isThis()) {
+					addArgDot(code, arg);
+				}
+				k++;
+				break;
+
+			case SUPER:
+				// use 'super' instead 'this' in 0 arg
+				code.add("super").add('.');
+				k++;
+				break;
+
+			case STATIC:
+				ClassInfo insnCls = mth.getParentClass().getAlias();
+				ClassInfo declClass = callMth.getDeclClass();
+				if (!insnCls.equals(declClass)) {
+					useClass(code, declClass);
+					code.add('.');
+				}
+				break;
+		}
+		if (callMthNode != null) {
+			code.attachAnnotation(callMthNode);
+		}
+		code.add(callMth.getAlias());
+		generateMethodArguments(code, insn, k, callMthNode);
+	}
+
+	void generateMethodArguments(CodeWriter code, InsnNode insn, int startArgNum,
+	                             @Nullable MethodNode callMth) throws CodegenException {
+		int k = startArgNum;
+		if (callMth != null && callMth.contains(AFlag.SKIP_FIRST_ARG)) {
+			k++;
+		}
+		int argsCount = insn.getArgsCount();
+		code.add('(');
+		boolean firstArg = true;
+		if (k < argsCount) {
+			boolean overloaded = callMth != null && callMth.isArgsOverload();
+			for (int i = k; i < argsCount; i++) {
+				InsnArg arg = insn.getArg(i);
+				if (arg.contains(AFlag.SKIP_ARG)) {
+					continue;
+				}
+				RegisterArg callArg = getCallMthArg(callMth, i - startArgNum);
+				if (callArg != null && callArg.contains(AFlag.SKIP_ARG)) {
+					continue;
+				}
+				if (!firstArg) {
+					code.add(", ");
+				}
+				boolean cast = overloaded && processOverloadedArg(code, callMth, arg, i - startArgNum);
+				if (!cast && i == argsCount - 1 && processVarArg(code, callMth, arg)) {
+					continue;
+				}
+				addArg(code, arg, false);
+				firstArg = false;
+			}
+		}
+		code.add(')');
+	}
+
+	private static RegisterArg getCallMthArg(@Nullable MethodNode callMth, int num) {
+		if (callMth == null) {
+			return null;
+		}
+		List<RegisterArg> args = callMth.getArguments(false);
+		if (args != null && num < args.size()) {
+			return args.get(num);
+		}
+		return null;
+	}
+
+	/**
+	 * Add additional cast for overloaded method argument.
+	 */
+	private boolean processOverloadedArg(CodeWriter code, MethodNode callMth, InsnArg arg, int origPos) {
+		ArgType origType = callMth.getMethodInfo().getArgumentsTypes().get(origPos);
+		if (!arg.getType().equals(origType)) {
+			code.add('(');
+			useType(code, origType);
+			code.add(") ");
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Expand varArgs from filled array.
+	 */
+	private boolean processVarArg(CodeWriter code, MethodNode callMth, InsnArg lastArg) throws CodegenException {
+		if (callMth == null || !callMth.getAccessFlags().isVarArgs()) {
+			return false;
+		}
+		if (!lastArg.getType().isArray() || !lastArg.isInsnWrap()) {
+			return false;
+		}
+		InsnNode insn = ((InsnWrapArg) lastArg).getWrapInsn();
+		if (insn.getType() == InsnType.FILLED_NEW_ARRAY) {
+			int count = insn.getArgsCount();
+			for (int i = 0; i < count; i++) {
+				InsnArg elemArg = insn.getArg(i);
+				addArg(code, elemArg, false);
+				if (i < count - 1) {
+					code.add(", ");
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+	private boolean inlineMethod(MethodNode callMthNode, InvokeNode insn, CodeWriter code) throws CodegenException {
+		MethodInlineAttr mia = callMthNode.get(AType.METHOD_INLINE);
+		if (mia == null) {
+			return false;
+		}
+		InsnNode inl = mia.getInsn();
+		if (callMthNode.getMethodInfo().getArgumentsTypes().isEmpty()) {
+			makeInsn(inl, code, Flags.BODY_ONLY);
+		} else {
+			// remap args
+			InsnArg[] regs = new InsnArg[callMthNode.getRegsCount()];
+			List<RegisterArg> callArgs = callMthNode.getArguments(true);
+			for (int i = 0; i < callArgs.size(); i++) {
+				InsnArg arg = insn.getArg(i);
+				RegisterArg callArg = callArgs.get(i);
+				regs[callArg.getRegNum()] = arg;
+			}
+			// replace args
+			InsnNode inlCopy = inl.copy();
+			List<RegisterArg> inlArgs = new ArrayList<>();
+			inlCopy.getRegisterArgs(inlArgs);
+			for (RegisterArg r : inlArgs) {
+				int regNum = r.getRegNum();
+				if (regNum >= regs.length) {
+					LOG.warn("Unknown register number {} in method call: {} from {}", r, callMthNode, mth);
+				} else {
+					InsnArg repl = regs[regNum];
+					if (repl == null) {
+						LOG.warn("Not passed register {} in method call: {} from {}", r, callMthNode, mth);
+					} else {
+						inlCopy.replaceArg(r, repl);
+					}
+				}
+			}
+			makeInsn(inlCopy, code, Flags.BODY_ONLY);
+		}
+		return true;
+	}
+
+	private void makeTernary(TernaryInsn insn, CodeWriter code, Set<Flags> state) throws CodegenException {
+		boolean wrap = state.contains(Flags.BODY_ONLY);
+		if (wrap) {
+			code.add('(');
+		}
+		InsnArg first = insn.getArg(0);
+		InsnArg second = insn.getArg(1);
+		ConditionGen condGen = new ConditionGen(this);
+		if (first.equals(LiteralArg.TRUE) && second.equals(LiteralArg.FALSE)) {
+			condGen.add(code, insn.getCondition());
+		} else {
+			condGen.wrap(code, insn.getCondition());
+			code.add(" ? ");
+			addArg(code, first, false);
+			code.add(" : ");
+			addArg(code, second, false);
+		}
+		if (wrap) {
+			code.add(')');
+		}
+	}
+
+	private void makeArith(ArithNode insn, CodeWriter code, Set<Flags> state) throws CodegenException {
+		if (insn.contains(AFlag.ARITH_ONEARG)) {
+			makeArithOneArg(insn, code);
+			return;
+		}
+		// wrap insn in brackets for save correct operation order
+		boolean wrap = state.contains(Flags.BODY_ONLY) && !insn.contains(AFlag.DONT_WRAP);
+		if (wrap) {
+			code.add('(');
+		}
+		addArg(code, insn.getArg(0));
+		code.add(' ');
+		code.add(insn.getOp().getSymbol());
+		code.add(' ');
+		addArg(code, insn.getArg(1));
+		if (wrap) {
+			code.add(')');
+		}
+	}
+
+	private void makeArithOneArg(ArithNode insn, CodeWriter code) throws CodegenException {
+		ArithOp op = insn.getOp();
+		InsnArg arg = insn.getArg(1);
+		// "++" or "--"
+		if (arg.isLiteral() && (op == ArithOp.ADD || op == ArithOp.SUB)) {
+			LiteralArg lit = (LiteralArg) arg;
+			if (lit.isInteger() && lit.getLiteral() == 1) {
+				assignVar(code, insn);
+				String opSymbol = op.getSymbol();
+				code.add(opSymbol).add(opSymbol);
+				return;
+			}
+		}
+		// +=, -= ...
+		assignVar(code, insn);
+		code.add(' ').add(op.getSymbol()).add("= ");
+		addArg(code, arg, false);
+	}
+}

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

@@ -0,0 +1,246 @@
+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.info.AccessInfo;
+import jadx.core.dex.instructions.InsnType;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.instructions.args.RegisterArg;
+import jadx.core.dex.instructions.args.SSAVar;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.dex.nodes.MethodNode;
+import jadx.core.dex.trycatch.CatchAttr;
+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.exceptions.CodegenException;
+import jadx.core.utils.exceptions.DecodeException;
+
+public class MethodGen {
+	private static final Logger LOG = LoggerFactory.getLogger(MethodGen.class);
+
+	private final MethodNode mth;
+	private final ClassGen classGen;
+	private final AnnotationGen annotationGen;
+	private final NameGen nameGen;
+
+	public MethodGen(ClassGen classGen, MethodNode mth) {
+		this.mth = mth;
+		this.classGen = classGen;
+		this.annotationGen = classGen.getAnnotationGen();
+		this.nameGen = new NameGen(mth, classGen.isFallbackMode());
+	}
+
+	public ClassGen getClassGen() {
+		return classGen;
+	}
+
+	public NameGen getNameGen() {
+		return nameGen;
+	}
+
+	public MethodNode getMethodNode() {
+		return mth;
+	}
+
+	public boolean addDefinition(CodeWriter code) {
+		if (mth.getMethodInfo().isClassInit()) {
+			code.attachDefinition(mth);
+			code.startLine("static");
+			return true;
+		}
+		if (mth.contains(AFlag.ANONYMOUS_CONSTRUCTOR)) {
+			// don't add method name and arguments
+			code.startLine();
+			code.attachDefinition(mth);
+			return false;
+		}
+		annotationGen.addForMethod(code, mth);
+
+		AccessInfo clsAccFlags = mth.getParentClass().getAccessFlags();
+		AccessInfo ai = mth.getAccessFlags();
+		// don't add 'abstract' and 'public' to methods in interface
+		if (clsAccFlags.isInterface()) {
+			ai = ai.remove(AccessFlags.ACC_ABSTRACT);
+			ai = ai.remove(AccessFlags.ACC_PUBLIC);
+		}
+		// don't add 'public' for annotations
+		if (clsAccFlags.isAnnotation()) {
+			ai = ai.remove(AccessFlags.ACC_PUBLIC);
+		}
+
+		if (mth.getMethodInfo().isRenamed() && !ai.isConstructor()) {
+			code.startLine("/* renamed from: ").add(mth.getName()).add(" */");
+		}
+		code.startLineWithNum(mth.getSourceLine());
+		code.add(ai.makeString());
+
+		if (classGen.addGenericMap(code, mth.getGenericMap())) {
+			code.add(' ');
+		}
+		if (ai.isConstructor()) {
+			code.attachDefinition(mth);
+			code.add(classGen.getClassNode().getShortName()); // constructor
+		} else {
+			classGen.useType(code, mth.getReturnType());
+			code.add(' ');
+			code.attachDefinition(mth);
+			code.add(mth.getAlias());
+		}
+		code.add('(');
+
+		List<RegisterArg> args = mth.getArguments(false);
+		if (mth.getMethodInfo().isConstructor()
+				&& mth.getParentClass().contains(AType.ENUM_CLASS)) {
+			if (args.size() == 2) {
+				args.clear();
+			} else if (args.size() > 2) {
+				args = args.subList(2, args.size());
+			} else {
+				LOG.warn(ErrorsCounter.formatMsg(mth,
+						"Incorrect number of args for enum constructor: " + args.size()
+								+ " (expected >= 2)"
+				));
+			}
+		}
+		addMethodArguments(code, args);
+		code.add(')');
+
+		annotationGen.addThrows(mth, code);
+		return true;
+	}
+
+	private void addMethodArguments(CodeWriter argsCode, List<RegisterArg> args) {
+		MethodParameters paramsAnnotation = mth.get(AType.ANNOTATION_MTH_PARAMETERS);
+		int i = 0;
+		for (Iterator<RegisterArg> it = args.iterator(); it.hasNext(); ) {
+			RegisterArg arg = it.next();
+
+			// add argument annotation
+			if (paramsAnnotation != null) {
+				annotationGen.addForParameter(argsCode, paramsAnnotation, i);
+			}
+			SSAVar argSVar = arg.getSVar();
+			if (argSVar != null && argSVar.contains(AFlag.FINAL)) {
+				argsCode.add("final ");
+			}
+			if (!it.hasNext() && mth.getAccessFlags().isVarArgs()) {
+				// change last array argument to varargs
+				ArgType type = arg.getType();
+				if (type.isArray()) {
+					ArgType elType = type.getArrayElement();
+					classGen.useType(argsCode, elType);
+					argsCode.add("...");
+				} else {
+					LOG.warn(ErrorsCounter.formatMsg(mth, "Last argument in varargs method not array"));
+					classGen.useType(argsCode, arg.getType());
+				}
+			} else {
+				classGen.useType(argsCode, arg.getType());
+			}
+			argsCode.add(' ');
+			argsCode.add(nameGen.assignArg(arg));
+
+			i++;
+			if (it.hasNext()) {
+				argsCode.add(", ");
+			}
+		}
+	}
+
+	public void addInstructions(CodeWriter code) throws CodegenException {
+		if (mth.contains(AType.JADX_ERROR)
+				|| mth.contains(AFlag.INCONSISTENT_CODE)
+				|| mth.getRegion() == null) {
+			code.startLine("/*");
+			addFallbackMethodCode(code);
+			code.startLine("*/");
+
+			ClassInfo clsAlias = mth.getParentClass().getAlias();
+
+			code.startLine("throw new UnsupportedOperationException(\"Method not decompiled: ")
+					.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);
+			regionGen.makeRegion(code, mth.getRegion());
+		}
+	}
+
+	public void addFallbackMethodCode(CodeWriter code) {
+		if (mth.getInstructions() == null) {
+			// 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();
+		if (insnArr == null) {
+			code.startLine("// Can't load method instructions.");
+			return;
+		}
+		if (mth.getThisArg() != null) {
+			code.startLine(nameGen.useArg(mth.getThisArg())).add(" = this;");
+		}
+		addFallbackInsns(code, mth, insnArr, true);
+	}
+
+	public static void addFallbackInsns(CodeWriter code, MethodNode mth, InsnNode[] insnArr, boolean addLabels) {
+		InsnGen insnGen = new InsnGen(getFallbackMethodGen(mth), true);
+		for (InsnNode insn : insnArr) {
+			if (insn == null || insn.getType() == InsnType.NOP) {
+				continue;
+			}
+			if (addLabels && (insn.contains(AType.JUMP) || insn.contains(AType.EXC_HANDLER))) {
+				code.decIndent();
+				code.startLine(getLabelName(insn.getOffset()) + ":");
+				code.incIndent();
+			}
+			try {
+				if (insnGen.makeInsn(insn, code)) {
+					CatchAttr catchAttr = insn.get(AType.CATCH_BLOCK);
+					if (catchAttr != null) {
+						code.add("\t " + catchAttr);
+					}
+				}
+			} catch (CodegenException e) {
+				LOG.debug("Error generate fallback instruction: ", e.getCause());
+				code.startLine("// error: " + insn);
+			}
+		}
+	}
+
+	/**
+	 * Return fallback variant of method codegen
+	 */
+	public static MethodGen getFallbackMethodGen(MethodNode mth) {
+		ClassGen clsGen = new ClassGen(mth.getParentClass(), null, true, true, true);
+		return new MethodGen(clsGen, mth);
+	}
+
+	public static String getLabelName(int offset) {
+		return "L_" + InsnUtils.formatOffset(offset);
+	}
+}

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

@@ -0,0 +1,242 @@
+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;
+import jadx.core.dex.info.ClassInfo;
+import jadx.core.dex.info.MethodInfo;
+import jadx.core.dex.instructions.InvokeNode;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.instructions.args.InsnArg;
+import jadx.core.dex.instructions.args.InsnWrapArg;
+import jadx.core.dex.instructions.args.NamedArg;
+import jadx.core.dex.instructions.args.RegisterArg;
+import jadx.core.dex.instructions.args.SSAVar;
+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 jadx.core.utils.Utils;
+
+public class NameGen {
+
+	private static final Map<String, String> OBJ_ALIAS;
+
+	private final Set<String> varNames = new LinkedHashSet<>();
+	private final MethodNode mth;
+	private final boolean fallback;
+
+	static {
+		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) {
+		this.mth = mth;
+		this.fallback = fallback;
+	}
+
+	public String assignArg(RegisterArg arg) {
+		String name = makeArgName(arg);
+		if (fallback) {
+			return name;
+		}
+		name = getUniqueVarName(name);
+		arg.setName(name);
+		return name;
+	}
+
+	public String assignNamedArg(NamedArg arg) {
+		String name = arg.getName();
+		if (fallback) {
+			return name;
+		}
+		name = getUniqueVarName(name);
+		arg.setName(name);
+		return name;
+	}
+
+	public String useArg(RegisterArg arg) {
+		String name = arg.getName();
+		if (name == null || fallback) {
+			return getFallbackName(arg);
+		}
+		return name;
+	}
+
+	// TODO: avoid name collision with variables names
+	public String getLoopLabel(LoopLabelAttr attr) {
+		String name = "loop" + attr.getLoop().getId();
+		varNames.add(name);
+		return name;
+	}
+
+	private String getUniqueVarName(String name) {
+		String r = name;
+		int i = 2;
+		while (varNames.contains(r)) {
+			r = name + i;
+			i++;
+		}
+		varNames.add(r);
+		return r;
+	}
+
+	private String makeArgName(RegisterArg arg) {
+		if (fallback) {
+			return getFallbackName(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";
+		}
+		return varName;
+	}
+
+	private String getFallbackName(RegisterArg arg) {
+		return "r" + arg.getRegNum();
+	}
+
+	private String guessName(RegisterArg arg) {
+		SSAVar sVar = arg.getSVar();
+		if (sVar != null && sVar.getName() == null) {
+			RegisterArg assignArg = sVar.getAssign();
+			InsnNode assignInsn = assignArg.getParentInsn();
+			if (assignInsn != null) {
+				String name = makeNameFromInsn(assignInsn);
+				if (name != null && !NameMapper.isReserved(name)) {
+					assignArg.setName(name);
+					return name;
+				}
+			}
+		}
+		return makeNameForType(arg.getType());
+	}
+
+	private String makeNameForType(ArgType type) {
+		if (type.isPrimitive()) {
+			return makeNameForPrimitive(type);
+		}
+		if (type.isArray()) {
+			return makeNameForType(type.getArrayRootElement()) + "Arr";
+		}
+		return makeNameForObject(type);
+	}
+
+	private static String makeNameForPrimitive(ArgType type) {
+		return type.getPrimitiveType().getShortName().toLowerCase();
+	}
+
+	private String makeNameForObject(ArgType type) {
+		if (type.isObject()) {
+			String alias = getAliasForObject(type.getObject());
+			if (alias != null) {
+				return alias;
+			}
+			ClassInfo extClsInfo = ClassInfo.extCls(mth.root(), type);
+			String shortName = extClsInfo.getShortName();
+			String vName = fromName(shortName);
+			if (vName != null) {
+				return vName;
+			}
+			if (shortName != null) {
+				return StringUtils.escape(shortName.toLowerCase());
+			}
+		}
+		return StringUtils.escape(type.toString());
+	}
+
+	private static String fromName(String name) {
+		if (name == null || name.isEmpty()) {
+			return null;
+		}
+		if (name.toUpperCase().equals(name)) {
+			// all characters are upper case
+			return name.toLowerCase();
+		}
+		String v1 = Character.toLowerCase(name.charAt(0)) + name.substring(1);
+		if (!v1.equals(name)) {
+			return v1;
+		}
+		if (name.length() < 3) {
+			return name + "Var";
+		}
+		return null;
+	}
+
+	private static String getAliasForObject(String name) {
+		return OBJ_ALIAS.get(name);
+	}
+
+	private String makeNameFromInsn(InsnNode insn) {
+		switch (insn.getType()) {
+			case INVOKE:
+				InvokeNode inv = (InvokeNode) insn;
+				return makeNameFromInvoke(inv.getCallMth());
+
+			case CONSTRUCTOR:
+				ConstructorInsn co = (ConstructorInsn) insn;
+				return makeNameForObject(co.getClassType().getType());
+
+			case ARRAY_LENGTH:
+				return "length";
+
+			case ARITH:
+			case TERNARY:
+			case CAST:
+				for (InsnArg arg : insn.getArguments()) {
+					if (arg.isInsnWrap()) {
+						InsnNode wrapInsn = ((InsnWrapArg) arg).getWrapInsn();
+						String wName = makeNameFromInsn(wrapInsn);
+						if (wName != null) {
+							return wName;
+						}
+					}
+				}
+				break;
+
+			default:
+				break;
+		}
+		return null;
+	}
+
+	private String makeNameFromInvoke(MethodInfo callMth) {
+		String name = callMth.getName();
+		if (name.startsWith("get") || name.startsWith("set")) {
+			return fromName(name.substring(3));
+		}
+		ArgType declType = callMth.getDeclClass().getAlias().getType();
+		if ("iterator".equals(name)) {
+			return "it";
+		}
+		if ("toString".equals(name)) {
+			return makeNameForType(declType);
+		}
+		if ("forName".equals(name) && declType.equals(ArgType.CLASS)) {
+			return OBJ_ALIAS.get(Consts.CLASS_CLASS);
+		}
+		return name;
+	}
+}

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

@@ -0,0 +1,333 @@
+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;
+import jadx.core.dex.instructions.args.RegisterArg;
+import jadx.core.dex.nodes.BlockNode;
+import jadx.core.dex.nodes.FieldNode;
+import jadx.core.dex.nodes.IBlock;
+import jadx.core.dex.nodes.IContainer;
+import jadx.core.dex.nodes.IRegion;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.dex.nodes.parser.FieldInitAttr;
+import jadx.core.dex.regions.Region;
+import jadx.core.dex.regions.SwitchRegion;
+import jadx.core.dex.regions.SynchronizedRegion;
+import jadx.core.dex.regions.TryCatchRegion;
+import jadx.core.dex.regions.conditions.IfCondition;
+import jadx.core.dex.regions.conditions.IfRegion;
+import jadx.core.dex.regions.loops.ForEachLoop;
+import jadx.core.dex.regions.loops.ForLoop;
+import jadx.core.dex.regions.loops.LoopRegion;
+import jadx.core.dex.regions.loops.LoopType;
+import jadx.core.dex.trycatch.ExceptionHandler;
+import jadx.core.utils.ErrorsCounter;
+import jadx.core.utils.RegionUtils;
+import jadx.core.utils.exceptions.CodegenException;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+
+public class RegionGen extends InsnGen {
+	private static final Logger LOG = LoggerFactory.getLogger(RegionGen.class);
+
+	public RegionGen(MethodGen mgen) {
+		super(mgen, false);
+	}
+
+	public void makeRegion(CodeWriter code, IContainer cont) throws CodegenException {
+		if (cont instanceof IBlock) {
+			makeSimpleBlock((IBlock) cont, code);
+		} else if (cont instanceof IRegion) {
+			if (cont instanceof Region) {
+				makeSimpleRegion(code, (Region) cont);
+			} else {
+				declareVars(code, cont);
+				if (cont instanceof IfRegion) {
+					makeIf((IfRegion) cont, code, true);
+				} else if (cont instanceof SwitchRegion) {
+					makeSwitch((SwitchRegion) cont, code);
+				} else if (cont instanceof LoopRegion) {
+					makeLoop((LoopRegion) cont, code);
+				} else if (cont instanceof TryCatchRegion) {
+					makeTryCatch((TryCatchRegion) cont, code);
+				} else if (cont instanceof SynchronizedRegion) {
+					makeSynchronizedRegion((SynchronizedRegion) cont, code);
+				}
+			}
+		} else {
+			throw new CodegenException("Not processed container: " + cont);
+		}
+	}
+
+	private void declareVars(CodeWriter code, IContainer cont) {
+		DeclareVariablesAttr declVars = cont.get(AType.DECLARE_VARIABLES);
+		if (declVars != null) {
+			for (RegisterArg v : declVars.getVars()) {
+				code.startLine();
+				declareVar(code, v);
+				code.add(';');
+			}
+		}
+	}
+
+	private void makeSimpleRegion(CodeWriter code, Region region) throws CodegenException {
+		declareVars(code, region);
+		for (IContainer c : region.getSubBlocks()) {
+			makeRegion(code, c);
+		}
+	}
+
+	public void makeRegionIndent(CodeWriter code, IContainer region) throws CodegenException {
+		code.incIndent();
+		makeRegion(code, region);
+		code.decIndent();
+	}
+
+	private void makeSimpleBlock(IBlock block, CodeWriter code) throws CodegenException {
+		for (InsnNode insn : block.getInstructions()) {
+			if (!insn.contains(AFlag.SKIP)) {
+				makeInsn(insn, code);
+			}
+		}
+		ForceReturnAttr retAttr = block.get(AType.FORCE_RETURN);
+		if (retAttr != null) {
+			makeInsn(retAttr.getReturnInsn(), code);
+		}
+	}
+
+	private void makeIf(IfRegion region, CodeWriter code, boolean newLine) throws CodegenException {
+		if (newLine) {
+			code.startLineWithNum(region.getSourceLine());
+		} else {
+			code.attachSourceLine(region.getSourceLine());
+		}
+		code.add("if (");
+		new ConditionGen(this).add(code, region.getCondition());
+		code.add(") {");
+		makeRegionIndent(code, region.getThenRegion());
+		code.startLine('}');
+
+		IContainer els = region.getElseRegion();
+		if (els != null && RegionUtils.notEmpty(els)) {
+			code.add(" else ");
+			if (connectElseIf(code, els)) {
+				return;
+			}
+			code.add('{');
+			makeRegionIndent(code, els);
+			code.startLine('}');
+		}
+	}
+
+	/**
+	 * Connect if-else-if block
+	 */
+	private boolean connectElseIf(CodeWriter code, IContainer els) throws CodegenException {
+		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;
+	}
+
+	private CodeWriter makeLoop(LoopRegion region, CodeWriter code) throws CodegenException {
+		BlockNode header = region.getHeader();
+		if (header != null) {
+			List<InsnNode> headerInsns = header.getInstructions();
+			if (headerInsns.size() > 1) {
+				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);
+					makeInsn(insn, code);
+				}
+			}
+		}
+		LoopLabelAttr labelAttr = region.getInfo().getStart().get(AType.LOOP_LABEL);
+		if (labelAttr != null) {
+			code.startLine(mgen.getNameGen().getLoopLabel(labelAttr)).add(':');
+		}
+
+		IfCondition condition = region.getCondition();
+		if (condition == null) {
+			// infinite loop
+			code.startLine("while (true) {");
+			makeRegionIndent(code, region.getBody());
+			code.startLine('}');
+			return code;
+		}
+		ConditionGen conditionGen = new ConditionGen(this);
+		LoopType type = region.getType();
+		if (type != null) {
+			if (type instanceof ForLoop) {
+				ForLoop forLoop = (ForLoop) type;
+				code.startLine("for (");
+				makeInsn(forLoop.getInitInsn(), code, Flags.INLINE);
+				code.add("; ");
+				conditionGen.add(code, condition);
+				code.add("; ");
+				makeInsn(forLoop.getIncrInsn(), code, Flags.INLINE);
+				code.add(") {");
+				makeRegionIndent(code, region.getBody());
+				code.startLine('}');
+				return code;
+			}
+			if (type instanceof ForEachLoop) {
+				ForEachLoop forEachLoop = (ForEachLoop) type;
+				code.startLine("for (");
+				declareVar(code, forEachLoop.getVarArg());
+				code.add(" : ");
+				addArg(code, forEachLoop.getIterableArg(), false);
+				code.add(") {");
+				makeRegionIndent(code, region.getBody());
+				code.startLine('}');
+				return code;
+			}
+			throw new JadxRuntimeException("Unknown loop type: " + type.getClass());
+		}
+		if (region.isConditionAtEnd()) {
+			code.startLine("do {");
+			makeRegionIndent(code, region.getBody());
+			code.startLineWithNum(region.getConditionSourceLine());
+			code.add("} while (");
+			conditionGen.add(code, condition);
+			code.add(");");
+		} else {
+			code.startLineWithNum(region.getConditionSourceLine());
+			code.add("while (");
+			conditionGen.add(code, condition);
+			code.add(") {");
+			makeRegionIndent(code, region.getBody());
+			code.startLine('}');
+		}
+		return code;
+	}
+
+	private void makeSynchronizedRegion(SynchronizedRegion cont, CodeWriter code) throws CodegenException {
+		code.startLine("synchronized (");
+		addArg(code, cont.getEnterInsn().getArg(0));
+		code.add(") {");
+		makeRegionIndent(code, cont.getRegion());
+		code.startLine('}');
+	}
+
+	private CodeWriter makeSwitch(SwitchRegion sw, CodeWriter code) throws CodegenException {
+		SwitchNode insn = (SwitchNode) sw.getHeader().getInstructions().get(0);
+		InsnArg arg = insn.getArg(0);
+		code.startLine("switch (");
+		addArg(code, arg, false);
+		code.add(") {");
+		code.incIndent();
+
+		int size = sw.getKeys().size();
+		for (int i = 0; i < size; i++) {
+			List<Object> keys = sw.getKeys().get(i);
+			IContainer c = sw.getCases().get(i);
+			for (Object k : keys) {
+				code.startLine("case ");
+				if (k instanceof FieldNode) {
+					FieldNode fn = (FieldNode) k;
+					if (fn.getParentClass().isEnum()) {
+						code.add(fn.getAlias());
+					} else {
+						staticField(code, fn.getFieldInfo());
+						// print original value, sometimes replace with incorrect field
+						FieldInitAttr valueAttr = fn.get(AType.FIELD_INIT);
+						if (valueAttr != null && valueAttr.getValue() != null) {
+							code.add(" /*").add(valueAttr.getValue().toString()).add("*/");
+						}
+					}
+				} else if (k instanceof Integer) {
+					code.add(TypeGen.literalToString((Integer) k, arg.getType(), mth));
+				} else {
+					throw new JadxRuntimeException("Unexpected key in switch: " + (k != null ? k.getClass() : null));
+				}
+				code.add(':');
+			}
+			makeRegionIndent(code, c);
+		}
+		if (sw.getDefaultCase() != null) {
+			code.startLine("default:");
+			makeRegionIndent(code, sw.getDefaultCase());
+		}
+		code.decIndent();
+		code.startLine('}');
+		return code;
+	}
+
+	private void makeTryCatch(TryCatchRegion region, CodeWriter code) throws CodegenException {
+		code.startLine("try {");
+		makeRegionIndent(code, region.getTryRegion());
+		// TODO: move search of 'allHandler' to 'TryCatchRegion'
+		ExceptionHandler allHandler = null;
+		for (Map.Entry<ExceptionHandler, IContainer> entry : region.getCatchRegions().entrySet()) {
+			ExceptionHandler handler = entry.getKey();
+			if (handler.isCatchAll()) {
+				if (allHandler != null) {
+					LOG.warn("Several 'all' handlers in try/catch block in {}", mth);
+				}
+				allHandler = handler;
+			} else {
+				makeCatchBlock(code, handler);
+			}
+		}
+		if (allHandler != null) {
+			makeCatchBlock(code, allHandler);
+		}
+		IContainer finallyRegion = region.getFinallyRegion();
+		if (finallyRegion != null) {
+			code.startLine("} finally {");
+			makeRegionIndent(code, finallyRegion);
+		}
+		code.startLine('}');
+	}
+
+	private void makeCatchBlock(CodeWriter code, ExceptionHandler handler) throws CodegenException {
+		IContainer region = handler.getHandlerRegion();
+		if (region == null) {
+			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) {
+			code.add(mgen.getNameGen().assignArg((RegisterArg) arg));
+		} else if (arg instanceof NamedArg) {
+			code.add(mgen.getNameGen().assignNamedArg((NamedArg) arg));
+		}
+		code.add(") {");
+		makeRegionIndent(code, region);
+	}
+}

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

@@ -0,0 +1,179 @@
+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;
+import jadx.core.utils.StringUtils;
+import jadx.core.utils.Utils;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+
+public class TypeGen {
+	private static final Logger LOG = LoggerFactory.getLogger(TypeGen.class);
+
+	private TypeGen() {
+	}
+
+	public static String signature(ArgType type) {
+		PrimitiveType stype = type.getPrimitiveType();
+		if (stype == PrimitiveType.OBJECT) {
+			return Utils.makeQualifiedObjectName(type.getObject());
+		}
+		if (stype == PrimitiveType.ARRAY) {
+			return '[' + signature(type.getArrayElement());
+		}
+		return stype.getShortName();
+	}
+
+	/**
+	 * Convert literal value to string according to value type
+	 *
+	 * @throws JadxRuntimeException for incorrect type or literal value
+	 */
+	public static String literalToString(long lit, ArgType type, IDexNode dexNode) {
+		return literalToString(lit, type, dexNode.root().getStringUtils());
+	}
+
+	@Deprecated
+	public static String literalToString(long lit, ArgType type) {
+		return literalToString(lit, type, new StringUtils(new JadxArgs()));
+	}
+
+	private static String literalToString(long lit, ArgType type, StringUtils stringUtils) {
+		if (type == null || !type.isTypeKnown()) {
+			String n = Long.toString(lit);
+			if (Math.abs(lit) > 100) {
+				n += "; // 0x" + Long.toHexString(lit)
+						+ " float:" + Float.intBitsToFloat((int) lit)
+						+ " double:" + Double.longBitsToDouble(lit);
+			}
+			return n;
+		}
+
+		switch (type.getPrimitiveType()) {
+			case BOOLEAN:
+				return lit == 0 ? "false" : "true";
+			case CHAR:
+				char ch = (char) lit;
+				if (!NameMapper.isPrintableChar(ch)) {
+					return Integer.toString(ch);
+				}
+				return stringUtils.unescapeChar(ch);
+			case BYTE:
+				return formatByte((byte) lit);
+			case SHORT:
+				return formatShort((short) lit);
+			case INT:
+				return formatInteger((int) lit);
+			case LONG:
+				return formatLong(lit);
+			case FLOAT:
+				return formatFloat(Float.intBitsToFloat((int) lit));
+			case DOUBLE:
+				return formatDouble(Double.longBitsToDouble(lit));
+
+			case OBJECT:
+			case ARRAY:
+				if (lit != 0) {
+					LOG.warn("Wrong object literal: {} for type: {}", lit, type);
+					return Long.toString(lit);
+				}
+				return "null";
+
+			default:
+				throw new JadxRuntimeException("Unknown type in literalToString: " + type);
+		}
+	}
+
+	public static String formatShort(short s) {
+		if (s == Short.MAX_VALUE) {
+			return "Short.MAX_VALUE";
+		}
+		if (s == Short.MIN_VALUE) {
+			return "Short.MIN_VALUE";
+		}
+		return "(short) " + Short.toString(s);
+	}
+
+	public static String formatByte(byte b) {
+		if (b == Byte.MAX_VALUE) {
+			return "Byte.MAX_VALUE";
+		}
+		if (b == Byte.MIN_VALUE) {
+			return "Byte.MIN_VALUE";
+		}
+		return "(byte) " + Byte.toString(b);
+	}
+
+	public static String formatInteger(int i) {
+		if (i == Integer.MAX_VALUE) {
+			return "Integer.MAX_VALUE";
+		}
+		if (i == Integer.MIN_VALUE) {
+			return "Integer.MIN_VALUE";
+		}
+		return Integer.toString(i);
+	}
+
+	public static String formatLong(long l) {
+		if (l == Long.MAX_VALUE) {
+			return "Long.MAX_VALUE";
+		}
+		if (l == Long.MIN_VALUE) {
+			return "Long.MIN_VALUE";
+		}
+		String str = Long.toString(l);
+		if (Math.abs(l) >= Integer.MAX_VALUE) {
+			str += "L";
+		}
+		return str;
+	}
+
+	public static String formatDouble(double d) {
+		if (Double.isNaN(d)) {
+			return "Double.NaN";
+		}
+		if (d == Double.NEGATIVE_INFINITY) {
+			return "Double.NEGATIVE_INFINITY";
+		}
+		if (d == Double.POSITIVE_INFINITY) {
+			return "Double.POSITIVE_INFINITY";
+		}
+		if (d == Double.MIN_VALUE) {
+			return "Double.MIN_VALUE";
+		}
+		if (d == Double.MAX_VALUE) {
+			return "Double.MAX_VALUE";
+		}
+		if (d == Double.MIN_NORMAL) {
+			return "Double.MIN_NORMAL";
+		}
+		return Double.toString(d) + "d";
+	}
+
+	public static String formatFloat(float f) {
+		if (Float.isNaN(f)) {
+			return "Float.NaN";
+		}
+		if (f == Float.NEGATIVE_INFINITY) {
+			return "Float.NEGATIVE_INFINITY";
+		}
+		if (f == Float.POSITIVE_INFINITY) {
+			return "Float.POSITIVE_INFINITY";
+		}
+		if (f == Float.MIN_VALUE) {
+			return "Float.MIN_VALUE";
+		}
+		if (f == Float.MAX_VALUE) {
+			return "Float.MAX_VALUE";
+		}
+		if (f == Float.MIN_NORMAL) {
+			return "Float.MIN_NORMAL";
+		}
+		return Float.toString(f) + "f";
+	}
+}

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

@@ -0,0 +1,50 @@
+package jadx.core.deobf;
+
+import jadx.core.dex.nodes.ClassNode;
+
+class DeobfClsInfo {
+	private final Deobfuscator deobfuscator;
+	private final ClassNode cls;
+	private final PackageNode pkg;
+	private final String alias;
+
+	public DeobfClsInfo(Deobfuscator deobfuscator, ClassNode cls, PackageNode pkg, String alias) {
+		this.deobfuscator = deobfuscator;
+		this.cls = cls;
+		this.pkg = pkg;
+		this.alias = alias;
+	}
+
+	public String makeNameWithoutPkg() {
+		String prefix;
+		ClassNode parentClass = cls.getParentClass();
+		if (parentClass != cls) {
+			DeobfClsInfo parentDeobfClsInfo = deobfuscator.getClsMap().get(parentClass.getClassInfo());
+			if (parentDeobfClsInfo != null) {
+				prefix = parentDeobfClsInfo.makeNameWithoutPkg();
+			} else {
+				prefix = deobfuscator.getNameWithoutPackage(parentClass.getClassInfo());
+			}
+			prefix += Deobfuscator.INNER_CLASS_SEPARATOR;
+		} else {
+			prefix = "";
+		}
+		return prefix + (this.alias != null ? this.alias : this.cls.getShortName());
+	}
+
+	public String getFullName() {
+		return pkg.getFullAlias() + Deobfuscator.CLASS_NAME_SEPARATOR + makeNameWithoutPkg();
+	}
+
+	public ClassNode getCls() {
+		return cls;
+	}
+
+	public PackageNode getPkg() {
+		return pkg;
+	}
+
+	public String getAlias() {
+		return alias;
+	}
+}

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

@@ -0,0 +1,169 @@
+package jadx.core.deobf;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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);
+
+	private static final String MAP_FILE_CHARSET = "UTF-8";
+
+	private final Deobfuscator deobfuscator;
+	private final File deobfMapFile;
+
+	private final Map<String, String> clsPresetMap = new HashMap<>();
+	private final Map<String, String> fldPresetMap = new HashMap<>();
+	private final Map<String, String> mthPresetMap = new HashMap<>();
+
+	public DeobfPresets(Deobfuscator deobfuscator, File deobfMapFile) {
+		this.deobfuscator = deobfuscator;
+		this.deobfMapFile = deobfMapFile;
+	}
+
+	/**
+	 * Loads deobfuscator presets
+	 */
+	public void load() {
+		if (!deobfMapFile.exists()) {
+			return;
+		}
+		LOG.info("Loading obfuscation map from: {}", deobfMapFile.getAbsoluteFile());
+		try {
+			List<String> lines = FileUtils.readLines(deobfMapFile, MAP_FILE_CHARSET);
+			for (String l : lines) {
+				l = l.trim();
+				if (l.isEmpty() || l.startsWith("#")) {
+					continue;
+				}
+				String[] va = splitAndTrim(l);
+				if (va.length != 2) {
+					continue;
+				}
+				String origName = va[0];
+				String alias = va[1];
+				if (l.startsWith("p ")) {
+					deobfuscator.addPackagePreset(origName, alias);
+				} else if (l.startsWith("c ")) {
+					clsPresetMap.put(origName, alias);
+				} else if (l.startsWith("f ")) {
+					fldPresetMap.put(origName, alias);
+				} else if (l.startsWith("m ")) {
+					mthPresetMap.put(origName, alias);
+				}
+			}
+		} catch (IOException e) {
+			LOG.error("Failed to load deobfuscation map file '{}'", deobfMapFile.getAbsolutePath(), e);
+		}
+	}
+
+	private static String[] splitAndTrim(String str) {
+		String[] v = str.substring(2).split("=");
+		for (int i = 0; i < v.length; i++) {
+			v[i] = v[i].trim();
+		}
+		return v;
+	}
+
+	public void save(boolean forceSave) {
+		try {
+			if (deobfMapFile.exists()) {
+				if (forceSave) {
+					dumpMapping();
+				} else {
+					LOG.warn("Deobfuscation map file '{}' exists. Use command line option '--deobf-rewrite-cfg' to rewrite it",
+							deobfMapFile.getAbsolutePath());
+				}
+			} else {
+				dumpMapping();
+			}
+		} catch (IOException e) {
+			LOG.error("Failed to load deobfuscation map file '{}'", deobfMapFile.getAbsolutePath(), e);
+		}
+	}
+
+	/**
+	 * Saves DefaultDeobfuscator presets
+	 */
+	private void dumpMapping() throws IOException {
+		List<String> list = new ArrayList<>();
+		// packages
+		for (PackageNode p : deobfuscator.getRootPackage().getInnerPackages()) {
+			for (PackageNode pp : p.getInnerPackages()) {
+				dfsPackageName(list, p.getName(), pp);
+			}
+			if (p.hasAlias()) {
+				list.add(String.format("p %s = %s", p.getName(), p.getAlias()));
+			}
+		}
+		// classes
+		for (DeobfClsInfo deobfClsInfo : deobfuscator.getClsMap().values()) {
+			if (deobfClsInfo.getAlias() != null) {
+				list.add(String.format("c %s = %s",
+						deobfClsInfo.getCls().getClassInfo().makeRawFullName(), deobfClsInfo.getAlias()));
+			}
+		}
+		for (FieldInfo fld : deobfuscator.getFldMap().keySet()) {
+			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.getRawFullId(), mth.getAlias()));
+		}
+		Collections.sort(list);
+		FileUtils.writeLines(deobfMapFile, MAP_FILE_CHARSET, list);
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("Deobfuscation map file saved as: {}", deobfMapFile);
+		}
+	}
+
+	private static void dfsPackageName(List<String> list, String prefix, PackageNode node) {
+		for (PackageNode pp : node.getInnerPackages()) {
+			dfsPackageName(list, prefix + '.' + node.getName(), pp);
+		}
+		if (node.hasAlias()) {
+			list.add(String.format("p %s.%s = %s", prefix, node.getName(), node.getAlias()));
+		}
+	}
+
+	public String getForCls(ClassInfo cls) {
+		return clsPresetMap.get(cls.makeRawFullName());
+	}
+
+	public String getForFld(FieldInfo fld) {
+		return fldPresetMap.get(fld.getRawFullId());
+	}
+
+	public String getForMth(MethodInfo mth) {
+		return mthPresetMap.get(mth.getRawFullId());
+	}
+
+	public void clear() {
+		clsPresetMap.clear();
+		fldPresetMap.clear();
+		mthPresetMap.clear();
+	}
+
+	public Map<String, String> getClsPresetMap() {
+		return clsPresetMap;
+	}
+
+	public Map<String, String> getFldPresetMap() {
+		return fldPresetMap;
+	}
+
+	public Map<String, String> getMthPresetMap() {
+		return mthPresetMap;
+	}
+}

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

@@ -0,0 +1,566 @@
+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;
+import jadx.core.dex.info.ClassInfo;
+import jadx.core.dex.info.FieldInfo;
+import jadx.core.dex.info.MethodInfo;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.nodes.ClassNode;
+import jadx.core.dex.nodes.DexNode;
+import jadx.core.dex.nodes.FieldNode;
+import jadx.core.dex.nodes.MethodNode;
+
+public class Deobfuscator {
+	private static final Logger LOG = LoggerFactory.getLogger(Deobfuscator.class);
+
+	private static final boolean DEBUG = false;
+
+	public static final String CLASS_NAME_SEPARATOR = ".";
+	public static final String INNER_CLASS_SEPARATOR = "$";
+
+	private final JadxArgs args;
+	@NotNull
+	private final List<DexNode> dexNodes;
+	private final DeobfPresets deobfPresets;
+
+	private final Map<ClassInfo, DeobfClsInfo> clsMap = new HashMap<>();
+	private final Map<FieldInfo, String> fldMap = new HashMap<>();
+	private final Map<MethodInfo, String> mthMap = new HashMap<>();
+
+	private final Map<MethodInfo, OverridedMethodsNode> ovrdMap = new HashMap<>();
+	private final List<OverridedMethodsNode> ovrd = new ArrayList<>();
+
+	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;
+	private final boolean useSourceNameAsAlias;
+
+	private int pkgIndex = 0;
+	private int clsIndex = 0;
+	private int fldIndex = 0;
+	private int mthIndex = 0;
+
+	public Deobfuscator(JadxArgs args, @NotNull List<DexNode> dexNodes, File deobfMapFile) {
+		this.args = args;
+		this.dexNodes = dexNodes;
+
+		this.minLength = args.getDeobfuscationMinLength();
+		this.maxLength = args.getDeobfuscationMaxLength();
+		this.useSourceNameAsAlias = args.isUseSourceNameAsClassAlias();
+
+		this.deobfPresets = new DeobfPresets(this, deobfMapFile);
+	}
+
+	public void execute() {
+		if (!args.isDeobfuscationForceSave()) {
+			deobfPresets.load();
+			initIndexes();
+		}
+		process();
+		deobfPresets.save(args.isDeobfuscationForceSave());
+		clear();
+	}
+
+	private void initIndexes() {
+		pkgIndex = pkgSet.size();
+		clsIndex = deobfPresets.getClsPresetMap().size();
+		fldIndex = deobfPresets.getFldPresetMap().size();
+		mthIndex = deobfPresets.getMthPresetMap().size();
+	}
+
+	private void preProcess() {
+		for (DexNode dexNode : dexNodes) {
+			for (ClassNode cls : dexNode.getClasses()) {
+				Collections.addAll(reservedClsNames, cls.getPackage().split("\\."));
+			}
+		}
+		for (DexNode dexNode : dexNodes) {
+			for (ClassNode cls : dexNode.getClasses()) {
+				preProcessClass(cls);
+			}
+		}
+	}
+
+	private void process() {
+		preProcess();
+		if (DEBUG) {
+			dumpAlias();
+		}
+		for (DexNode dexNode : dexNodes) {
+			for (ClassNode cls : dexNode.getClasses()) {
+				processClass(cls);
+			}
+		}
+		postProcess();
+	}
+
+	private void postProcess() {
+		int id = 1;
+		for (OverridedMethodsNode o : ovrd) {
+			boolean aliasFromPreset = false;
+			String aliasToUse = null;
+			for (MethodInfo mth : o.getMethods()) {
+				if (mth.isAliasFromPreset()) {
+					aliasToUse = mth.getAlias();
+					aliasFromPreset = true;
+				}
+			}
+			for (MethodInfo mth : o.getMethods()) {
+				if (aliasToUse == null) {
+					if (mth.isRenamed() && !mth.isAliasFromPreset()) {
+						mth.setAlias(String.format("mo%d%s", id, prepareNamePart(mth.getName())));
+					}
+					aliasToUse = mth.getAlias();
+				}
+				mth.setAlias(aliasToUse);
+				mth.setAliasFromPreset(aliasFromPreset);
+			}
+			id++;
+		}
+	}
+
+	void clear() {
+		deobfPresets.clear();
+		clsMap.clear();
+		fldMap.clear();
+		mthMap.clear();
+
+		ovrd.clear();
+		ovrdMap.clear();
+	}
+
+	private void resolveOverriding(MethodNode mth) {
+		Set<ClassNode> clsParents = new LinkedHashSet<>();
+		collectClassHierarchy(mth.getParentClass(), clsParents);
+
+		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);
+			}
+		}
+		if (overrideSet.isEmpty()) {
+			return;
+		}
+		OverridedMethodsNode overrideNode = getOverrideMethodsNode(overrideSet);
+		if (overrideNode == null) {
+			overrideNode = new OverridedMethodsNode(overrideSet);
+			ovrd.add(overrideNode);
+		}
+		for (MethodInfo overrideMth : overrideSet) {
+			if (!ovrdMap.containsKey(overrideMth)) {
+				ovrdMap.put(overrideMth, overrideNode);
+				overrideNode.add(overrideMth);
+			}
+		}
+	}
+
+	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(cls.dex().root(), fullName);
+		}
+		for (FieldNode field : cls.getFields()) {
+			renameField(field);
+		}
+		for (MethodNode mth : cls.getMethods()) {
+			renameMethod(mth);
+		}
+		for (ClassNode innerCls : cls.getInnerClasses()) {
+			processClass(innerCls);
+		}
+	}
+
+	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);
+		}
+	}
+
+	public void addPackagePreset(String origPkgName, String pkgAlias) {
+		PackageNode pkg = getPackageNode(origPkgName, true);
+		pkg.setAlias(pkgAlias);
+	}
+
+	/**
+	 * Gets package node for full package name
+	 *
+	 * @param fullPkgName full package name
+	 * @param create      if {@code true} then will create all absent objects
+	 * @return package node object or {@code null} if no package found and <b>create</b> set to {@code false}
+	 */
+	private PackageNode getPackageNode(String fullPkgName, boolean create) {
+		if (fullPkgName.isEmpty() || fullPkgName.equals(CLASS_NAME_SEPARATOR)) {
+			return rootPackage;
+		}
+		PackageNode result = rootPackage;
+		PackageNode parentNode;
+		do {
+			String pkgName;
+			int idx = fullPkgName.indexOf(CLASS_NAME_SEPARATOR);
+
+			if (idx > -1) {
+				pkgName = fullPkgName.substring(0, idx);
+				fullPkgName = fullPkgName.substring(idx + 1);
+			} else {
+				pkgName = fullPkgName;
+				fullPkgName = "";
+			}
+			parentNode = result;
+			result = result.getInnerPackageByName(pkgName);
+			if (result == null && create) {
+				result = new PackageNode(pkgName);
+				parentNode.addInnerPackage(result);
+			}
+		} while (!fullPkgName.isEmpty() && result != null);
+
+		return result;
+	}
+
+	String getNameWithoutPackage(ClassInfo clsInfo) {
+		String prefix;
+		ClassInfo parentClsInfo = clsInfo.getParentClass();
+		if (parentClsInfo != null) {
+			DeobfClsInfo parentDeobfClsInfo = clsMap.get(parentClsInfo);
+			if (parentDeobfClsInfo != null) {
+				prefix = parentDeobfClsInfo.makeNameWithoutPkg();
+			} else {
+				prefix = getNameWithoutPackage(parentClsInfo);
+			}
+			prefix += INNER_CLASS_SEPARATOR;
+		} else {
+			prefix = "";
+		}
+		return prefix + clsInfo.getShortName();
+	}
+
+	private void preProcessClass(ClassNode cls) {
+		ClassInfo classInfo = cls.getClassInfo();
+		String pkgFullName = classInfo.getPackage();
+		PackageNode pkg = getPackageNode(pkgFullName, true);
+		doPkg(pkg, pkgFullName);
+
+		String alias = deobfPresets.getForCls(classInfo);
+		if (alias != null) {
+			clsMap.put(classInfo, new DeobfClsInfo(this, cls, pkg, alias));
+		} else {
+			if (!clsMap.containsKey(classInfo)) {
+				String clsShortName = classInfo.getShortName();
+				if (shouldRename(clsShortName) || reservedClsNames.contains(clsShortName)) {
+					makeClsAlias(cls);
+				}
+			}
+		}
+		for (ClassNode innerCls : cls.getInnerClasses()) {
+			preProcessClass(innerCls);
+		}
+	}
+
+	public String getClsAlias(ClassNode cls) {
+		DeobfClsInfo deobfClsInfo = clsMap.get(cls.getClassInfo());
+		if (deobfClsInfo != null) {
+			return deobfClsInfo.getAlias();
+		}
+		return makeClsAlias(cls);
+	}
+
+	private String makeClsAlias(ClassNode cls) {
+		ClassInfo classInfo = cls.getClassInfo();
+		String alias = null;
+
+		if (this.useSourceNameAsAlias) {
+			alias = getAliasFromSourceFile(cls);
+		}
+
+		if (alias == null) {
+			String clsName = classInfo.getShortName();
+			alias = String.format("C%04d%s", clsIndex++, prepareNamePart(clsName));
+		}
+		PackageNode pkg = getPackageNode(classInfo.getPackage(), true);
+		clsMap.put(classInfo, new DeobfClsInfo(this, cls, pkg, alias));
+		return alias;
+	}
+
+	@Nullable
+	private String getAliasFromSourceFile(ClassNode cls) {
+		SourceFileAttr sourceFileAttr = cls.get(AType.SOURCE_FILE);
+		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)) {
+			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
+	private String getFieldAlias(FieldNode field) {
+		FieldInfo fieldInfo = field.getFieldInfo();
+		String alias = fldMap.get(fieldInfo);
+		if (alias != null) {
+			return alias;
+		}
+		alias = deobfPresets.getForFld(fieldInfo);
+		if (alias != null) {
+			fldMap.put(fieldInfo, alias);
+			return alias;
+		}
+		if (shouldRename(field.getName())) {
+			return makeFieldAlias(field);
+		}
+		return null;
+	}
+
+	@Nullable
+	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;
+		}
+		alias = deobfPresets.getForMth(methodInfo);
+		if (alias != null) {
+			mthMap.put(methodInfo, alias);
+			methodInfo.setAliasFromPreset(true);
+			return alias;
+		}
+		if (shouldRename(mth.getName())) {
+			return makeMethodAlias(mth);
+		}
+		return null;
+	}
+
+	public String makeFieldAlias(FieldNode field) {
+		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++, prepareNamePart(mth.getName()));
+		mthMap.put(mth.getMethodInfo(), alias);
+		return alias;
+	}
+
+	private void doPkg(PackageNode pkg, String fullName) {
+		if (pkgSet.contains(fullName)) {
+			return;
+		}
+		pkgSet.add(fullName);
+
+		// doPkg for all parent packages except root that not hasAliases
+		PackageNode parentPkg = pkg.getParentPackage();
+		while (!parentPkg.getName().isEmpty()) {
+			if (!parentPkg.hasAlias()) {
+				doPkg(parentPkg, parentPkg.getFullName());
+			}
+			parentPkg = parentPkg.getParentPackage();
+		}
+
+		String pkgName = pkg.getName();
+		if (!pkg.hasAlias() && shouldRename(pkgName)) {
+			String pkgAlias = String.format("p%03d%s", pkgIndex++, prepareNamePart(pkgName));
+			pkg.setAlias(pkgAlias);
+		}
+	}
+
+	private boolean shouldRename(String s) {
+		int len = s.length();
+		return len < minLength || len > maxLength
+				|| !NameMapper.isValidIdentifier(s);
+	}
+
+	private String prepareNamePart(String name) {
+		if (name.length() > maxLength) {
+			return "x" + Integer.toHexString(name.hashCode());
+		}
+		if (!NameMapper.isAllCharsPrintable(name)) {
+			return removeInvalidChars(name);
+		}
+		return name;
+	}
+
+	private String removeInvalidChars(String name) {
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < name.length(); i++) {
+			int ch = name.charAt(i);
+			if (NameMapper.isPrintableChar(ch)) {
+				sb.append((char) ch);
+			}
+		}
+		return sb.toString();
+	}
+
+	private void dumpClassAlias(ClassNode cls) {
+		PackageNode pkg = getPackageNode(cls.getPackage(), false);
+
+		if (pkg != null) {
+			if (!cls.getFullName().equals(getClassFullName(cls))) {
+				LOG.info("Alias name for class '{}' is '{}'", cls.getFullName(), getClassFullName(cls));
+			}
+		} else {
+			LOG.error("Can't find package node for '{}'", cls.getPackage());
+		}
+	}
+
+	private void dumpAlias() {
+		for (DexNode dexNode : dexNodes) {
+			for (ClassNode cls : dexNode.getClasses()) {
+				dumpClassAlias(cls);
+			}
+		}
+	}
+
+	private String getPackageName(String packageName) {
+		PackageNode pkg = getPackageNode(packageName, false);
+		if (pkg != null) {
+			return pkg.getFullAlias();
+		}
+		return packageName;
+	}
+
+	private String getClassName(ClassInfo clsInfo) {
+		DeobfClsInfo deobfClsInfo = clsMap.get(clsInfo);
+		if (deobfClsInfo != null) {
+			return deobfClsInfo.makeNameWithoutPkg();
+		}
+		return getNameWithoutPackage(clsInfo);
+	}
+
+	private String getClassFullName(ClassNode cls) {
+		return getClassFullName(cls.getClassInfo());
+	}
+
+	private String getClassFullName(ClassInfo clsInfo) {
+		DeobfClsInfo deobfClsInfo = clsMap.get(clsInfo);
+		if (deobfClsInfo != null) {
+			return deobfClsInfo.getFullName();
+		}
+		return getPackageName(clsInfo.getPackage()) + CLASS_NAME_SEPARATOR + getClassName(clsInfo);
+	}
+
+	public Map<ClassInfo, DeobfClsInfo> getClsMap() {
+		return clsMap;
+	}
+
+	public Map<FieldInfo, String> getFldMap() {
+		return fldMap;
+	}
+
+	public Map<MethodInfo, String> getMthMap() {
+		return mthMap;
+	}
+
+	public PackageNode getRootPackage() {
+		return rootPackage;
+	}
+}

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

@@ -0,0 +1,110 @@
+package jadx.core.deobf;
+
+import java.util.Arrays;
+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(
+			"\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*");
+
+	private static final Pattern VALID_JAVA_FULL_IDENTIFIER = Pattern.compile(
+			"(" + VALID_JAVA_IDENTIFIER + "\\.)*" + VALID_JAVA_IDENTIFIER);
+
+	private static final Set<String> RESERVED_NAMES = new HashSet<>(
+			Arrays.asList(
+					"abstract",
+					"assert",
+					"boolean",
+					"break",
+					"byte",
+					"case",
+					"catch",
+					"char",
+					"class",
+					"const",
+					"continue",
+					"default",
+					"do",
+					"double",
+					"else",
+					"enum",
+					"extends",
+					"false",
+					"final",
+					"finally",
+					"float",
+					"for",
+					"goto",
+					"if",
+					"implements",
+					"import",
+					"instanceof",
+					"int",
+					"interface",
+					"long",
+					"native",
+					"new",
+					"null",
+					"package",
+					"private",
+					"protected",
+					"public",
+					"return",
+					"short",
+					"static",
+					"strictfp",
+					"super",
+					"switch",
+					"synchronized",
+					"this",
+					"throw",
+					"throws",
+					"transient",
+					"true",
+					"try",
+					"void",
+					"volatile",
+					"while"
+			)
+	);
+
+	public static boolean isReserved(String str) {
+		return RESERVED_NAMES.contains(str);
+	}
+
+	public static boolean isValidIdentifier(String str) {
+		return notEmpty(str)
+				&& !isReserved(str)
+				&& VALID_JAVA_IDENTIFIER.matcher(str).matches()
+				&& isAllCharsPrintable(str);
+	}
+
+	public static boolean isValidFullIdentifier(String str) {
+		return notEmpty(str)
+				&& !isReserved(str)
+				&& VALID_JAVA_FULL_IDENTIFIER.matcher(str).matches()
+				&& isAllCharsPrintable(str);
+	}
+
+	public static boolean isPrintableChar(int c) {
+		return 32 <= c && c <= 126;
+	}
+
+	public static boolean isAllCharsPrintable(String str) {
+		int len = str.length();
+		for (int i = 0; i < len; i++) {
+			if (!isPrintableChar(str.charAt(i))) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private NameMapper() {
+	}
+}

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

@@ -0,0 +1,26 @@
+package jadx.core.deobf;
+
+import java.util.Set;
+
+import jadx.core.dex.info.MethodInfo;
+
+class OverridedMethodsNode {
+
+	private Set<MethodInfo> methods;
+
+	public OverridedMethodsNode(Set<MethodInfo> methodsSet) {
+		methods = methodsSet;
+	}
+
+	public boolean contains(MethodInfo mth) {
+		return methods.contains(mth);
+	}
+
+	public void add(MethodInfo mth) {
+		methods.add(mth);
+	}
+
+	public Set<MethodInfo> getMethods() {
+		return methods;
+	}
+}

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

@@ -0,0 +1,130 @@
+package jadx.core.deobf;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.List;
+
+public class PackageNode {
+
+	private static final char SEPARATOR_CHAR = '.';
+
+	private PackageNode parentPackage;
+	private List<PackageNode> innerPackages = Collections.emptyList();
+
+	private final String packageName;
+	private String packageAlias;
+
+	private String cachedPackageFullName;
+	private String cachedPackageFullAlias;
+
+	public PackageNode(String packageName) {
+		this.packageName = packageName;
+		this.parentPackage = this;
+	}
+
+	public String getName() {
+		return packageName;
+	}
+
+	public String getFullName() {
+		if (cachedPackageFullName == null) {
+			Deque<PackageNode> pp = getParentPackages();
+
+			StringBuilder result = new StringBuilder();
+			result.append(pp.pop().getName());
+			while (!pp.isEmpty()) {
+				result.append(SEPARATOR_CHAR);
+				result.append(pp.pop().getName());
+			}
+			cachedPackageFullName = result.toString();
+		}
+		return cachedPackageFullName;
+	}
+
+	public String getAlias() {
+		if (packageAlias != null) {
+			return packageAlias;
+		}
+		return packageName;
+	}
+
+	public void setAlias(String alias) {
+		packageAlias = alias;
+	}
+
+	public boolean hasAlias() {
+		return packageAlias != null;
+	}
+
+	public String getFullAlias() {
+		if (cachedPackageFullAlias == null) {
+			Deque<PackageNode> pp = getParentPackages();
+			StringBuilder result = new StringBuilder();
+
+			if (!pp.isEmpty()) {
+				result.append(pp.pop().getAlias());
+				while (!pp.isEmpty()) {
+					result.append(SEPARATOR_CHAR);
+					result.append(pp.pop().getAlias());
+				}
+			} else {
+				result.append(this.getAlias());
+			}
+			cachedPackageFullAlias = result.toString();
+		}
+		return cachedPackageFullAlias;
+	}
+
+	public PackageNode getParentPackage() {
+		return parentPackage;
+	}
+
+	public List<PackageNode> getInnerPackages() {
+		return innerPackages;
+	}
+
+	public void addInnerPackage(PackageNode pkg) {
+		if (innerPackages.isEmpty()) {
+			innerPackages = new ArrayList<>();
+		}
+		innerPackages.add(pkg);
+		pkg.parentPackage = this;
+	}
+
+	/**
+	 * Gets inner package node by name
+	 *
+	 * @param name inner package name
+	 * @return package node or {@code null}
+	 */
+	public PackageNode getInnerPackageByName(String name) {
+		PackageNode result = null;
+		for (PackageNode p : innerPackages) {
+			if (p.getName().equals(name)) {
+				result = p;
+				break;
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Fills stack with parent packages exclude root node
+	 *
+	 * @return stack with parent packages
+	 */
+	private Deque<PackageNode> getParentPackages() {
+		Deque<PackageNode> pp = new ArrayDeque<>();
+
+		PackageNode currentPkg = this;
+		PackageNode parentPkg = currentPkg.getParentPackage();
+		while (currentPkg != parentPkg) {
+			pp.push(currentPkg);
+			currentPkg = parentPkg;
+			parentPkg = currentPkg.getParentPackage();
+		}
+		return pp;
+	}
+}

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

@@ -0,0 +1,39 @@
+package jadx.core.dex.attributes;
+
+public enum AFlag {
+	TRY_ENTER,
+	TRY_LEAVE,
+
+	LOOP_START,
+	LOOP_END,
+
+	SYNTHETIC,
+	FINAL, // SSAVar attribute for make var final
+
+	RETURN, // block contains only return instruction
+	ORIG_RETURN,
+
+	DECLARE_VAR,
+	DONT_WRAP,
+
+	DONT_SHRINK,
+	DONT_INLINE,
+	DONT_GENERATE,
+	SKIP,
+	REMOVE,
+
+	SKIP_FIRST_ARG,
+	SKIP_ARG, // skip argument in invoke call
+	ANONYMOUS_CONSTRUCTOR,
+	ANONYMOUS_CLASS,
+	THIS,
+
+	ELSE_IF_CHAIN,
+
+	WRAPPED,
+	ARITH_ONEARG,
+
+	FALL_THROUGH,
+
+	INCONSISTENT_CODE, // warning about incorrect decompilation
+}

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

@@ -0,0 +1,60 @@
+package jadx.core.dex.attributes;
+
+import jadx.core.dex.attributes.annotations.AnnotationsList;
+import jadx.core.dex.attributes.annotations.MethodParameters;
+import jadx.core.dex.attributes.nodes.DeclareVariablesAttr;
+import jadx.core.dex.attributes.nodes.EdgeInsnAttr;
+import jadx.core.dex.attributes.nodes.EnumClassAttr;
+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.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;
+import jadx.core.dex.attributes.nodes.MethodInlineAttr;
+import jadx.core.dex.attributes.nodes.PhiListAttr;
+import jadx.core.dex.attributes.nodes.SourceFileAttr;
+import jadx.core.dex.nodes.parser.FieldInitAttr;
+import jadx.core.dex.trycatch.CatchAttr;
+import jadx.core.dex.trycatch.ExcHandlerAttr;
+import jadx.core.dex.trycatch.SplitterBlockAttr;
+
+/**
+ * Attribute types enumeration,
+ * uses generic type for omit cast after 'AttributeStorage.get' method
+ *
+ * @param <T> attribute class implementation
+ */
+public class AType<T extends IAttribute> {
+
+	public static final AType<AttrList<JumpInfo>> JUMP = new AType<>();
+	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<MethodInlineAttr> METHOD_INLINE = new AType<>();
+	public static final AType<EnumClassAttr> ENUM_CLASS = new AType<>();
+	public static final AType<EnumMapAttr> ENUM_MAP = new AType<>();
+	public static final AType<AnnotationsList> ANNOTATION_LIST = new AType<>();
+	public static final AType<MethodParameters> ANNOTATION_MTH_PARAMETERS = new AType<>();
+	public static final AType<PhiListAttr> PHI_LIST = new AType<>();
+	public static final AType<SourceFileAttr> SOURCE_FILE = new AType<>();
+	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

@@ -0,0 +1,30 @@
+package jadx.core.dex.attributes;
+
+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 ArrayList<>();
+
+	public AttrList(AType<AttrList<T>> type) {
+		this.type = type;
+	}
+
+	public List<T> getList() {
+		return list;
+	}
+
+	@Override
+	public AType<AttrList<T>> getType() {
+		return type;
+	}
+
+	@Override
+	public String toString() {
+		return Utils.listToString(list);
+	}
+}

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

@@ -0,0 +1,103 @@
+package jadx.core.dex.attributes;
+
+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();
+
+	private AttributeStorage storage = EMPTY_ATTR_STORAGE;
+
+	@Override
+	public void add(AFlag flag) {
+		initStorage().add(flag);
+	}
+
+	@Override
+	public void addAttr(IAttribute attr) {
+		initStorage().add(attr);
+	}
+
+	@Override
+	public <T> void addAttr(AType<AttrList<T>> type, T obj) {
+		initStorage().add(type, obj);
+	}
+
+	@Override
+	public void copyAttributesFrom(AttrNode attrNode) {
+		AttributeStorage copyFrom = attrNode.storage;
+		if (!copyFrom.isEmpty()) {
+			initStorage().addAll(copyFrom);
+		}
+	}
+
+	private AttributeStorage initStorage() {
+		AttributeStorage store = storage;
+		if (store == EMPTY_ATTR_STORAGE) {
+			store = new AttributeStorage();
+			storage = store;
+		}
+		return store;
+	}
+
+	@Override
+	public boolean contains(AFlag flag) {
+		return storage.contains(flag);
+	}
+
+	@Override
+	public <T extends IAttribute> boolean contains(AType<T> type) {
+		return storage.contains(type);
+	}
+
+	@Override
+	public <T extends IAttribute> T get(AType<T> type) {
+		return storage.get(type);
+	}
+
+	@Override
+	public Annotation getAnnotation(String cls) {
+		return storage.getAnnotation(cls);
+	}
+
+	@Override
+	public <T> List<T> getAll(AType<AttrList<T>> type) {
+		return storage.getAll(type);
+	}
+
+	@Override
+	public void remove(AFlag flag) {
+		storage.remove(flag);
+	}
+
+	@Override
+	public <T extends IAttribute> void remove(AType<T> type) {
+		storage.remove(type);
+	}
+
+	@Override
+	public void removeAttr(IAttribute attr) {
+		storage.remove(attr);
+	}
+
+	@Override
+	public void clearAttributes() {
+		storage.clear();
+	}
+
+	@Override
+	public List<String> getAttributesStringsList() {
+		return storage.getAttributeStrings();
+	}
+
+	@Override
+	public String getAttributesString() {
+		return storage.toString();
+	}
+
+	public boolean isAttrStorageEmpty() {
+		return storage.isEmpty();
+	}
+}

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

@@ -0,0 +1,126 @@
+package jadx.core.dex.attributes;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.IdentityHashMap;
+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)
+ * 2. attribute - class instance associated with attribute type.
+ */
+public class AttributeStorage {
+
+	private final Set<AFlag> flags;
+	private final Map<AType<?>, IAttribute> attributes;
+
+	public AttributeStorage() {
+		flags = EnumSet.noneOf(AFlag.class);
+		attributes = new IdentityHashMap<>();
+	}
+
+	public void add(AFlag flag) {
+		flags.add(flag);
+	}
+
+	public void add(IAttribute attr) {
+		attributes.put(attr.getType(), attr);
+	}
+
+	public <T> void add(AType<AttrList<T>> type, T obj) {
+		AttrList<T> list = get(type);
+		if (list == null) {
+			list = new AttrList<>(type);
+			add(list);
+		}
+		list.getList().add(obj);
+	}
+
+	public void addAll(AttributeStorage otherList) {
+		flags.addAll(otherList.flags);
+		attributes.putAll(otherList.attributes);
+	}
+
+	public boolean contains(AFlag flag) {
+		return flags.contains(flag);
+	}
+
+	public <T extends IAttribute> boolean contains(AType<T> type) {
+		return attributes.containsKey(type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public <T extends IAttribute> T get(AType<T> type) {
+		return (T) attributes.get(type);
+	}
+
+	public Annotation getAnnotation(String cls) {
+		AnnotationsList aList = get(AType.ANNOTATION_LIST);
+		return aList == null ? null : aList.get(cls);
+	}
+
+	public <T> List<T> getAll(AType<AttrList<T>> type) {
+		AttrList<T> attrList = get(type);
+		if (attrList == null) {
+			return Collections.emptyList();
+		}
+		return Collections.unmodifiableList(attrList.getList());
+	}
+
+	public void remove(AFlag flag) {
+		flags.remove(flag);
+	}
+
+	public <T extends IAttribute> void remove(AType<T> type) {
+		attributes.remove(type);
+	}
+
+	public void remove(IAttribute attr) {
+		AType<? extends IAttribute> type = attr.getType();
+		IAttribute a = attributes.get(type);
+		if (a == attr) {
+			attributes.remove(type);
+		}
+	}
+
+	public void clear() {
+		flags.clear();
+		attributes.clear();
+	}
+
+	public List<String> getAttributeStrings() {
+		int size = flags.size() + attributes.size() + attributes.size();
+		if (size == 0) {
+			return Collections.emptyList();
+		}
+		List<String> list = new ArrayList<>(size);
+		for (AFlag a : flags) {
+			list.add(a.toString());
+		}
+		for (IAttribute a : attributes.values()) {
+			list.add(a.toString());
+		}
+		return list;
+	}
+
+	public boolean isEmpty() {
+		return flags.isEmpty() && attributes.isEmpty();
+	}
+
+	@Override
+	public String toString() {
+		List<String> list = getAttributeStrings();
+		if (list.isEmpty()) {
+			return "";
+		}
+		return "A:{" + Utils.listToString(list) + "}";
+	}
+}

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

@@ -0,0 +1,69 @@
+package jadx.core.dex.attributes;
+
+import java.util.Collections;
+import java.util.List;
+
+import jadx.core.dex.attributes.annotations.Annotation;
+
+public final class EmptyAttrStorage extends AttributeStorage {
+
+	@Override
+	public boolean contains(AFlag flag) {
+		return false;
+	}
+
+	@Override
+	public <T extends IAttribute> boolean contains(AType<T> type) {
+		return false;
+	}
+
+	@Override
+	public <T extends IAttribute> T get(AType<T> type) {
+		return null;
+	}
+
+	@Override
+	public Annotation getAnnotation(String cls) {
+		return null;
+	}
+
+	@Override
+	public <T> List<T> getAll(AType<AttrList<T>> type) {
+		return Collections.emptyList();
+	}
+
+	@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
+	public List<String> getAttributeStrings() {
+		return Collections.emptyList();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "";
+	}
+}

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

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

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

@@ -0,0 +1,38 @@
+package jadx.core.dex.attributes;
+
+import java.util.List;
+
+import jadx.core.dex.attributes.annotations.Annotation;
+
+public interface IAttributeNode {
+
+	void add(AFlag flag);
+
+	void addAttr(IAttribute attr);
+
+	<T> void addAttr(AType<AttrList<T>> type, T obj);
+
+	void copyAttributesFrom(AttrNode attrNode);
+
+	boolean contains(AFlag flag);
+
+	<T extends IAttribute> boolean contains(AType<T> type);
+
+	<T extends IAttribute> T get(AType<T> type);
+
+	Annotation getAnnotation(String cls);
+
+	<T> List<T> getAll(AType<AttrList<T>> type);
+
+	void remove(AFlag flag);
+
+	<T extends IAttribute> void remove(AType<T> type);
+
+	void removeAttr(IAttribute attr);
+
+	void clearAttributes();
+
+	List<String> getAttributesStringsList();
+
+	String getAttributesString();
+}

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

@@ -1,12 +1,12 @@
-package jadx.dex.attributes.annotations;
-
-import jadx.dex.instructions.args.ArgType;
+package jadx.core.dex.attributes.annotations;
 
 import java.util.Map;
 
+import jadx.core.dex.instructions.args.ArgType;
+
 public class Annotation {
 
-	public static enum Visibility {
+	public enum Visibility {
 		BUILD, RUNTIME, SYSTEM
 	}
 
@@ -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,20 +1,23 @@
-package jadx.dex.attributes.annotations;
-
-import jadx.dex.attributes.AttributeType;
-import jadx.dex.attributes.IAttribute;
-import jadx.utils.Utils;
+package jadx.core.dex.attributes.annotations;
 
 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());
+
 	private final Map<String, Annotation> map;
 
 	public AnnotationsList(List<Annotation> anList) {
-		map = new HashMap<String, Annotation>(anList.size());
+		map = new HashMap<>(anList.size());
 		for (Annotation a : anList) {
 			map.put(a.getAnnotationClass(), a);
 		}
@@ -32,14 +35,17 @@ public class AnnotationsList implements IAttribute {
 		return map.size();
 	}
 
+	public boolean isEmpty() {
+		return map.isEmpty();
+	}
+
 	@Override
-	public AttributeType getType() {
-		return AttributeType.ANNOTATION_LIST;
+	public AType<AnnotationsList> getType() {
+		return AType.ANNOTATION_LIST;
 	}
 
 	@Override
 	public String toString() {
 		return Utils.listToString(map.values());
 	}
-
 }

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

@@ -1,18 +1,18 @@
-package jadx.dex.attributes.annotations;
-
-import jadx.dex.attributes.AttributeType;
-import jadx.dex.attributes.IAttribute;
-import jadx.utils.Utils;
+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;
+
 public class MethodParameters implements IAttribute {
 
 	private final List<AnnotationsList> paramList;
 
 	public MethodParameters(int paramCount) {
-		paramList = new ArrayList<AnnotationsList>(paramCount);
+		paramList = new ArrayList<>(paramCount);
 	}
 
 	public List<AnnotationsList> getParamList() {
@@ -20,13 +20,12 @@ public class MethodParameters implements IAttribute {
 	}
 
 	@Override
-	public AttributeType getType() {
-		return AttributeType.ANNOTATION_MTH_PARAMETERS;
+	public AType<MethodParameters> getType() {
+		return AType.ANNOTATION_MTH_PARAMETERS;
 	}
 
 	@Override
 	public String toString() {
 		return Utils.listToString(paramList);
 	}
-
 }

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

@@ -0,0 +1,35 @@
+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;
+
+/**
+ * List of variables to be declared at region start.
+ */
+public class DeclareVariablesAttr implements IAttribute {
+
+	private final List<RegisterArg> vars = new LinkedList<>();
+
+	public Iterable<RegisterArg> getVars() {
+		return vars;
+	}
+
+	public void addVar(RegisterArg arg) {
+		vars.add(arg);
+	}
+
+	@Override
+	public AType<DeclareVariablesAttr> getType() {
+		return AType.DECLARE_VARIABLES;
+	}
+
+	@Override
+	public String toString() {
+		return "DECL_VAR: " + Utils.listToString(vars);
+	}
+}

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

@@ -0,0 +1,48 @@
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.AttrList;
+import jadx.core.dex.attributes.IAttribute;
+import jadx.core.dex.nodes.BlockNode;
+import jadx.core.dex.nodes.InsnNode;
+
+public class EdgeInsnAttr implements IAttribute {
+
+	private final BlockNode start;
+	private final BlockNode end;
+	private final InsnNode insn;
+
+	public static void addEdgeInsn(BlockNode start, BlockNode end, InsnNode insn) {
+		EdgeInsnAttr edgeInsnAttr = new EdgeInsnAttr(start, end, insn);
+		start.addAttr(AType.EDGE_INSN, edgeInsnAttr);
+		end.addAttr(AType.EDGE_INSN, edgeInsnAttr);
+	}
+
+	public EdgeInsnAttr(BlockNode start, BlockNode end, InsnNode insn) {
+		this.start = start;
+		this.end = end;
+		this.insn = insn;
+	}
+
+	@Override
+	public AType<AttrList<EdgeInsnAttr>> getType() {
+		return AType.EDGE_INSN;
+	}
+
+	public BlockNode getStart() {
+		return start;
+	}
+
+	public BlockNode getEnd() {
+		return end;
+	}
+
+	public InsnNode getInsn() {
+		return insn;
+	}
+
+	@Override
+	public String toString() {
+		return "EDGE_INSN: " + start + "->" + end + " " + insn;
+	}
+}

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

@@ -0,0 +1,81 @@
+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;
+import jadx.core.dex.instructions.mods.ConstructorInsn;
+import jadx.core.dex.nodes.ClassNode;
+import jadx.core.dex.nodes.MethodNode;
+
+public class EnumClassAttr implements IAttribute {
+
+	public static class EnumField {
+		private final FieldInfo field;
+		private final ConstructorInsn constrInsn;
+		private final int startArg;
+		private ClassNode cls;
+
+		public EnumField(FieldInfo field, ConstructorInsn co, int startArg) {
+			this.field = field;
+			this.constrInsn = co;
+			this.startArg = startArg;
+		}
+
+		public FieldInfo getField() {
+			return field;
+		}
+
+		public ConstructorInsn getConstrInsn() {
+			return constrInsn;
+		}
+
+		public int getStartArg() {
+			return startArg;
+		}
+
+		public ClassNode getCls() {
+			return cls;
+		}
+
+		public void setCls(ClassNode cls) {
+			this.cls = cls;
+		}
+
+		@Override
+		public String toString() {
+			return field + "(" + constrInsn + ") " + cls;
+		}
+	}
+
+	private final List<EnumField> fields;
+	private MethodNode staticMethod;
+
+	public EnumClassAttr(int fieldsCount) {
+		this.fields = new ArrayList<>(fieldsCount);
+	}
+
+	public List<EnumField> getFields() {
+		return fields;
+	}
+
+	public MethodNode getStaticMethod() {
+		return staticMethod;
+	}
+
+	public void setStaticMethod(MethodNode staticMethod) {
+		this.staticMethod = staticMethod;
+	}
+
+	@Override
+	public AType<EnumClassAttr> getType() {
+		return AType.ENUM_CLASS;
+	}
+
+	@Override
+	public String toString() {
+		return "Enum fields: " + fields;
+	}
+}

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

@@ -0,0 +1,62 @@
+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;
+
+public class EnumMapAttr implements IAttribute {
+
+	public static class KeyValueMap {
+		private final Map<Object, Object> map = new HashMap<>();
+
+		public Object get(Object key) {
+			return map.get(key);
+		}
+
+		void put(Object key, Object value) {
+			map.put(key, value);
+		}
+	}
+
+	@Nullable
+	private Map<FieldNode, KeyValueMap> fieldsMap;
+
+	@Nullable
+	public KeyValueMap getMap(FieldNode field) {
+		if (fieldsMap == null) {
+			return null;
+		}
+		return fieldsMap.get(field);
+	}
+
+	public void add(FieldNode field, Object key, Object value) {
+		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;
+	}
+
+	@Override
+	public String toString() {
+		return "Enum fields map: " + fieldsMap;
+	}
+}

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

@@ -0,0 +1,49 @@
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
+import jadx.core.dex.info.ClassInfo;
+import jadx.core.dex.instructions.args.InsnArg;
+
+public class FieldReplaceAttr implements IAttribute {
+
+	public enum ReplaceWith {
+		CLASS_INSTANCE,
+		VAR
+	}
+
+	private final ReplaceWith replaceType;
+	private final Object replaceObj;
+
+	public FieldReplaceAttr(ClassInfo cls) {
+		this.replaceType = ReplaceWith.CLASS_INSTANCE;
+		this.replaceObj = cls;
+	}
+
+	public FieldReplaceAttr(InsnArg reg) {
+		this.replaceType = ReplaceWith.VAR;
+		this.replaceObj = reg;
+	}
+
+	public ReplaceWith getReplaceType() {
+		return replaceType;
+	}
+
+	public ClassInfo getClsRef() {
+		return (ClassInfo) replaceObj;
+	}
+
+	public InsnArg getVarRef() {
+		return (InsnArg) replaceObj;
+	}
+
+	@Override
+	public AType<FieldReplaceAttr> getType() {
+		return AType.FIELD_REPLACE;
+	}
+
+	@Override
+	public String toString() {
+		return "REPLACE: " + replaceType + " " + replaceObj;
+	}
+}

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

@@ -1,7 +1,9 @@
-package jadx.dex.attributes;
+package jadx.core.dex.attributes.nodes;
 
-import jadx.dex.nodes.InsnNode;
-import jadx.utils.Utils;
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.utils.Utils;
 
 public class ForceReturnAttr implements IAttribute {
 
@@ -16,13 +18,12 @@ public class ForceReturnAttr implements IAttribute {
 	}
 
 	@Override
-	public AttributeType getType() {
-		return AttributeType.FORCE_RETURN;
+	public AType<ForceReturnAttr> getType() {
+		return AType.FORCE_RETURN;
 	}
 
 	@Override
 	public String toString() {
 		return "FORCE_RETURN " + Utils.listToString(returnInsn.getArguments());
 	}
-
 }

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

@@ -0,0 +1,32 @@
+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;
+
+public class IgnoreEdgeAttr implements IAttribute {
+
+	private final Set<BlockNode> blocks = new HashSet<>(3);
+
+	public Set<BlockNode> getBlocks() {
+		return blocks;
+	}
+
+	public boolean contains(BlockNode block) {
+		return blocks.contains(block);
+	}
+
+	@Override
+	public AType<IgnoreEdgeAttr> getType() {
+		return AType.IGNORE_EDGE;
+	}
+
+	@Override
+	public String toString() {
+		return "IGNORE_EDGES: " + Utils.listToString(blocks);
+	}
+}

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

@@ -0,0 +1,44 @@
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.utils.Utils;
+
+public class JadxError {
+
+	private final String error;
+	private final 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 String toString() {
+		StringBuilder str = new StringBuilder();
+		str.append("JadxError: ");
+		if (error != null) {
+			str.append(error);
+			str.append(' ');
+		}
+		if (cause != null) {
+			str.append(cause.getClass());
+			str.append(":");
+			str.append(cause.getMessage());
+			str.append("\n");
+			str.append(Utils.getStackTrace(cause));
+		}
+		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/JumpInfo.java

@@ -0,0 +1,47 @@
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.utils.InsnUtils;
+
+public class JumpInfo {
+
+	private final int src;
+	private final int dest;
+
+	public JumpInfo(int src, int dest) {
+		this.src = src;
+		this.dest = dest;
+	}
+
+	public int getSrc() {
+		return src;
+	}
+
+	public int getDest() {
+		return dest;
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * dest + src;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		JumpInfo other = (JumpInfo) obj;
+		return dest == other.dest && src == other.src;
+	}
+
+	@Override
+	public String toString() {
+		return "JUMP: " + InsnUtils.formatOffset(src) + " -> " + InsnUtils.formatOffset(dest);
+	}
+}

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

@@ -0,0 +1,31 @@
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.dex.attributes.AttrNode;
+
+public abstract class LineAttrNode extends AttrNode {
+
+	private int sourceLine;
+
+	private int decompiledLine;
+
+	public int getSourceLine() {
+		return sourceLine;
+	}
+
+	public void setSourceLine(int sourceLine) {
+		this.sourceLine = sourceLine;
+	}
+
+	public int getDecompiledLine() {
+		return decompiledLine;
+	}
+
+	public void setDecompiledLine(int decompiledLine) {
+		this.decompiledLine = decompiledLine;
+	}
+
+	public void copyLines(LineAttrNode lineAttrNode) {
+		setSourceLine(lineAttrNode.getSourceLine());
+		setDecompiledLine(lineAttrNode.getDecompiledLine());
+	}
+}

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

@@ -0,0 +1,95 @@
+package jadx.core.dex.attributes.nodes;
+
+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;
+	private final BlockNode end;
+	private final Set<BlockNode> loopBlocks;
+
+	private int id;
+	private LoopInfo parentLoop;
+
+	public LoopInfo(BlockNode start, BlockNode end) {
+		this.start = start;
+		this.end = end;
+		this.loopBlocks = Collections.unmodifiableSet(BlockUtils.getAllPathsBlocks(start, end));
+	}
+
+	public BlockNode getStart() {
+		return start;
+	}
+
+	public BlockNode getEnd() {
+		return end;
+	}
+
+	public Set<BlockNode> getLoopBlocks() {
+		return loopBlocks;
+	}
+
+	/**
+	 * Return source blocks of exit edges. <br>
+	 * Exit nodes belongs to loop (contains in {@code loopBlocks})
+	 */
+	public Set<BlockNode> getExitNodes() {
+		Set<BlockNode> nodes = new HashSet<>();
+		Set<BlockNode> blocks = getLoopBlocks();
+		for (BlockNode block : blocks) {
+			// exit: successor node not from this loop, (don't change to getCleanSuccessors)
+			for (BlockNode s : block.getSuccessors()) {
+				if (!blocks.contains(s) && !s.contains(AType.EXC_HANDLER)) {
+					nodes.add(block);
+				}
+			}
+		}
+		return nodes;
+	}
+
+	/**
+	 * Return loop exit edges.
+	 */
+	public List<Edge> getExitEdges() {
+		List<Edge> edges = new LinkedList<>();
+		Set<BlockNode> blocks = getLoopBlocks();
+		for (BlockNode block : blocks) {
+			for (BlockNode s : block.getSuccessors()) {
+				if (!blocks.contains(s) && !s.contains(AType.EXC_HANDLER)) {
+					edges.add(new Edge(block, s));
+				}
+			}
+		}
+		return edges;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public LoopInfo getParentLoop() {
+		return parentLoop;
+	}
+
+	public void setParentLoop(LoopInfo parentLoop) {
+		this.parentLoop = parentLoop;
+	}
+
+	@Override
+	public String toString() {
+		return "LOOP:" + id + ": " + start + "->" + end;
+	}
+}

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

@@ -0,0 +1,27 @@
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
+
+public class LoopLabelAttr implements IAttribute {
+
+	private final LoopInfo loop;
+
+	public LoopLabelAttr(LoopInfo loop) {
+		this.loop = loop;
+	}
+
+	public LoopInfo getLoop() {
+		return loop;
+	}
+
+	@Override
+	public AType<LoopLabelAttr> getType() {
+		return AType.LOOP_LABEL;
+	}
+
+	@Override
+	public String toString() {
+		return "LOOP_LABEL: " + loop;
+	}
+}

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

@@ -1,6 +1,8 @@
-package jadx.dex.attributes;
+package jadx.core.dex.attributes.nodes;
 
-import jadx.dex.nodes.InsnNode;
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
+import jadx.core.dex.nodes.InsnNode;
 
 public class MethodInlineAttr implements IAttribute {
 
@@ -15,8 +17,8 @@ public class MethodInlineAttr implements IAttribute {
 	}
 
 	@Override
-	public AttributeType getType() {
-		return AttributeType.METHOD_INLINE;
+	public AType<MethodInlineAttr> getType() {
+		return AType.METHOD_INLINE;
 	}
 
 	@Override

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

@@ -0,0 +1,32 @@
+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;
+
+public class PhiListAttr implements IAttribute {
+
+	private final List<PhiInsn> list = new LinkedList<>();
+
+	@Override
+	public AType<PhiListAttr> getType() {
+		return AType.PHI_LIST;
+	}
+
+	public List<PhiInsn> getList() {
+		return list;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("PHI: ");
+		for (PhiInsn phiInsn : list) {
+			sb.append('r').append(phiInsn.getResult().getRegNum()).append(" ");
+		}
+		return sb.toString();
+	}
+}

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

@@ -1,4 +1,7 @@
-package jadx.dex.attributes;
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
 
 public class SourceFileAttr implements IAttribute {
 
@@ -13,8 +16,8 @@ public class SourceFileAttr implements IAttribute {
 	}
 
 	@Override
-	public AttributeType getType() {
-		return AttributeType.SOURCE_FILE;
+	public AType<SourceFileAttr> getType() {
+		return AType.SOURCE_FILE;
 	}
 
 	@Override

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

@@ -1,14 +1,15 @@
-package jadx.dex.info;
-
-import jadx.Consts;
+package jadx.core.dex.info;
 
 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 static enum AFType {
+	public enum AFType {
 		CLASS, FIELD, METHOD
 	}
 
@@ -24,17 +25,30 @@ public class AccessInfo {
 	}
 
 	public AccessInfo remove(int flag) {
-		if (containsFlag(flag))
-			return new AccessInfo(accFlags - flag, type);
-		else
+		if (containsFlag(flag)) {
+			return new AccessInfo(accFlags & ~flag, type);
+		}
+		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() {
@@ -93,80 +107,102 @@ public class AccessInfo {
 		return (accFlags & AccessFlags.ACC_VARARGS) != 0;
 	}
 
-	public int getFlags() {
-		return accFlags;
+	public boolean isSynchronized() {
+		return (accFlags & (AccessFlags.ACC_SYNCHRONIZED | AccessFlags.ACC_DECLARED_SYNCHRONIZED)) != 0;
+	}
+
+	public boolean isTransient() {
+		return (accFlags & AccessFlags.ACC_TRANSIENT) != 0;
+	}
+
+	public boolean isVolatile() {
+		return (accFlags & AccessFlags.ACC_VOLATILE) != 0;
+	}
+
+	public AFType getType() {
+		return type;
 	}
 
 	public String makeString() {
 		StringBuilder code = new StringBuilder();
-		if (isPublic())
+		if (isPublic()) {
 			code.append("public ");
-
-		if (isPrivate())
+		}
+		if (isPrivate()) {
 			code.append("private ");
-
-		if (isProtected())
+		}
+		if (isProtected()) {
 			code.append("protected ");
-
-		if (isStatic())
+		}
+		if (isStatic()) {
 			code.append("static ");
-
-		if (isFinal())
+		}
+		if (isFinal()) {
 			code.append("final ");
-
-		if (isAbstract())
+		}
+		if (isAbstract()) {
 			code.append("abstract ");
-
-		if (isNative())
+		}
+		if (isNative()) {
 			code.append("native ");
-
+		}
 		switch (type) {
 			case METHOD:
-				if ((accFlags & AccessFlags.ACC_SYNCHRONIZED) != 0)
+				if (isSynchronized()) {
 					code.append("synchronized ");
-
-				if ((accFlags & AccessFlags.ACC_DECLARED_SYNCHRONIZED) != 0)
-					code.append("synchronized ");
-
-				if (isBridge())
+				}
+				if (isBridge()) {
 					code.append("/* bridge */ ");
-
-				if (Consts.DEBUG) {
-					if (isVarArgs())
-						code.append("/* varargs */ ");
+				}
+				if (Consts.DEBUG && isVarArgs()) {
+					code.append("/* varargs */ ");
 				}
 				break;
 
 			case FIELD:
-				if ((accFlags & AccessFlags.ACC_VOLATILE) != 0)
+				if (isVolatile()) {
 					code.append("volatile ");
-
-				if ((accFlags & AccessFlags.ACC_TRANSIENT) != 0)
+				}
+				if (isTransient()) {
 					code.append("transient ");
+				}
 				break;
 
 			case CLASS:
-				if ((accFlags & AccessFlags.ACC_STRICT) != 0)
+				if ((accFlags & AccessFlags.ACC_STRICT) != 0) {
 					code.append("strict ");
-
+				}
 				if (Consts.DEBUG) {
-					if ((accFlags & AccessFlags.ACC_SUPER) != 0)
+					if ((accFlags & AccessFlags.ACC_SUPER) != 0) {
 						code.append("/* super */ ");
-
-					if ((accFlags & AccessFlags.ACC_ENUM) != 0)
+					}
+					if ((accFlags & AccessFlags.ACC_ENUM) != 0) {
 						code.append("/* enum */ ");
+					}
 				}
 				break;
 		}
-
-		if (isSynthetic())
+		if (isSynthetic()) {
 			code.append("/* synthetic */ ");
-
+		}
 		return code.toString();
 	}
 
+	public String rawString() {
+		switch (type) {
+			case CLASS:
+				return AccessFlags.classString(accFlags);
+			case FIELD:
+				return AccessFlags.fieldString(accFlags);
+			case METHOD:
+				return AccessFlags.methodString(accFlags);
+			default:
+				return "?";
+		}
+	}
+
 	@Override
 	public String toString() {
-		return "AccessInfo: " + type + " " + accFlags + " (" + makeString() + ")";
+		return "AccessInfo: " + type + " 0x" + Integer.toHexString(accFlags) + " (" + rawString() + ")";
 	}
 }

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

@@ -0,0 +1,204 @@
+package jadx.core.dex.info;
+
+import java.io.File;
+
+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;
+	private String name;
+	private String fullName;
+	// for inner class not equals null
+	private ClassInfo parentClass;
+	// class info after rename (deobfuscation)
+	private ClassInfo alias;
+
+	private ClassInfo(RootNode root, ArgType type) {
+		this(root, type, true);
+	}
+
+	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(root, inner);
+	}
+
+	public static ClassInfo fromType(RootNode root, ArgType type) {
+		if (type.isArray()) {
+			type = ArgType.OBJECT;
+		}
+		ClassInfo cls = root.getInfoStorage().getCls(type);
+		if (cls != null) {
+			return 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.root(), dex.getType(clsIndex));
+	}
+
+	public static ClassInfo fromName(RootNode root, String clsName) {
+		return fromType(root, ArgType.object(clsName));
+	}
+
+	public static ClassInfo extCls(RootNode root, ArgType type) {
+		ClassInfo classInfo = fromName(root, type.getObject());
+		return classInfo.alias;
+	}
+
+	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;
+		}
+	}
+
+	public boolean isRenamed() {
+		return alias != this;
+	}
+
+	public ClassInfo getAlias() {
+		return alias;
+	}
+
+	private void splitNames(RootNode root, boolean canBeInner) {
+		String fullObjectName = type.getObject();
+		String clsName;
+		int dot = fullObjectName.lastIndexOf('.');
+		if (dot == -1) {
+			pkg = "";
+			clsName = fullObjectName;
+		} else {
+			pkg = fullObjectName.substring(0, dot);
+			clsName = fullObjectName.substring(dot + 1);
+		}
+
+		int sep = clsName.lastIndexOf('$');
+		if (canBeInner && sep > 0 && sep != clsName.length() - 1) {
+			String parClsName = pkg + "." + clsName.substring(0, sep);
+			if (pkg.isEmpty()) {
+				parClsName = clsName.substring(0, sep);
+			}
+
+			parentClass = fromName(root, parClsName);
+			clsName = clsName.substring(sep + 1);
+		} else {
+			parentClass = null;
+		}
+		this.name = clsName;
+		this.fullName = makeFullClsName(clsName, false);
+	}
+
+	public String makeFullClsName(String shortName, boolean raw) {
+		if (parentClass != null) {
+			String innerSep = raw ? "$" : ".";
+			return parentClass.makeFullClsName(parentClass.getShortName(), raw) + innerSep + shortName;
+		}
+		return pkg.isEmpty() ? shortName : pkg + "." + shortName;
+	}
+
+	public String makeRawFullName() {
+		return makeFullClsName(this.name, true);
+	}
+
+	public String getFullPath() {
+		ClassInfo usedAlias = getAlias();
+		return usedAlias.getPackage().replace('.', File.separatorChar)
+				+ File.separatorChar
+				+ usedAlias.getNameWithoutPackage().replace('.', '_');
+	}
+
+	public String getFullName() {
+		return fullName;
+	}
+
+	public String getShortName() {
+		return name;
+	}
+
+	public String getPackage() {
+		return pkg;
+	}
+
+	public boolean isDefaultPackage() {
+		return pkg.isEmpty();
+	}
+
+	public String getRawName() {
+		return type.getObject();
+	}
+
+	public String getNameWithoutPackage() {
+		if (parentClass == null) {
+			return name;
+		}
+		return parentClass.getNameWithoutPackage() + "." + name;
+	}
+
+	public ClassInfo getParentClass() {
+		return parentClass;
+	}
+
+	public ClassInfo getTopParentClass() {
+		if (parentClass != null) {
+			ClassInfo topCls = parentClass.getTopParentClass();
+			return topCls != null ? topCls : parentClass;
+		}
+		return null;
+	}
+
+	public boolean isInner() {
+		return parentClass != null;
+	}
+
+	public void notInner(RootNode root) {
+		splitNames(root, false);
+	}
+
+	public ArgType getType() {
+		return type;
+	}
+
+	@Override
+	public String toString() {
+		return fullName;
+	}
+
+	@Override
+	public int hashCode() {
+		return type.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj instanceof ClassInfo) {
+			ClassInfo other = (ClassInfo) obj;
+			return this.type.equals(other.type);
+		}
+		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

@@ -0,0 +1,214 @@
+package jadx.core.dex.info;
+
+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 jadx.api.JadxArgs;
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.instructions.args.LiteralArg;
+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.parser.FieldInitAttr;
+import jadx.core.utils.ErrorsCounter;
+
+public class ConstStorage {
+
+	private static final class ValueStorage {
+		private final Map<Object, FieldNode> values = new HashMap<>();
+		private final Set<Object> duplicates = new HashSet<>();
+
+		public Map<Object, FieldNode> getValues() {
+			return values;
+		}
+
+		public FieldNode get(Object key) {
+			return values.get(key);
+		}
+
+		/**
+		 * @return true if this value is duplicated
+		 */
+		public boolean put(Object value, FieldNode fld) {
+			FieldNode prev = values.put(value, fld);
+			if (prev != null) {
+				values.remove(value);
+				duplicates.add(value);
+				return true;
+			}
+			if (duplicates.contains(value)) {
+				values.remove(value);
+				return true;
+			}
+			return false;
+		}
+
+		public boolean contains(Object value) {
+			return duplicates.contains(value) || values.containsKey(value);
+		}
+	}
+
+	private final boolean replaceEnabled;
+	private final ValueStorage globalValues = new ValueStorage();
+	private final Map<ClassNode, ValueStorage> classes = new HashMap<>();
+
+	private Map<Integer, String> resourcesNames = new HashMap<>();
+
+	public ConstStorage(JadxArgs args) {
+		this.replaceEnabled = args.isReplaceConsts();
+	}
+
+	public void processConstFields(ClassNode cls, List<FieldNode> staticFields) {
+		if (!replaceEnabled || staticFields.isEmpty()) {
+			return;
+		}
+		for (FieldNode f : staticFields) {
+			AccessInfo accFlags = f.getAccessFlags();
+			if (accFlags.isStatic() && accFlags.isFinal()) {
+				FieldInitAttr fv = f.get(AType.FIELD_INIT);
+				if (fv != null
+						&& fv.getValue() != null
+						&& fv.getValueType() == FieldInitAttr.InitType.CONST
+						&& fv != FieldInitAttr.NULL_VALUE) {
+					addConstField(cls, f, fv.getValue(), accFlags.isPublic());
+				}
+			}
+		}
+	}
+
+	private void addConstField(ClassNode cls, FieldNode fld, Object value, boolean isPublic) {
+		if (isPublic) {
+			globalValues.put(value, fld);
+		} else {
+			getClsValues(cls).put(value, fld);
+		}
+	}
+
+	private ValueStorage getClsValues(ClassNode cls) {
+		ValueStorage classValues = classes.get(cls);
+		if (classValues == null) {
+			classValues = new ValueStorage();
+			classes.put(cls, classValues);
+		}
+		return classValues;
+	}
+
+	@Nullable
+	public FieldNode getConstField(ClassNode cls, Object value, boolean searchGlobal) {
+		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;
+		}
+		ClassNode current = cls;
+		while (current != null) {
+			ValueStorage classValues = classes.get(current);
+			if (classValues != null) {
+				FieldNode field = classValues.get(value);
+				if (field != null) {
+					if (foundInGlobal) {
+						return null;
+					}
+					return field;
+				}
+			}
+			ClassInfo parentClass = current.getClassInfo().getParentClass();
+			if (parentClass == null) {
+				break;
+			}
+			current = dex.resolveClass(parentClass);
+		}
+		if (searchGlobal) {
+			return globalValues.get(value);
+		}
+		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();
+		if (type == null) {
+			return null;
+		}
+		long literal = arg.getLiteral();
+		switch (type) {
+			case BOOLEAN:
+				return getConstField(cls, literal == 1, false);
+			case CHAR:
+				return getConstField(cls, (char) literal, Math.abs(literal) > 10);
+			case BYTE:
+				return getConstField(cls, (byte) literal, Math.abs(literal) > 10);
+			case SHORT:
+				return getConstField(cls, (short) literal, Math.abs(literal) > 100);
+			case INT:
+				return getConstField(cls, (int) literal, Math.abs(literal) > 100);
+			case LONG:
+				return getConstField(cls, literal, Math.abs(literal) > 1000);
+			case FLOAT:
+				float f = Float.intBitsToFloat((int) literal);
+				return getConstField(cls, f, Float.compare(f, 0) == 0);
+			case DOUBLE:
+				double d = Double.longBitsToDouble(literal);
+				return getConstField(cls, d, Double.compare(d, 0) == 0);
+
+			default:
+				return null;
+		}
+	}
+
+	public void setResourcesNames(Map<Integer, String> resourcesNames) {
+		this.resourcesNames = resourcesNames;
+	}
+
+	public Map<Integer, String> getResourcesNames() {
+		return resourcesNames;
+	}
+
+	public Map<Object, FieldNode> getGlobalConstFields() {
+		return globalValues.getValues();
+	}
+
+	public boolean isReplaceEnabled() {
+		return replaceEnabled;
+	}
+}

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

@@ -0,0 +1,98 @@
+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;
+
+public final class FieldInfo {
+
+	private final ClassInfo declClass;
+	private final String name;
+	private final ArgType type;
+	private String alias;
+
+	private FieldInfo(ClassInfo declClass, String name, ArgType type) {
+		this.declClass = declClass;
+		this.name = name;
+		this.type = type;
+		this.alias = name;
+	}
+
+	public static FieldInfo from(DexNode dex, ClassInfo declClass, String name, ArgType type) {
+		FieldInfo field = new FieldInfo(declClass, name, type);
+		return dex.root().getInfoStorage().getField(field);
+	}
+
+	public static FieldInfo fromDex(DexNode dex, int index) {
+		FieldId field = dex.getFieldId(index);
+		return from(dex,
+				ClassInfo.fromDex(dex, field.getDeclaringClassIndex()),
+				dex.getString(field.getNameIndex()),
+				dex.getType(field.getTypeIndex()));
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public ArgType getType() {
+		return type;
+	}
+
+	public ClassInfo getDeclClass() {
+		return declClass;
+	}
+
+	public String getAlias() {
+		return alias;
+	}
+
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+
+	public String getFullId() {
+		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) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		FieldInfo fieldInfo = (FieldInfo) o;
+		return name.equals(fieldInfo.name)
+				&& type.equals(fieldInfo.type)
+				&& declClass.equals(fieldInfo.declClass);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = name.hashCode();
+		result = 31 * result + type.hashCode();
+		result = 31 * result + declClass.hashCode();
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return declClass + "." + name + " " + type;
+	}
+}

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

@@ -0,0 +1,51 @@
+package jadx.core.dex.info;
+
+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<>();
+	private final Map<Integer, MethodInfo> methods = new HashMap<>();
+	private final Map<FieldInfo, FieldInfo> fields = new HashMap<>();
+
+	public ClassInfo getCls(ArgType type) {
+		return classes.get(type);
+	}
+
+	public ClassInfo putCls(ClassInfo cls) {
+		synchronized (classes) {
+			ClassInfo prev = classes.put(cls.getType(), cls);
+			return prev == null ? cls : prev;
+		}
+	}
+
+	private int generateMethodLookupId(DexNode dex, int mthId) {
+		return dex.getDexId() << 16 | mthId;
+	}
+
+	public MethodInfo getMethod(DexNode dex, int mtdId) {
+		return methods.get(generateMethodLookupId(dex, mtdId));
+	}
+
+	public MethodInfo putMethod(DexNode dex, int mthId, MethodInfo mth) {
+		synchronized (methods) {
+			MethodInfo prev = methods.put(generateMethodLookupId(dex, mthId), mth);
+			return prev == null ? mth : prev;
+		}
+	}
+
+	public FieldInfo getField(FieldInfo field) {
+		synchronized (fields) {
+			FieldInfo f = fields.get(field);
+			if (f != null) {
+				return f;
+			}
+			fields.put(field, field);
+			return field;
+		}
+	}
+}

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

@@ -0,0 +1,153 @@
+package jadx.core.dex.info;
+
+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;
+	private final ArgType retType;
+	private final List<ArgType> args;
+	private final ClassInfo declClass;
+	private final String shortId;
+	private String alias;
+	private boolean aliasFromPreset;
+
+	private MethodInfo(DexNode dex, int mthIndex) {
+		MethodId mthId = dex.getMethodId(mthIndex);
+		name = dex.getString(mthId.getNameIndex());
+		alias = name;
+		aliasFromPreset = false;
+		declClass = ClassInfo.fromDex(dex, mthId.getDeclaringClassIndex());
+
+		ProtoId proto = dex.getProtoId(mthId.getProtoIndex());
+		retType = dex.getType(proto.getReturnTypeIndex());
+		args = dex.readParamList(proto.getParametersOffset());
+		shortId = makeSignature(true);
+	}
+
+	public static MethodInfo fromDex(DexNode dex, int mthIndex) {
+		MethodInfo mth = dex.root().getInfoStorage().getMethod(dex, mthIndex);
+		if (mth != null) {
+			return mth;
+		}
+		mth = new MethodInfo(dex, mthIndex);
+		return dex.root().getInfoStorage().putMethod(dex, mthIndex, mth);
+	}
+
+	public String makeSignature(boolean includeRetType) {
+		StringBuilder signature = new StringBuilder();
+		signature.append(name);
+		signature.append('(');
+		for (ArgType arg : args) {
+			signature.append(TypeGen.signature(arg));
+		}
+		signature.append(')');
+		if (includeRetType) {
+			signature.append(TypeGen.signature(retType));
+		}
+		return signature.toString();
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getFullName() {
+		return declClass.getFullName() + "." + name;
+	}
+
+	public String getFullId() {
+		return declClass.getFullName() + "." + shortId;
+	}
+
+	public String getRawFullId() {
+		return declClass.makeRawFullName() + "." + shortId;
+	}
+
+	/**
+	 * Method name and signature
+	 */
+	public String getShortId() {
+		return shortId;
+	}
+
+	public ClassInfo getDeclClass() {
+		return declClass;
+	}
+
+	public ArgType getReturnType() {
+		return retType;
+	}
+
+	public List<ArgType> getArgumentsTypes() {
+		return args;
+	}
+
+	public int getArgsCount() {
+		return args.size();
+	}
+
+	public boolean isConstructor() {
+		return name.equals("<init>");
+	}
+
+	public boolean isClassInit() {
+		return name.equals("<clinit>");
+	}
+
+	public String getAlias() {
+		return alias;
+	}
+
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+
+	public boolean isRenamed() {
+		return !name.equals(alias);
+	}
+
+	public boolean isAliasFromPreset() {
+		return aliasFromPreset;
+	}
+
+	public void setAliasFromPreset(boolean value) {
+		aliasFromPreset = value;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = declClass.hashCode();
+		result = 31 * result + retType.hashCode();
+		result = 31 * result + shortId.hashCode();
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof MethodInfo)) {
+			return false;
+		}
+		MethodInfo other = (MethodInfo) obj;
+		return shortId.equals(other.shortId)
+				&& retType.equals(other.retType)
+				&& declClass.equals(other.declClass);
+	}
+
+	@Override
+	public String toString() {
+		return declClass.getFullName() + "." + name
+				+ "(" + Utils.listToString(args) + "):" + retType;
+	}
+}

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

@@ -1,13 +1,14 @@
-package jadx.dex.instructions;
-
-import jadx.dex.instructions.args.ArgType;
-import jadx.dex.instructions.args.InsnArg;
-import jadx.dex.instructions.args.RegisterArg;
-import jadx.dex.nodes.InsnNode;
-import jadx.utils.InsnUtils;
+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;
+import jadx.core.dex.instructions.args.RegisterArg;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.utils.InsnUtils;
+
 public class ArithNode extends InsnNode {
 
 	private final ArithOp op;
@@ -39,7 +40,6 @@ public class ArithNode extends InsnNode {
 				addReg(insn, 2, type);
 			}
 		}
-		assert getArgsCount() == 2;
 	}
 
 	public ArithNode(ArithOp op, RegisterArg res, InsnArg a, InsnArg b) {
@@ -51,16 +51,26 @@ public class ArithNode extends InsnNode {
 	}
 
 	public ArithNode(ArithOp op, RegisterArg res, InsnArg a) {
-		super(InsnType.ARITH, 1);
-		this.op = op;
-		setResult(res);
-		addArg(a);
+		this(op, res, res, a);
+		add(AFlag.ARITH_ONEARG);
 	}
 
 	public ArithOp getOp() {
 		return op;
 	}
 
+	@Override
+	public boolean isSame(InsnNode obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof ArithNode) || !super.isSame(obj)) {
+			return false;
+		}
+		ArithNode other = (ArithNode) obj;
+		return op == other.op;
+	}
+
 	@Override
 	public String toString() {
 		return InsnUtils.formatOffset(offset) + ": "
@@ -68,7 +78,6 @@ public class ArithNode extends InsnNode {
 				+ getResult() + " = "
 				+ getArg(0) + " "
 				+ op.getSymbol() + " "
-				+ (getArgsCount() == 2 ? getArg(1) : "");
+				+ getArg(1);
 	}
-
 }

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

@@ -1,4 +1,4 @@
-package jadx.dex.instructions;
+package jadx.core.dex.instructions;
 
 public enum ArithOp {
 	ADD("+"),
@@ -15,12 +15,12 @@ public enum ArithOp {
 	SHR(">>"),
 	USHR(">>>");
 
-	private ArithOp(String symbol) {
+	private final String symbol;
+
+	ArithOp(String symbol) {
 		this.symbol = symbol;
 	}
 
-	private final String symbol;
-
 	public String getSymbol() {
 		return this.symbol;
 	}

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/ConstClassNode.java

@@ -0,0 +1,40 @@
+package jadx.core.dex.instructions;
+
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.nodes.InsnNode;
+
+public final class ConstClassNode extends InsnNode {
+
+	private final ArgType clsType;
+
+	public ConstClassNode(ArgType clsType) {
+		super(InsnType.CONST_CLASS, 0);
+		this.clsType = clsType;
+	}
+
+	public ArgType getClsType() {
+		return clsType;
+	}
+
+	@Override
+	public InsnNode copy() {
+		return copyCommonParams(new ConstClassNode(clsType));
+	}
+
+	@Override
+	public boolean isSame(InsnNode obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof ConstClassNode) || !super.isSame(obj)) {
+			return false;
+		}
+		ConstClassNode other = (ConstClassNode) obj;
+		return clsType.equals(other.clsType);
+	}
+
+	@Override
+	public String toString() {
+		return super.toString() + " " + clsType;
+	}
+}

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

@@ -0,0 +1,39 @@
+package jadx.core.dex.instructions;
+
+import jadx.core.dex.nodes.InsnNode;
+
+public final class ConstStringNode extends InsnNode {
+
+	private final String str;
+
+	public ConstStringNode(String str) {
+		super(InsnType.CONST_STR, 0);
+		this.str = str;
+	}
+
+	public String getString() {
+		return str;
+	}
+
+	@Override
+	public InsnNode copy() {
+		return copyCommonParams(new ConstStringNode(str));
+	}
+
+	@Override
+	public boolean isSame(InsnNode obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof ConstStringNode) || !super.isSame(obj)) {
+			return false;
+		}
+		ConstStringNode other = (ConstStringNode) obj;
+		return str.equals(other.str);
+	}
+
+	@Override
+	public String toString() {
+		return super.toString() + " \"" + str + "\"";
+	}
+}

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

@@ -0,0 +1,104 @@
+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;
+import jadx.core.dex.instructions.args.PrimitiveType;
+import jadx.core.dex.nodes.DexNode;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+
+public final class FillArrayNode extends InsnNode {
+
+	private final Object data;
+	private final int size;
+	private ArgType elemType;
+
+	public FillArrayNode(int resReg, FillArrayDataPayloadDecodedInstruction payload) {
+		super(InsnType.FILL_ARRAY, 0);
+		ArgType elType;
+		switch (payload.getElementWidthUnit()) {
+			case 1:
+				elType = ArgType.unknown(PrimitiveType.BOOLEAN, PrimitiveType.BYTE);
+				break;
+			case 2:
+				elType = ArgType.unknown(PrimitiveType.SHORT, PrimitiveType.CHAR);
+				break;
+			case 4:
+				elType = ArgType.unknown(PrimitiveType.INT, PrimitiveType.FLOAT);
+				break;
+			case 8:
+				elType = ArgType.unknown(PrimitiveType.LONG, PrimitiveType.DOUBLE);
+				break;
+
+			default:
+				throw new JadxRuntimeException("Unknown array element width: " + payload.getElementWidthUnit());
+		}
+		setResult(InsnArg.reg(resReg, ArgType.array(elType)));
+
+		this.data = payload.getData();
+		this.size = payload.getSize();
+		this.elemType = elType;
+	}
+
+	public Object getData() {
+		return data;
+	}
+
+	public int getSize() {
+		return size;
+	}
+
+	public ArgType getElementType() {
+		return elemType;
+	}
+
+	public void mergeElementType(DexNode dex, ArgType foundElemType) {
+		ArgType r = ArgType.merge(dex, elemType, foundElemType);
+		if (r != null) {
+			elemType = r;
+		}
+	}
+
+	public List<LiteralArg> getLiteralArgs() {
+		List<LiteralArg> list = new ArrayList<>(size);
+		Object array = data;
+		if (array instanceof int[]) {
+			for (int b : (int[]) array) {
+				list.add(InsnArg.lit(b, elemType));
+			}
+		} else if (array instanceof byte[]) {
+			for (byte b : (byte[]) array) {
+				list.add(InsnArg.lit(b, elemType));
+			}
+		} else if (array instanceof short[]) {
+			for (short b : (short[]) array) {
+				list.add(InsnArg.lit(b, elemType));
+			}
+		} else if (array instanceof long[]) {
+			for (long b : (long[]) array) {
+				list.add(InsnArg.lit(b, elemType));
+			}
+		} else {
+			throw new JadxRuntimeException("Unknown type: " + data.getClass() + ", expected: " + elemType);
+		}
+		return list;
+	}
+
+	@Override
+	public boolean isSame(InsnNode obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof FillArrayNode) || !super.isSame(obj)) {
+			return false;
+		}
+		FillArrayNode other = (FillArrayNode) obj;
+		return elemType.equals(other.elemType) && data == other.data;
+	}
+}