Browse Source

Check for null when retrieving clip data item text on Android

(cherry picked from commit 5924e2b90e52b366813e985b6bcf28129b0f8f60)
Marcel Admiraal 3 years ago
parent
commit
fe60de2c6a
1 changed files with 7 additions and 8 deletions
  1. 7 8
      platform/android/java/lib/src/org/godotengine/godot/Godot.java

+ 7 - 8
platform/android/java/lib/src/org/godotengine/godot/Godot.java

@@ -789,14 +789,13 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
 	}
 
 	public String getClipboard() {
-		String copiedText = "";
-
-		if (mClipboard.hasPrimaryClip()) {
-			ClipData.Item item = mClipboard.getPrimaryClip().getItemAt(0);
-			copiedText = item.getText().toString();
-		}
-
-		return copiedText;
+		ClipData clipData = mClipboard.getPrimaryClip();
+		if (clipData == null)
+			return "";
+		CharSequence text = clipData.getItemAt(0).getText();
+		if (text == null)
+			return "";
+		return text.toString();
 	}
 
 	public void setClipboard(String p_text) {