fix string npe

REAndroid · REAndroid · commit a3ec80f4359e · 2023-06-25T17:31:53.000+02:00
diff --git a/src/main/java/com/reandroid/arsc/array/StringArray.java b/src/main/java/com/reandroid/arsc/array/StringArray.java
@@ -24,6 +24,7 @@
 
 import java.util.AbstractList;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 public abstract class StringArray<T extends StringItem> extends OffsetBlockArray<T> implements JSONConvert<JSONArray> {
@@ -51,7 +52,7 @@ protected void onPostShift(int index){
     @Override
     protected void onPreRefreshRefresh(){
         if(isFlexible()){
-            trimAllocatedFreeSpace();
+            trimNullBlocks();
         }
         super.onPreRefreshRefresh();
     }
@@ -85,8 +86,10 @@ List<T> listUnusedStringsToRemove(){
     }
     public List<T> listUnusedStrings(){
         List<T> results=new ArrayList<>();
-        for(T item:listItems()){
-            if(!item.hasReference()){
+        T[] childes = getChildes();
+        for(int i = 0; i < childes.length; i++){
+            T item = childes[i];
+            if(item != null && !item.hasReference()){
                 results.add(item);
             }
         }
@@ -96,12 +99,15 @@ public void setUtf8(boolean is_utf8){
         if(mUtf8==is_utf8){
             return;
         }
-        mUtf8=is_utf8;
-        T[] childes=getChildes();
+        mUtf8 = is_utf8;
+        T[] childes = getChildes();
         if(childes!=null){
-            int max=childes.length;
-            for(int i=0;i<max;i++){
-                childes[i].setUtf8(is_utf8);
+            int length = childes.length;
+            for(int i=0; i<length; i++){
+                T item = childes[i];
+                if(item != null){
+                    item.setUtf8(is_utf8);
+                }
             }
         }
     }
@@ -124,10 +130,9 @@ public JSONArray toJson(boolean styledOnly) {
         }
         JSONArray jsonArray=new JSONArray();
         int i=0;
-        for(T item:listItems()){
-            if(item.isNull()){
-                continue;
-            }
+        Iterator<T> itr = iterator(true);
+        while (itr.hasNext()){
+            T item = itr.next();
             if(styledOnly && !item.hasStyle()){
                 continue;
             }
diff --git a/src/main/java/com/reandroid/arsc/base/BlockArray.java b/src/main/java/com/reandroid/arsc/base/BlockArray.java
@@ -322,6 +322,9 @@ public final T get(int i){
         }
         return elementData[i];
     }
+    public final T getLast(){
+        return get(childesCount() - mFreeSpace - 1);
+    }
     public int indexOf(Object block){
         T[] items=elementData;
         if(items==null){
@@ -354,9 +357,11 @@ public Iterator<T> iterator() {
         return iterator(false);
     }
     public Iterator<T> iterator(boolean skipNullBlock) {
+        trimAllocatedFreeSpace();
         return new BlockIterator(skipNullBlock);
     }
     public Iterator<T> iterator(Predicate<T> tester) {
+        trimAllocatedFreeSpace();
         return new PredicateIterator(tester);
     }
     public boolean contains(Object block){
@@ -457,6 +462,8 @@ private int countNonNull(boolean is_null_check){
         return result;
     }
     private void changeSize(int amount){
+        mFreeSpace = 0;
+        mAllocateStep = 0;
         T[] old=elementData;
         int index=old.length;
         int size=index+amount;
diff --git a/src/main/java/com/reandroid/arsc/pool/StringPool.java b/src/main/java/com/reandroid/arsc/pool/StringPool.java
@@ -251,6 +251,9 @@ public boolean contains(String str){
     public final T get(int index){
         return mArrayStrings.get(index);
     }
+    public final T getLast(){
+        return mArrayStrings.getLast();
+    }
     public final StringGroup<T> get(String str){
         return mUniqueMap.get(str);
     }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`import java.util.AbstractList;`
`26`	`26`	`import java.util.ArrayList;`
	`27`	`+import java.util.Iterator;`
`27`	`28`	`import java.util.List;`
`28`	`29`
`29`	`30`	`public abstract class StringArray<T extends StringItem> extends OffsetBlockArray<T> implements JSONConvert<JSONArray> {`
`@@ -51,7 +52,7 @@ protected void onPostShift(int index){`
`51`	`52`	`@Override`
`52`	`53`	`protected void onPreRefreshRefresh(){`
`53`	`54`	`if(isFlexible()){`
`54`		`- trimAllocatedFreeSpace();`
	`55`	`+ trimNullBlocks();`
`55`	`56`	`}`
`56`	`57`	`super.onPreRefreshRefresh();`
`57`	`58`	`}`
`@@ -85,8 +86,10 @@ List<T> listUnusedStringsToRemove(){`
`85`	`86`	`}`
`86`	`87`	`public List<T> listUnusedStrings(){`
`87`	`88`	`List<T> results=new ArrayList<>();`
`88`		`- for(T item:listItems()){`
`89`		`- if(!item.hasReference()){`
	`89`	`+ T[] childes = getChildes();`
	`90`	`+ for(int i = 0; i < childes.length; i++){`
	`91`	`+ T item = childes[i];`
	`92`	`+ if(item != null && !item.hasReference()){`
`90`	`93`	`results.add(item);`
`91`	`94`	`}`
`92`	`95`	`}`
`@@ -96,12 +99,15 @@ public void setUtf8(boolean is_utf8){`
`96`	`99`	`if(mUtf8==is_utf8){`
`97`	`100`	`return;`
`98`	`101`	`}`
`99`		`- mUtf8=is_utf8;`
`100`		`- T[] childes=getChildes();`
	`102`	`+ mUtf8 = is_utf8;`
	`103`	`+ T[] childes = getChildes();`
`101`	`104`	`if(childes!=null){`
`102`		`- int max=childes.length;`
`103`		`- for(int i=0;i<max;i++){`
`104`		`- childes[i].setUtf8(is_utf8);`
	`105`	`+ int length = childes.length;`
	`106`	`+ for(int i=0; i<length; i++){`
	`107`	`+ T item = childes[i];`
	`108`	`+ if(item != null){`
	`109`	`+ item.setUtf8(is_utf8);`
	`110`	`+ }`
`105`	`111`	`}`
`106`	`112`	`}`
`107`	`113`	`}`
`@@ -124,10 +130,9 @@ public JSONArray toJson(boolean styledOnly) {`
`124`	`130`	`}`
`125`	`131`	`JSONArray jsonArray=new JSONArray();`
`126`	`132`	`int i=0;`
`127`		`- for(T item:listItems()){`
`128`		`- if(item.isNull()){`
`129`		`- continue;`
`130`		`- }`
	`133`	`+ Iterator<T> itr = iterator(true);`
	`134`	`+ while (itr.hasNext()){`
	`135`	`+ T item = itr.next();`
`131`	`136`	`if(styledOnly && !item.hasStyle()){`
`132`	`137`	`continue;`
`133`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -322,6 +322,9 @@ public final T get(int i){`
`322`	`322`	`}`
`323`	`323`	`return elementData[i];`
`324`	`324`	`}`
	`325`	`+ public final T getLast(){`
	`326`	`+ return get(childesCount() - mFreeSpace - 1);`
	`327`	`+ }`
`325`	`328`	`public int indexOf(Object block){`
`326`	`329`	`T[] items=elementData;`
`327`	`330`	`if(items==null){`
`@@ -354,9 +357,11 @@ public Iterator<T> iterator() {`
`354`	`357`	`return iterator(false);`
`355`	`358`	`}`
`356`	`359`	`public Iterator<T> iterator(boolean skipNullBlock) {`
	`360`	`+ trimAllocatedFreeSpace();`
`357`	`361`	`return new BlockIterator(skipNullBlock);`
`358`	`362`	`}`
`359`	`363`	`public Iterator<T> iterator(Predicate<T> tester) {`
	`364`	`+ trimAllocatedFreeSpace();`
`360`	`365`	`return new PredicateIterator(tester);`
`361`	`366`	`}`
`362`	`367`	`public boolean contains(Object block){`
`@@ -457,6 +462,8 @@ private int countNonNull(boolean is_null_check){`
`457`	`462`	`return result;`
`458`	`463`	`}`
`459`	`464`	`private void changeSize(int amount){`
	`465`	`+ mFreeSpace = 0;`
	`466`	`+ mAllocateStep = 0;`
`460`	`467`	`T[] old=elementData;`
`461`	`468`	`int index=old.length;`
`462`	`469`	`int size=index+amount;`
Original file line number	Diff line number	Diff line change
`@@ -251,6 +251,9 @@ public boolean contains(String str){`
`251`	`251`	`public final T get(int index){`
`252`	`252`	`return mArrayStrings.get(index);`
`253`	`253`	`}`
	`254`	`+ public final T getLast(){`
	`255`	`+ return mArrayStrings.getLast();`
	`256`	`+ }`
`254`	`257`	`public final StringGroup<T> get(String str){`
`255`	`258`	`return mUniqueMap.get(str);`
`256`	`259`	`}`