Skip to content

Commit 05e4e72

Browse files
committed
simplify logic in extension
Signed-off-by: alperozturk <[email protected]>
1 parent 06328e2 commit 05e4e72

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@
1313
import androidx.annotation.Nullable;
1414
import androidx.annotation.WorkerThread;
1515

16-
import com.nextcloud.android.sso.api.EmptyResponse;
1716
import com.nextcloud.android.sso.model.SingleSignOnAccount;
1817

19-
import java.util.Objects;
20-
2118
import it.niedermann.owncloud.notes.shared.model.Capabilities;
19+
import it.niedermann.owncloud.notes.util.ThrowableExtensionsKt;
2220

2321
@WorkerThread
2422
public class CapabilitiesClient {
@@ -46,7 +44,7 @@ public static Capabilities getCapabilities(@NonNull Context context, @NonNull Si
4644

4745
return capabilities;
4846
} catch (Throwable t) {
49-
if (t instanceof ClassCastException castException && Objects.requireNonNull(castException.getMessage()).contains(EmptyResponse.class.getSimpleName())) {
47+
if (ThrowableExtensionsKt.isEmptyResponseCast(t)) {
5048
Log.d(TAG, "Server returned empty response - Notes not modified.");
5149
return repository.getCapabilities();
5250
}

app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import it.niedermann.owncloud.notes.shared.model.ISyncCallback;
4545
import it.niedermann.owncloud.notes.shared.model.SyncResultStatus;
4646
import it.niedermann.owncloud.notes.shared.util.ApiVersionUtil;
47+
import it.niedermann.owncloud.notes.util.ThrowableExtensionsKt;
4748

4849

4950
/**
@@ -282,7 +283,7 @@ private boolean pullRemoteChanges() {
282283
return true;
283284
} catch (Throwable t) {
284285
final Throwable cause = t.getCause();
285-
if (t instanceof ClassCastException castException && Objects.requireNonNull(castException.getMessage()).contains(EmptyResponse.class.getSimpleName())) {
286+
if (ThrowableExtensionsKt.isEmptyResponseCast(t)) {
286287
Log.d(TAG, "Server returned empty response - Notes not modified.");
287288
return true;
288289
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*
2+
* Nextcloud Notes - Android Client
3+
*
4+
* SPDX-FileCopyrightText: 2021-2025 Nextcloud GmbH and Nextcloud contributors
5+
* SPDX-License-Identifier: GPL-3.0-or-later
6+
*/
7+
package it.niedermann.owncloud.notes.util
8+
9+
import com.nextcloud.android.sso.api.EmptyResponse
10+
11+
fun Throwable.isEmptyResponseCast(): Boolean {
12+
return this is ClassCastException &&
13+
(message?.contains(EmptyResponse::class.simpleName ?: "") == true)
14+
}

0 commit comments

Comments
 (0)