Merge pull request #15 from achellies/develop

update
achellies · Nov 7, 2016 · 6fce5fd · 6fce5fd
2 parents f27f669 + effef3a
commit 6fce5fd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/proguard-base/src/main/java/proguard/obfuscate/MemberNameCollector.java b/proguard-base/src/main/java/proguard/obfuscate/MemberNameCollector.java
@@ -86,7 +86,7 @@ public void visitAnyMember(Clazz clazz, Member member)
                 descriptor = descriptor.substring(0, descriptor.indexOf(')')+1);
             }
 
-            descriptor = ClassUtil.internalClassName(clazz.getName()) + descriptor;
+            descriptor = ClassUtil.internalClassName(clazz.getName()) + name + descriptor;
 
             // Put the [descriptor - new name] in the map,
             // creating a new [new name - old name] map if necessary.

diff --git a/proguard-base/src/main/java/proguard/obfuscate/MemberNameConflictFixer.java b/proguard-base/src/main/java/proguard/obfuscate/MemberNameConflictFixer.java
@@ -116,7 +116,7 @@ private void visitMember(Clazz   clazz,
             descriptor = descriptor.substring(0, descriptor.indexOf(')')+1);
         }
 
-        descriptor = ClassUtil.internalClassName(clazz.getName()) + descriptor;
+        descriptor = ClassUtil.internalClassName(clazz.getName()) + name + descriptor;
 
         // Get the name map.
         Map nameMap = MemberObfuscator.retrieveNameMap(descriptorMap, descriptor);

diff --git a/proguard-base/src/main/java/proguard/obfuscate/MemberObfuscator.java b/proguard-base/src/main/java/proguard/obfuscate/MemberObfuscator.java
@@ -88,7 +88,7 @@ public void visitAnyMember(Clazz clazz, Member member)
             descriptor = descriptor.substring(0, descriptor.indexOf(')')+1);
         }
 
-        descriptor = ClassUtil.internalClassName(clazz.getName()) + descriptor;
+        descriptor = ClassUtil.internalClassName(clazz.getName()) + name + descriptor;
 
         // Get the name map, creating a new one if necessary.
         Map nameMap = retrieveNameMap(descriptorMap, descriptor);