ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-07-11 08:04:05 +02:00
Code Issues Projects Releases Wiki Activity

ResXmlEncoders: replaced findNonPositionedSubstitutions() by more flexible findSubstitutions().

Browse Source 
Also rewritten some bits.
This commit is contained in:
Ryszard Wiśniewski 2013-05-11 17:53:32 +02:00
parent 997df5cfc5
commit 68f97980eb
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/xml/ResXmlEncoders.java
View File

@ -16,6 +16,8 @@
package brut.androlib.res.xml;
import brut.util.Duo;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.List;
@ -135,11 +137,11 @@ public final class ResXmlEncoders {
}
public static boolean hasMultipleNonPositionalSubstitutions(String str) {
return findNonPositionalSubstitutions(str, 2).size() > 1;
return findSubstitutions(str, 2).m1.size() > 1;
}
public static String enumerateNonPositionalSubstitutions(String str) {
List<Integer> subs = findNonPositionalSubstitutions(str, -1);
List<Integer> subs = findSubstitutions(str, -1).m1;
if (subs.size() < 2) {
return str;
}
@ -157,16 +159,21 @@ public final class ResXmlEncoders {
}
/**
* It searches for "%", but not "%%" nor "%(\d)+\$"
* It returns a tuple of:
* - a list of offsets of non positional substitutions. non-pos is defined as any "%" which isn't "%%" nor "%\d+\$"
* - a list of offsets of positional substitutions
*/
private static List<Integer> findNonPositionalSubstitutions(String str,
int max) {
int pos = 0;
private static Duo<List<Integer>, List<Integer>> findSubstitutions(String str, int nonPosMax) {
if (nonPosMax == -1) {
nonPosMax = Integer.MAX_VALUE;
}
int pos;
int pos2 = 0;
int count = 0;
int length = str.length();
List<Integer> ret = new ArrayList<Integer>();
while ((pos2 = (pos = str.indexOf('%', pos2)) + 1) != 0) {
List<Integer> nonPositional = new ArrayList<>();
List<Integer> positional = new ArrayList<>();
while ((pos = str.indexOf('%', pos2)) != -1) {
pos2 = pos + 1;
if (pos2 == length) {
break;
}
@ -175,21 +182,20 @@ public final class ResXmlEncoders {
continue;
}
if (c >= '0' && c <= '9' && pos2 < length) {
do {
c = str.charAt(pos2++);
} while (c >= '0' && c <= '9' && pos2 < length);
if (c == '$') {
continue;
}
while ((c = str.charAt(pos2++)) >= '0' && c <= '9' && pos2 < length);
if (c == '$') {
positional.add(pos);
continue;
}
}
ret.add(pos);
if (max != -1 && ++count >= max) {
nonPositional.add(pos);
if (nonPositional.size() >= nonPosMax) {
break;
}
}
return ret;
return new Duo<>(nonPositional, positional);
}
private static boolean isPrintableChar(char c) {