From 6235d1f3ad29f77998c18a9d1901a43e7f0a0ab5 Mon Sep 17 00:00:00 2001 From: REAndroid Date: Mon, 6 Mar 2023 06:49:40 -0500 Subject: [PATCH] clean unused methods --- .../apk/xmlencoder/EncodeMaterials.java | 17 +---------- .../reandroid/arsc/decoder/ValueDecoder.java | 3 +- .../java/com/reandroid/common/EntryStore.java | 7 +---- .../reandroid/common/ResourceResolver.java | 21 -------------- .../com/reandroid/common/TableEntryStore.java | 29 +------------------ 5 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 src/main/java/com/reandroid/common/ResourceResolver.java diff --git a/src/main/java/com/reandroid/apk/xmlencoder/EncodeMaterials.java b/src/main/java/com/reandroid/apk/xmlencoder/EncodeMaterials.java index d92794e..f0eaf7a 100644 --- a/src/main/java/com/reandroid/apk/xmlencoder/EncodeMaterials.java +++ b/src/main/java/com/reandroid/apk/xmlencoder/EncodeMaterials.java @@ -28,13 +28,12 @@ import com.reandroid.arsc.util.ResNameMap; import com.reandroid.arsc.value.Entry; import com.reandroid.common.Frameworks; - import com.reandroid.common.ResourceResolver; import java.util.HashSet; import java.util.Set; import java.util.regex.Matcher; - public class EncodeMaterials implements ResourceResolver { + public class EncodeMaterials { private final Set packageIdSet = new HashSet<>(); private PackageBlock currentPackage; private final Set frameworkTables = new HashSet<>(); @@ -304,20 +303,6 @@ return currentPackage.getId(); } - @Override - public int resolveResourceId(String packageName, String type, String name) { - if(!isFrameworkPackageName(packageName)){ - return resolveLocalResourceId(type, name); - } - return resolveFrameworkResourceId(packageName, type, name); - } - @Override - public int resolveResourceId(int packageId, String type, String name) { - if(packageId==getCurrentPackageId()){ - return resolveLocalResourceId(type, name); - } - return resolveFrameworkResourceId(packageId, type, name); - } public void logMessage(String msg) { if(apkLogger!=null){ apkLogger.logMessage(msg); diff --git a/src/main/java/com/reandroid/arsc/decoder/ValueDecoder.java b/src/main/java/com/reandroid/arsc/decoder/ValueDecoder.java index f73f734..1e3e42d 100755 --- a/src/main/java/com/reandroid/arsc/decoder/ValueDecoder.java +++ b/src/main/java/com/reandroid/arsc/decoder/ValueDecoder.java @@ -506,7 +506,8 @@ import java.util.regex.Pattern; if(pkgId==0){ pkgId=packageOrResourceId; } - Collection allPkg = entryStore.getPackageBlocks((byte) pkgId); + pkgId = pkgId & 0xff; + Collection allPkg = entryStore.getPackageBlocks(pkgId); if(allPkg==null){ return null; } diff --git a/src/main/java/com/reandroid/common/EntryStore.java b/src/main/java/com/reandroid/common/EntryStore.java index 99f83c2..4d6e24d 100755 --- a/src/main/java/com/reandroid/common/EntryStore.java +++ b/src/main/java/com/reandroid/common/EntryStore.java @@ -22,12 +22,7 @@ import com.reandroid.arsc.item.TableString; import java.util.Collection; public interface EntryStore { - EntryGroup searchEntryGroup(String packageName, String type, String name); Collection getEntryGroups(int resourceId); - EntryGroup getEntryGroup(int resourceId); - - Collection getPackageBlocks(byte packageId); - - Collection getTableStrings(byte packageId, int stringReference); + Collection getPackageBlocks(int packageId); } diff --git a/src/main/java/com/reandroid/common/ResourceResolver.java b/src/main/java/com/reandroid/common/ResourceResolver.java deleted file mode 100644 index 72c4a9b..0000000 --- a/src/main/java/com/reandroid/common/ResourceResolver.java +++ /dev/null @@ -1,21 +0,0 @@ - /* - * Copyright (C) 2022 github.com/REAndroid - * - * 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. - */ -package com.reandroid.common; - -public interface ResourceResolver { - int resolveResourceId(String packageName, String type, String name); - int resolveResourceId(int packageId, String type, String name); -} diff --git a/src/main/java/com/reandroid/common/TableEntryStore.java b/src/main/java/com/reandroid/common/TableEntryStore.java index b66cfac..59647e3 100755 --- a/src/main/java/com/reandroid/common/TableEntryStore.java +++ b/src/main/java/com/reandroid/common/TableEntryStore.java @@ -75,21 +75,6 @@ public class TableEntryStore implements EntryStore{ return packageBlockSet; } @Override - public EntryGroup searchEntryGroup(String packageName, String type, String name) { - return null; - } - private Set getTableBlocks(int packageId) { - Set results=new HashSet<>(); - Set packageBlockSet = mPackagesMap.get(packageId); - if(packageBlockSet!=null){ - for(PackageBlock packageBlock:packageBlockSet){ - TableBlock tableBlock=packageBlock.getTableBlock(); - results.add(tableBlock); - } - } - return results; - } - @Override public List getEntryGroups(int resourceId) { List results = searchEntryGroups(resourceId); if(results.size()>0){ @@ -106,7 +91,7 @@ public class TableEntryStore implements EntryStore{ return searchEntryGroup(searchIdAlias(resourceId)); } @Override - public List getPackageBlocks(byte packageId) { + public List getPackageBlocks(int packageId) { List results=new ArrayList<>(); Set packageBlockSet = mPackagesMap.get(0xff & packageId); if(packageBlockSet!=null){ @@ -114,18 +99,6 @@ public class TableEntryStore implements EntryStore{ } return results; } - @Override - public List getTableStrings(byte packageId, int stringReference) { - List results=new ArrayList<>(); - Set tableBlockSet=getTableBlocks(0xff & packageId); - for(TableBlock tableBlock:tableBlockSet){ - TableString tableString=tableBlock.getTableStringPool().get(stringReference); - if(tableString!=null){ - results.add(tableString); - } - } - return results; - } private List searchEntryGroups(int resourceId) { if(resourceId==0){ return new ArrayList<>();