瀏覽代碼

Merge pull request #9902 from nextcloud/fix/localid-nullpointer

OCFile: fix NPE in getLocalId when remoteID is null
Álvaro Brey 3 年之前
父節點
當前提交
1954584741
共有 1 個文件被更改,包括 7 次插入1 次删除
  1. 7 1
      src/main/java/com/owncloud/android/datamodel/OCFile.java

+ 7 - 1
src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -41,6 +41,7 @@ import java.io.File;
 import java.util.List;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.content.FileProvider;
 import third_parties.daveKoeller.AlphanumComparator;
@@ -547,8 +548,13 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
      *
      * @return file fileId, unique within the instance
      */
+    @Nullable
     public String getLocalId() {
-        return getRemoteId().substring(0, 8).replaceAll("^0*", "");
+        if (getRemoteId() != null) {
+            return getRemoteId().substring(0, 8).replaceAll("^0*", "");
+        } else {
+            return null;
+        }
     }
 
     public boolean isInConflict() {