From 5a84c9c4f4f37adb1aaa9dc82749fd1ebbb2f81f Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Tue, 22 Oct 2024 10:36:57 +0800 Subject: [PATCH] prevent NPE --- forge-gui-android/src/forge/app/Main.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/forge-gui-android/src/forge/app/Main.java b/forge-gui-android/src/forge/app/Main.java index 0476bfb4638..1456dd14155 100644 --- a/forge-gui-android/src/forge/app/Main.java +++ b/forge-gui-android/src/forge/app/Main.java @@ -506,9 +506,12 @@ public class Main extends ForgeAndroidApplication { @Override public boolean hasContents() { - if (cm.getPrimaryClip().getItemCount() > 0) { + ClipData clipData = cm.getPrimaryClip(); + if (clipData == null) + return false; + if (clipData.getItemCount() > 0) { try { - return cm.getPrimaryClip().getItemAt(0).coerceToText(getContext()).length() > 0; + return clipData.getItemAt(0).coerceToText(getContext()).length() > 0; } catch (Exception ex) { return false; } @@ -518,9 +521,12 @@ public class Main extends ForgeAndroidApplication { @Override public String getContents() { - if (cm.getPrimaryClip().getItemCount() > 0) { + ClipData clipData = cm.getPrimaryClip(); + if (clipData == null) + return ""; + if (clipData.getItemCount() > 0) { try { - String text = cm.getPrimaryClip().getItemAt(0).coerceToText(getContext()).toString(); + String text = clipData.getItemAt(0).coerceToText(getContext()).toString(); return Normalizer.normalize(text, Normalizer.Form.NFD); } catch (Exception ex) { ex.printStackTrace();