From 5834de8b1a4e76cbf2d034569d4a4f80af3d7897 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 21 Feb 2024 10:47:38 +0100 Subject: [PATCH 1/3] Fix crash Signed-off-by: alperozturk --- .../ui/fragment/FileDetailActivitiesFragment.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java index f33ba3422f24..2c36dd99bc2d 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java @@ -101,6 +101,7 @@ public class FileDetailActivitiesFragment extends Fragment implements private int lastGiven; private boolean isLoadingActivities; + private boolean isDataFetched = false; private boolean restoreFileVersionSupported; private FileOperationsHelper operationsHelper; @@ -198,7 +199,7 @@ public void submitComment() { String trimmedComment = commentField.toString().trim(); - if (trimmedComment.length() > 0) { + if (trimmedComment.length() > 0 && ownCloudClient != null && isDataFetched) { new SubmitCommentTask(trimmedComment, file.getLocalId(), callback, ownCloudClient).execute(); } } @@ -363,6 +364,14 @@ private void fetchAndSetData(int lastGiven) { }); t.start(); + + try { + t.join(); + isDataFetched = true; + Log_OC.d(TAG, "Data fetched"); + } catch (InterruptedException e) { + e.printStackTrace(); + } } public void markCommentsAsRead() { From 33dcd22614204e95e384584ec1fab06f074f1e7d Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 21 Feb 2024 11:27:55 +0100 Subject: [PATCH 2/3] Replace print function with Log_OC.d Signed-off-by: alperozturk --- .../android/ui/fragment/FileDetailActivitiesFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java index 2c36dd99bc2d..db9db8375c7a 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java @@ -370,7 +370,7 @@ private void fetchAndSetData(int lastGiven) { isDataFetched = true; Log_OC.d(TAG, "Data fetched"); } catch (InterruptedException e) { - e.printStackTrace(); + Log_OC.d(TAG, "Error caught at thread join: $e"); } } From dae166f6185e6261f09f96983d79ba7f89f21de0 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 13 Mar 2024 13:08:48 +0100 Subject: [PATCH 3/3] Fix condition Signed-off-by: alperozturk --- .../ui/fragment/FileDetailActivitiesFragment.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java index db9db8375c7a..368542029f14 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java @@ -341,6 +341,8 @@ private void fetchAndSetData(int lastGiven) { populateList(activitiesAndVersions, lastGiven == -1); } }); + + isDataFetched = true; } else { Log_OC.d(TAG, result.getLogMessage()); // show error @@ -355,23 +357,18 @@ private void fetchAndSetData(int lastGiven) { isLoadingActivities = false; } }); + + isDataFetched = false; } hideRefreshLayoutLoader(activity); } catch (ClientFactory.CreationException e) { + isDataFetched = false; Log_OC.e(TAG, "Error fetching file details activities", e); } }); t.start(); - - try { - t.join(); - isDataFetched = true; - Log_OC.d(TAG, "Data fetched"); - } catch (InterruptedException e) { - Log_OC.d(TAG, "Error caught at thread join: $e"); - } } public void markCommentsAsRead() {