atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

AssetManager.getResourceValue: handle references and invalid IDs

Browse Source
This commit is contained in:
Julian Winkler
2023-07-14 20:19:54 +02:00
parent 77459e34e0
commit 4de91fdaaa
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/api-impl/android/content/res/AssetManager.java
View File

@@ -24,7 +24,10 @@ import android.util.TypedValue;
import com.reandroid.arsc.chunk.TableBlock; import com.reandroid.arsc.chunk.TableBlock;
import com.reandroid.arsc.chunk.xml.ResXmlDocument; import com.reandroid.arsc.chunk.xml.ResXmlDocument;
import com.reandroid.arsc.chunk.xml.ResXmlPullParser; import com.reandroid.arsc.chunk.xml.ResXmlPullParser;
import com.reandroid.arsc.group.EntryGroup;
import com.reandroid.arsc.value.ResValue;
import com.reandroid.arsc.value.ResValueMap; import com.reandroid.arsc.value.ResValueMap;
import com.reandroid.arsc.value.ValueType;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
@@ -175,7 +178,13 @@ public final class AssetManager {
* identifier for the current configuration / skin. * identifier for the current configuration / skin.
*/ */
/*package*/ final CharSequence getResourceText(int id) { /*package*/ final CharSequence getResourceText(int id) {
return tableBlock.search(id).pickOne().getResValue().getDataAsPoolString().get(); if (id == 0)
return "";
ResValue resValue = tableBlock.search(id).pickOne().getResValue();
if (resValue.getValueType() == ValueType.REFERENCE) {
return getResourceText(resValue.getData());
}
return resValue.getDataAsPoolString().get();
} }
/** /**
@@ -221,8 +230,16 @@ public final class AssetManager {
outValue.string = mStringBlocks[block].get(outValue.data); outValue.string = mStringBlocks[block].get(outValue.data);
return true; return true;
}*/ }*/
outValue.type = TypedValue.TYPE_STRING; EntryGroup entryGroup = tableBlock.search(ident);
outValue.string = getResourceText(ident); if (entryGroup == null)
return false; // not found
ResValue resValue = entryGroup.pickOne().getResValue();
if (resValue == null)
return false; // not found
outValue.type = resValue.getType();
outValue.data = resValue.getData();
if (outValue.type == TypedValue.TYPE_STRING)
outValue.string = getResourceText(ident);
return true; return true;
} }