Skip to content

Commit 116d5d5

Browse files
committed
[INFO] fix: print bag/complex resource entries
1 parent be38782 commit 116d5d5

File tree

3 files changed

+7
-27
lines changed

3 files changed

+7
-27
lines changed

src/main/java/com/reandroid/apkeditor/info/InfoWriterJson.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,7 @@ public void writeEntries(String name, List<Entry> entryList) throws IOException
161161
.array();
162162

163163
for(Entry entry : entryList){
164-
jsonWriter.object()
165-
.key("config").value(entry.getResConfig().getQualifiers())
166-
.key("value").value(getValueAsString(entry))
167-
.endObject();
164+
writeEntry(entry);
168165
}
169166
jsonWriter.endArray()
170167
.endObject();

src/main/java/com/reandroid/apkeditor/info/InfoWriterText.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private void writeBagEntry(Entry entry) throws IOException {
122122
Writer writer = getWriter();
123123
ResValueMapArray mapArray = entry.getResValueMapArray();
124124
writer.write(" size=");
125-
writer.write(Integer.toString(mapArray.childesCount()));
125+
writer.write(Integer.toString(mapArray.getCount()));
126126
writer.write(" parent=");
127127
writer.write(HexUtil.toHex8(((ResTableMapEntry)entry.getTableEntry()).getParentId()));
128128
writer.write("\n");
@@ -187,16 +187,9 @@ public void writeEntries(String name, List<Entry> entryList) throws IOException
187187
int index = 0;
188188
for(Entry entry : entryList){
189189
index++;
190-
String config = entry.getResConfig().getQualifiers();
191-
if(config.length() == 0){
192-
config = "default";
193-
}
194190
writer.write(ARRAY_TAB);
195-
writer.write(config);
196-
writer.write(" \"");
197-
String text = getValueAsString(entry);
198-
writer.write(text);
199-
writer.write("\"\n");
191+
writeEntry(entry);
192+
writer.write("\n");
200193
if((index % 3) == 0){
201194
writer.flush();
202195
}

src/main/java/com/reandroid/apkeditor/info/InfoWriterXml.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
public class InfoWriterXml extends InfoWriter{
3636
private KXmlSerializer mSerializer;
37-
private String mRootTag = TAG_INFO;
3837
private int mIndent;
3938
public InfoWriterXml(Writer writer) {
4039
super(writer);
@@ -226,16 +225,7 @@ public void writeEntries(String name, List<Entry> entryList) throws IOException
226225
serializer.attribute(null, "name", first.getName());
227226
level = level + 2;
228227
for(Entry entry : entryList){
229-
String config = entry.getResConfig().getQualifiers();
230-
if(config.length() == 0){
231-
config = "default";
232-
}
233-
String text = getValueAsString(entry);
234-
writeIndent(serializer, level);
235-
serializer.startTag(null, "item");
236-
serializer.attribute(null, "config", config);
237-
serializer.text(text);
238-
serializer.endTag(null, "item");
228+
writeEntry(entry);
239229
}
240230
level = level - 2;
241231
writeIndent(serializer, level);
@@ -289,7 +279,7 @@ public void flush() throws IOException {
289279
KXmlSerializer serializer = this.mSerializer;
290280
if(serializer != null){
291281
writeIndent(serializer, 0);
292-
serializer.endTag(null, mRootTag);
282+
serializer.endTag(null, TAG_INFO);
293283
serializer.endDocument();
294284
writeIndent(serializer, 0);
295285
serializer.flush();
@@ -312,7 +302,7 @@ private KXmlSerializer getSerializer() throws IOException {
312302
serializer.setOutput(getWriter());
313303
serializer.startDocument("utf-8", null);
314304
writeIndent(serializer, 0);
315-
serializer.startTag(null, mRootTag);
305+
serializer.startTag(null, TAG_INFO);
316306
mSerializer = serializer;
317307
return serializer;
318308
}

0 commit comments

Comments
 (0)