Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tinker] ignore repeated items when compare permissions. #1706

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[tinker] ignore repeated items when compare permissions. #1706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 78 additions & 33 deletions ...uild/tinker-patch-lib/src/main/java/com/tencent/tinker/build/decoder/ManifestDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@
*/

public class ManifestDecoder extends BaseDecoder {
private static final String XML_NODENAME_APPLICATION = "application";
private static final String XML_NODENAME_USES_SDK = "uses-sdk";
private static final String XML_NODEATTR_MIN_SDK_VERSION = "minSdkVersion";
private static final String XML_NODENAME_APPLICATION = "application";
private static final String XML_NODENAME_USES_SDK = "uses-sdk";
private static final String XML_NODEATTR_MIN_SDK_VERSION = "minSdkVersion";
private static final String XML_NODEATTR_TARGET_SDK_VERSION = "targetSdkVersion";
private static final String XML_NODEATTR_PACKAGE = "package";
private static final String XML_NODENAME_ACTIVITY = "activity";
private static final String XML_NODENAME_SERVICE = "service";
private static final String XML_NODENAME_RECEIVER = "receiver";
private static final String XML_NODENAME_PROVIDER = "provider";
private static final String XML_NODEATTR_NAME = "name";
private static final String XML_NODEATTR_EXPORTED = "exported";
private static final String XML_NODEATTR_PROCESS = "process";
private static final String XML_NODENAME_INTENTFILTER = "intent-filter";
private static final String XML_NODEATTR_PACKAGE = "package";
private static final String XML_NODENAME_ACTIVITY = "activity";
private static final String XML_NODENAME_SERVICE = "service";
private static final String XML_NODENAME_RECEIVER = "receiver";
private static final String XML_NODENAME_PROVIDER = "provider";
private static final String XML_NODEATTR_NAME = "name";
private static final String XML_NODEATTR_EXPORTED = "exported";
private static final String XML_NODEATTR_PROCESS = "process";
private static final String XML_NODENAME_INTENTFILTER = "intent-filter";

public ManifestDecoder(Configuration config) throws IOException {
super(config);
Expand All @@ -85,9 +85,9 @@ public boolean patch(File oldFile, File newFile) throws IOException, TinkerPatch
if (config.mDexRaw) {
final StringBuilder sb = new StringBuilder();
sb.append("your old apk's minSdkVersion ")
.append(minSdkVersion)
.append(" is below 14, you should set the dexMode to 'jar', ")
.append("otherwise, it will crash at some time");
.append(minSdkVersion)
.append(" is below 14, you should set the dexMode to 'jar', ")
.append("otherwise, it will crash at some time");
announceWarningOrException(sb.toString());
}
}
Expand Down Expand Up @@ -188,7 +188,7 @@ public boolean patch(File oldFile, File newFile) throws IOException, TinkerPatch

if (isManifestChanged && !hasIncComponent) {
Logger.d("\nManifest was changed, while there's no any new components added."
+ " Make sure if such changes were all you expected.\n");
+ " Make sure if such changes were all you expected.\n");
}

} catch (ParseException e) {
Expand Down Expand Up @@ -275,7 +275,7 @@ private void ensureApkMetaUnchanged(ApkMeta oldMeta, ApkMeta newMeta) {
announceWarningOrException("Value of isLargeScreens changed, old: " + oldMeta.isLargeScreens()
+ ", new: " + newMeta.isLargeScreens());
}
if (!nullSafeEqualsIgnoreOrder(oldMeta.getUsesPermissions(), newMeta.getUsesPermissions(), null)) {
if (!nullSafeEqualsIgnoreOrderAndRepeat(oldMeta.getUsesPermissions(), newMeta.getUsesPermissions(), null)) {
announceWarningOrException("Uses permissions changed, related uses-permissions: "
+ describeChanges(oldMeta.getUsesPermissions(), newMeta.getUsesPermissions()));
}
Expand Down Expand Up @@ -319,6 +319,51 @@ private static <T> boolean nullSafeEquals(T lhs, T rhs, EqualsChecker<T> equalsC
return false;
}

private static <T> boolean nullSafeEqualsIgnoreOrderAndRepeat(Collection<T> lhs, Collection<T> rhs, ObjectDescriber<T> describer) {
if (lhs == null && rhs == null) {
return true;
}
if (lhs != null) {
lhs = new HashSet<>(lhs);
}
if (rhs != null) {
rhs = new HashSet<>(rhs);
}
if (lhs != null && rhs != null) {
final Set<String> lhsDescs = new HashSet<>();
int lhsNotNullElemCount = 0;
int rhsNotNullElemCount = 0;
for (T lhsElem : lhs) {
if (lhsElem == null) {
continue;
}
lhsDescs.add(describer != null ? describer.describe(lhsElem) : lhsElem.toString());
++lhsNotNullElemCount;
}
boolean hasAddedElemDesc = false;
for (T rhsElem : rhs) {
if (rhsElem == null) {
continue;
}
final String rhsElemDesc = describer != null ? describer.describe(rhsElem) : rhsElem.toString();
if (!lhsDescs.remove(rhsElemDesc)) {
hasAddedElemDesc = true;
break;
}
++rhsNotNullElemCount;
}
if (hasAddedElemDesc) {
return false;
}
if (lhsDescs.size() > 0) {
// Has removed items.
return false;
}
return lhsNotNullElemCount == rhsNotNullElemCount;
}
return false;
}

private static <T> boolean nullSafeEqualsIgnoreOrder(List<T> lhs, List<T> rhs, ObjectDescriber<T> describer) {
if (lhs == null && rhs == null) {
return true;
Expand Down Expand Up @@ -369,10 +414,10 @@ private interface ObjectDescriber<T> {
public String describe(GlEsVersion obj) {
final StringBuilder sb = new StringBuilder();
sb.append("{")
.append("majar:").append(obj.getMajor())
.append("minor:").append(obj.getMinor())
.append(",required:").append(obj.isRequired())
.append("}");
.append("majar:").append(obj.getMajor())
.append("minor:").append(obj.getMinor())
.append(",required:").append(obj.isRequired())
.append("}");
return sb.toString();
}
};
Expand All @@ -382,9 +427,9 @@ public String describe(GlEsVersion obj) {
public String describe(UseFeature obj) {
final StringBuilder sb = new StringBuilder();
sb.append("{")
.append("name:").append(obj.getName())
.append(",required:").append(obj.isRequired())
.append("}");
.append("name:").append(obj.getName())
.append(",required:").append(obj.isRequired())
.append("}");
return sb.toString();
}
};
Expand All @@ -394,13 +439,13 @@ public String describe(UseFeature obj) {
public String describe(Permission obj) {
final StringBuilder sb = new StringBuilder();
sb.append("{")
.append("name:").append(obj.getName())
.append(",label:").append(obj.getLabel())
.append(",icon:").append(obj.getIcon())
.append(",description:").append(obj.getDescription())
.append(",group:").append(obj.getGroup())
.append(",protectionLevel:").append(obj.getProtectionLevel())
.append("}");
.append("name:").append(obj.getName())
.append(",label:").append(obj.getLabel())
.append(",icon:").append(obj.getIcon())
.append(",description:").append(obj.getDescription())
.append(",group:").append(obj.getGroup())
.append(",protectionLevel:").append(obj.getProtectionLevel())
.append("}");
return sb.toString();
}
};
Expand All @@ -424,8 +469,8 @@ private static <T> String describeChanges(Collection<T> oldObjs, Collection<T> n
final List<String> removedDescs = new ArrayList<>(oldDescs);
final StringBuilder sb = new StringBuilder();
sb.append("{added:").append(addedDescs)
.append(",removed:").append(removedDescs)
.append("}");
.append(",removed:").append(removedDescs)
.append("}");
return sb.toString();
}

Expand Down