From f73139032e59bd9f091a0cfde337bf8b8cddb32a Mon Sep 17 00:00:00 2001 From: Igor Date: Fri, 14 May 2021 17:15:09 +0300 Subject: [PATCH] QTBUG-91170 fixed --- .../jar/src/org/qtproject/qt5/android/QtNative.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java index 39f1220722..19d7efbbf8 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -1038,14 +1038,14 @@ public class QtNative private static void updatePrimaryClip(ClipData clipData) { try { - if (m_usePrimaryClip) { - ClipData clip = m_clipboardManager.getPrimaryClip(); + if (m_usePrimaryClip && m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) { + ClipData primaryClip = m_clipboardManager.getPrimaryClip(); if (Build.VERSION.SDK_INT >= 26) { - Objects.requireNonNull(clip).addItem(m_activity.getContentResolver(), clipData.getItemAt(0)); + Objects.requireNonNull(primaryClip).addItem(m_activity.getContentResolver(), clipData.getItemAt(0)); } else { - Objects.requireNonNull(clip).addItem(clipData.getItemAt(0)); + Objects.requireNonNull(primaryClip).addItem(clipData.getItemAt(0)); } - m_clipboardManager.setPrimaryClip(clip); + m_clipboardManager.setPrimaryClip(primaryClip); } else { m_clipboardManager.setPrimaryClip(clipData); m_usePrimaryClip = true; -- 2.24.3 (Apple Git-128)