Compile fix before merging

2026-10-01 15:41:36 +00:00 · 2026-06-18 22:17:52 +00:00
parent c67dc4bd02
commit f641e8aaa0
15 changed files with 101 additions and 33 deletions
@@ -13,6 +13,9 @@ interface CardDao {
    @Insert(onConflict = OnConflictStrategy.IGNORE)
    suspend fun insertNewCard(card: Card): Long

+    @Query("SELECT * FROM Card")
+    fun getAllCards(): List<Card>
+
    @Query("SELECT * FROM Card WHERE cardId = :id")
    fun getCardByCardId(id: Int): List<Card>

@@ -131,6 +131,9 @@ interface UserCharacterDao {
    @Query("SELECT * FROM VBCharacterData WHERE id = :id")
    fun getVbData(id: Long): Flow<VBCharacterData>

+    @Query("SELECT * FROM VBCharacterData WHERE id = :id")
+    suspend fun getVbDataOrNull(id: Long): VBCharacterData?
+
    @Query("SELECT * FROM SpecialMissions WHERE characterId = :id")
    fun getSpecialMissions(id: Long): Flow<List<SpecialMissions>>

@@ -13,6 +13,8 @@ import com.github.nacabaro.vbhelper.daos.ItemDao
 import com.github.nacabaro.vbhelper.daos.SpecialMissionDao
 import com.github.nacabaro.vbhelper.daos.SpriteDao
 import com.github.nacabaro.vbhelper.daos.UserCharacterDao
+import com.github.nacabaro.vbhelper.companion.validation.ValidatedCardDao
+import com.github.nacabaro.vbhelper.companion.validation.ValidatedCardEntity
 import com.github.nacabaro.vbhelper.domain.card.Background
 import com.github.nacabaro.vbhelper.domain.card.CardCharacter
 import com.github.nacabaro.vbhelper.domain.card.Card
@@ -50,7 +52,8 @@ import com.github.nacabaro.vbhelper.domain.items.Items
        Items::class,
        Adventure::class,
        Background::class,
-        PossibleTransformations::class
+        PossibleTransformations::class,
+        ValidatedCardEntity::class
    ]
 )
 abstract class AppDatabase : RoomDatabase() {
@@ -65,4 +68,5 @@ abstract class AppDatabase : RoomDatabase() {
    abstract fun specialMissionDao(): SpecialMissionDao
    abstract fun cardAdventureDao(): CardAdventureDao
    abstract fun cardFusionsDao(): CardFusionsDao
+    abstract fun validatedCardDao(): ValidatedCardDao
 }
@@ -3,9 +3,13 @@ package com.github.nacabaro.vbhelper.di
 import com.github.nacabaro.vbhelper.database.AppDatabase
 import com.github.nacabaro.vbhelper.source.CurrencyRepository
 import com.github.nacabaro.vbhelper.source.DataStoreSecretsRepository
+import com.github.nacabaro.vbhelper.companion.validation.ValidatedCardManager
+import com.github.nacabaro.vbhelper.companion.logs.CompanionLogService

 interface AppContainer {
    val db: AppDatabase
    val dataStoreSecretsRepository: DataStoreSecretsRepository
    val currencyRepository: CurrencyRepository
+    val validatedCardManager: ValidatedCardManager
+    val companionLogService: CompanionLogService
 }
@@ -8,6 +8,8 @@ import com.github.nacabaro.vbhelper.database.AppDatabase
 import com.github.nacabaro.vbhelper.di.AppContainer
 import com.github.nacabaro.vbhelper.source.CurrencyRepository
 import com.github.nacabaro.vbhelper.source.DataStoreSecretsRepository
+import com.github.nacabaro.vbhelper.companion.validation.ValidatedCardManager
+import com.github.nacabaro.vbhelper.companion.logs.CompanionLogService
 import com.github.nacabaro.vbhelper.source.SecretsSerializer
 import com.github.nacabaro.vbhelper.source.proto.Secrets

@@ -37,5 +39,11 @@ class DefaultAppContainer(private val context: Context) : AppContainer {
    override val dataStoreSecretsRepository = DataStoreSecretsRepository(context.secretsStore)

    override val currencyRepository = CurrencyRepository(context.currencyStore)
+
+    override val validatedCardManager by lazy {
+        ValidatedCardManager(db.validatedCardDao())
+    }
+
+    override val companionLogService = CompanionLogService()
 }

@@ -2,10 +2,18 @@ package com.github.nacabaro.vbhelper.di

 import DefaultAppContainer
 import android.app.Application
+import com.github.nacabaro.vbhelper.companion.validation.ValidatedCardManager
+import com.github.nacabaro.vbhelper.companion.logs.CompanionLogService

 class VBHelper : Application() {
    lateinit var container: DefaultAppContainer

+    val validatedCardManager: ValidatedCardManager
+        get() = container.validatedCardManager
+
+    val companionLogService: CompanionLogService
+        get() = container.companionLogService
+
    override fun onCreate() {
        super.onCreate()
        container = DefaultAppContainer(applicationContext)
@@ -5,6 +5,7 @@ import com.github.nacabaro.vbhelper.domain.device_data.VBCharacterData
 import com.github.nacabaro.vbhelper.utils.DeviceType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import timber.log.Timber

 /**
 * Utility for converting character device types.
@@ -31,7 +32,7 @@ class DeviceTypeConverter(private val database: AppDatabase) {
            true
        } catch (e: Exception) {
            // Log but don't crash - character can still be sent as-is
-            android.util.Log.e("DeviceTypeConverter", "Failed to convert character $characterId to VB type", e)
+            Timber.e(e, "Failed to convert character $characterId to VB type")
            false
        }
    }
@@ -42,7 +43,7 @@ class DeviceTypeConverter(private val database: AppDatabase) {
            val vbCharacterData = VBCharacterData(
                id = characterId,
                generation = 0,
-                totalTrophies = 0
+                totalTrophies = 0,
            )
            database.userCharacterDao().insertVBCharacterData(vbCharacterData)
        }
@@ -23,6 +23,13 @@ message Character {
    int32 total_wins = 13;
    int32 current_phase_wins = 14;
    int32 mood = 15;
+
+    enum TransferDeviceType {
+      TRANSFER_DEVICE_TYPE_UNSPECIFIED = 0;
+      TRANSFER_DEVICE_TYPE_VB = 1;
+      TRANSFER_DEVICE_TYPE_BE = 2;
+    }
+    TransferDeviceType transfer_device_type = 16;
  }
  CharacterStats character_stats = 3;

@@ -48,9 +48,6 @@
    <string name="card_adventure_missions_title">アドベンチャーミッション</string>
    <string name="card_entry_characters_obtained">%1$d / %2$d のキャラクターを取得しました。</string>
    <string name="card_entry_edit">編集</string>
-    <string name="card_entry_edit">編集</string>
-    <string name="card_entry_edit">編集</string>
-    <string name="card_entry_edit">編集</string>
    <string name="card_entry_delete">削除</string>
    <string name="home_vbdim_current_phase_win">フェーズ勝率 %</string>
    <string name="home_vbdim_special_missions">スペシャルミッション</string>
@@ -92,7 +89,6 @@
    <string name="battles_online_title">オンラインバトル</string>
    <string name="obtained_item_you_also_got_credits">%1$d クレジットを獲得しました。</string>
    <string name="obtained_item_dismiss">閉じる</string>
-    <string name="obtained_item_dismiss">閉じる</string>
    <string name="nav_dex">図鑑</string>
    <string name="action_place_near_reader">バイタルブレス本体を近くに置いて下さい。</string>
    <string name="action_cancel">キャンセル</string>
@@ -100,7 +96,6 @@
    <string name="dex_chara_icon_description">キャラクターアイコン</string>
    <string name="dex_chara_name_icon_description">名前</string>
    <string name="credits_section_reverse_engineering">リバースエンジニアリング</string>
-    <string name="credits_section_reverse_engineering">リバースエンジニアリング</string>
    <string name="credits_section_app_development">アプリケーション開発</string>
    <string name="credits_cyanic_description">"         ファームウェアの解析を行い、開発をサポートしてくれました。"</string>
    <string name="credits_cfogrady_description">"         vb-lib-nfc開発およびアプリの開発に協力して頂きました。"</string>
@@ -219,4 +219,17 @@
    <string name="home_special_mission_delete_dismiss">Dismiss</string>
    <string name="home_special_mission_delete_remove">Remove</string>

+    <string name="settings_companion_import_card_image_title">Import Card Image</string>
+    <string name="companion_validation_connect_vb">Connect Vital Bracelet</string>
+    <string name="companion_card_import_success">Card imported successfully!</string>
+    <string name="companion_firmware_no_watch">No watch found!</string>
+    <string name="companion_validation_insert_card">Insert card into Vital Bracelet</string>
+    <string name="companion_validation_success">Validation successful!</string>
+    <string name="companion_loading_select_firmware">Select firmware file</string>
+    <string name="companion_firmware_sent_success">Firmware sent successfully!</string>
+    <string name="companion_logs_receive_failed">Failed to receive logs</string>
+    <string name="companion_logs_failed_request">Failed to request logs</string>
+    <string name="companion_logs_warning">Warning: Log transfer might take a while</string>
+    <string name="settings_companion_send_watch_logs_title">Send Watch Logs</string>
+    <string name="companion_transfer_disabled_message">Transfer is currently disabled</string>
 </resources>