From b19fddfc2e55008f20735f74ea82033a612df2eb Mon Sep 17 00:00:00 2001 From: Jeff Harris Date: Mon, 8 Jul 2024 21:03:56 -0400 Subject: [PATCH] sync: Fix SyncDb user nullability Add nullable for return type of useDb --- .../com/jefftharris/passwdsafe/sync/PasswdSafeProvider.java | 2 ++ .../main/java/com/jefftharris/passwdsafe/sync/lib/SyncDb.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sync/src/main/java/com/jefftharris/passwdsafe/sync/PasswdSafeProvider.java b/sync/src/main/java/com/jefftharris/passwdsafe/sync/PasswdSafeProvider.java index d69c52eeb..06bf91593 100644 --- a/sync/src/main/java/com/jefftharris/passwdsafe/sync/PasswdSafeProvider.java +++ b/sync/src/main/java/com/jefftharris/passwdsafe/sync/PasswdSafeProvider.java @@ -25,6 +25,7 @@ import android.os.ParcelFileDescriptor; import android.util.Log; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.core.app.ActivityCompat; import com.jefftharris.passwdsafe.lib.ManagedRef; @@ -815,6 +816,7 @@ protected AccountVerifier(PasswdSafeProvider provider) itsProvider = new ManagedRef<>(provider); } + @Nullable @Override protected Void doInBackground(Void... voids) { diff --git a/sync/src/main/java/com/jefftharris/passwdsafe/sync/lib/SyncDb.java b/sync/src/main/java/com/jefftharris/passwdsafe/sync/lib/SyncDb.java index c0b850fa1..ae24cdd81 100644 --- a/sync/src/main/java/com/jefftharris/passwdsafe/sync/lib/SyncDb.java +++ b/sync/src/main/java/com/jefftharris/passwdsafe/sync/lib/SyncDb.java @@ -107,7 +107,7 @@ public interface DbUser /** * Use the database */ - T useDb(SQLiteDatabase db) throws Exception; + @Nullable T useDb(SQLiteDatabase db) throws Exception; } /** Initialize the single SyncDb instance */