Don't show not important warnings

skylot · Jun 17, 2013 · d6a468f · d6a468f
1 parent 69eb57c
commit d6a468f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/jadx/dex/nodes/ClassNode.java b/src/main/java/jadx/dex/nodes/ClassNode.java
@@ -91,7 +91,7 @@ public ClassNode(DexNode dex, ClassDef cls) throws DecodeException {
 				String fileName = dex.getString(sfIdx);
 				if(!this.getFullName().contains(fileName.replace(".java", ""))) {
 					this.getAttributes().add(new SourceFileAttr(fileName));
-					LOG.info("TODO: move class {} to {} file", this, fileName);
+					LOG.debug("Class '{}' compiled from '{}'", this, fileName);
 				}
 			}
 

diff --git a/src/main/java/jadx/dex/visitors/regions/CheckRegions.java b/src/main/java/jadx/dex/visitors/regions/CheckRegions.java
@@ -1,5 +1,6 @@
 package jadx.dex.visitors.regions;
 
+import jadx.Consts;
 import jadx.dex.attributes.AttributeFlag;
 import jadx.dex.nodes.BlockNode;
 import jadx.dex.nodes.IBlock;
@@ -37,8 +38,19 @@ public void processBlock(MethodNode mth, IBlock container) {
 		};
 		DepthRegionTraverser.traverseAll(mth, collectBlocks);
 
-		if (mth.getBasicBlocks().size() != blocksInRegions.size())
-			mth.getAttributes().add(AttributeFlag.INCONSISTENT_CODE);
+		if (mth.getBasicBlocks().size() != blocksInRegions.size()) {
+			for (BlockNode block : mth.getBasicBlocks()) {
+				if (!blocksInRegions.contains(block)) {
+					if (!block.getInstructions().isEmpty()) {
+						mth.getAttributes().add(AttributeFlag.INCONSISTENT_CODE);
+						if (Consts.DEBUG)
+							LOG.debug("Missing block: {} in {}", block, mth);
+						else
+							break;
+					}
+				}
+			}
+		}
 
 		// check loop conditions
 		IRegionVisitor checkLoops = new AbstractRegionVisitor() {