From 69b55c02d6325f79fc796a023484dd49b0ad1387 Mon Sep 17 00:00:00 2001 From: krmanik <12841290+krmanik@users.noreply.github.com> Date: Mon, 6 Jun 2022 23:14:11 +0800 Subject: [PATCH] i18nResources and graphData for getting data from backend --- .../com/ichi2/libanki/backend/DroidBackend.kt | 7 +++++++ .../ichi2/libanki/backend/JavaDroidBackend.java | 15 +++++++++++++++ .../com/ichi2/libanki/backend/RustDroidBackend.kt | 5 +++++ 3 files changed, 27 insertions(+) diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/backend/DroidBackend.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/backend/DroidBackend.kt index df84e952c02e..57b678ac3265 100644 --- a/AnkiDroid/src/main/java/com/ichi2/libanki/backend/DroidBackend.kt +++ b/AnkiDroid/src/main/java/com/ichi2/libanki/backend/DroidBackend.kt @@ -19,6 +19,7 @@ import BackendProto.Backend.ExtractAVTagsOut import BackendProto.Backend.RenderCardOut import android.content.Context import androidx.annotation.VisibleForTesting +import com.google.protobuf.ByteString import com.ichi2.libanki.Collection import com.ichi2.libanki.DB import com.ichi2.libanki.DeckConfig @@ -85,4 +86,10 @@ interface DroidBackend { @Throws(BackendNotSupportedException::class) fun renderCardForTemplateManager(templateRenderContext: TemplateRenderContext): RenderCardOut + + @Throws(BackendNotSupportedException::class) + fun i18nResources(): ByteString + + @Throws(BackendNotSupportedException::class) + fun graphData(search: String, days: Int): ByteString } diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/backend/JavaDroidBackend.java b/AnkiDroid/src/main/java/com/ichi2/libanki/backend/JavaDroidBackend.java index 8e9cd11d9324..2d5033f548b1 100644 --- a/AnkiDroid/src/main/java/com/ichi2/libanki/backend/JavaDroidBackend.java +++ b/AnkiDroid/src/main/java/com/ichi2/libanki/backend/JavaDroidBackend.java @@ -18,6 +18,7 @@ import android.content.Context; +import com.google.protobuf.ByteString; import com.ichi2.libanki.Collection; import com.ichi2.libanki.DB; import com.ichi2.libanki.TemplateManager; @@ -108,4 +109,18 @@ public void useNewTimezoneCode(Collection col) { public @NonNull Backend.RenderCardOut renderCardForTemplateManager(@NonNull TemplateManager.TemplateRenderContext templateRenderContext) throws BackendNotSupportedException { throw new BackendNotSupportedException(); } + + + @NonNull + @Override + public ByteString i18nResources() throws BackendNotSupportedException { + throw new BackendNotSupportedException(); + } + + + @NonNull + @Override + public ByteString graphData(@NonNull String search, int days) throws BackendNotSupportedException { + throw new BackendNotSupportedException(); + } } diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/backend/RustDroidBackend.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/backend/RustDroidBackend.kt index 7bf98cd3a5ed..557c4133e6fa 100644 --- a/AnkiDroid/src/main/java/com/ichi2/libanki/backend/RustDroidBackend.kt +++ b/AnkiDroid/src/main/java/com/ichi2/libanki/backend/RustDroidBackend.kt @@ -19,6 +19,7 @@ package com.ichi2.libanki.backend import BackendProto.Backend.ExtractAVTagsOut import BackendProto.Backend.RenderCardOut import android.content.Context +import com.google.protobuf.ByteString import com.ichi2.libanki.Collection import com.ichi2.libanki.DB import com.ichi2.libanki.TemplateManager.TemplateRenderContext @@ -95,6 +96,10 @@ open class RustDroidBackend( throw BackendNotSupportedException() } + override fun i18nResources(): ByteString = backend.backend.i18nResources().json + + override fun graphData(search: String, days: Int): ByteString = backend.backend.graphs(search, days).toByteString() + companion object { const val UNUSED_VALUE = 0 }