From 58d9321cbd3cbbfb77f8b11a17bcf709ba4ce5ba Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 11:08:15 +0800 Subject: [PATCH 01/21] fix(db): resolve Room warnings and SQL syntax errors - Replace deprecated RoomWarnings.CURSOR_MISMATCH with QUERY_MISMATCH - Add @RewriteQueriesToDropUnusedColumns to DAO interfaces - Fix SQL syntax error in Web3WalletDao subquery --- .../main/java/one/mixin/android/db/AppDao.kt | 4 +- .../java/one/mixin/android/db/AssetDao.kt | 18 ++++---- .../java/one/mixin/android/db/CircleDao.kt | 4 +- .../one/mixin/android/db/ConversationDao.kt | 9 ++-- .../one/mixin/android/db/MarketCoinDao.kt | 2 + .../java/one/mixin/android/db/MarketDao.kt | 1 + .../java/one/mixin/android/db/MessageDao.kt | 42 ++++++++++--------- .../one/mixin/android/db/MessageMentionDao.kt | 6 ++- .../java/one/mixin/android/db/OutputDao.kt | 2 + .../mixin/android/db/ParticipantSessionDao.kt | 4 +- .../one/mixin/android/db/SafeSnapshotDao.kt | 3 +- .../java/one/mixin/android/db/TokenDao.kt | 2 + .../java/one/mixin/android/db/TopAssetDao.kt | 4 +- .../mixin/android/db/TranscriptMessageDao.kt | 8 ++-- .../main/java/one/mixin/android/db/UserDao.kt | 10 +++-- .../android/db/pending/PendingMessageDao.kt | 2 +- .../mixin/android/db/web3/Web3WalletDao.kt | 16 +++---- 17 files changed, 83 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/one/mixin/android/db/AppDao.kt b/app/src/main/java/one/mixin/android/db/AppDao.kt index 75dca80e43..12d2df44a6 100644 --- a/app/src/main/java/one/mixin/android/db/AppDao.kt +++ b/app/src/main/java/one/mixin/android/db/AppDao.kt @@ -3,6 +3,7 @@ package one.mixin.android.db import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RoomWarnings import one.mixin.android.db.BaseDao.Companion.ESCAPE_SUFFIX import one.mixin.android.vo.App @@ -11,6 +12,7 @@ import one.mixin.android.vo.ExploreApp import one.mixin.android.vo.RecentUsedApp @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface AppDao : BaseDao { companion object { @@ -23,7 +25,7 @@ interface AppDao : BaseDao { """ } - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ $PREFIX_APP_ITEM diff --git a/app/src/main/java/one/mixin/android/db/AssetDao.kt b/app/src/main/java/one/mixin/android/db/AssetDao.kt index cfe56d3ebd..6ad42dc3d2 100644 --- a/app/src/main/java/one/mixin/android/db/AssetDao.kt +++ b/app/src/main/java/one/mixin/android/db/AssetDao.kt @@ -43,23 +43,23 @@ interface AssetDao : BaseDao { @Query("SELECT * FROM assets WHERE asset_id = :id") suspend fun simpleAsset(id: String): Asset? - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("$PREFIX_ASSET_ITEM WHERE ae.hidden = 1 $POSTFIX_ASSET_ITEM") fun hiddenAssetItems(): LiveData> - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("$PREFIX_ASSET_ITEM $POSTFIX_ASSET_ITEM_NOT_HIDDEN") fun assetItemsNotHidden(): LiveData> - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("$PREFIX_ASSET_ITEM $POSTFIX_ASSET_ITEM") fun assetItems(): LiveData> - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("""$PREFIX_ASSET_ITEM WHERE a1.asset_id IN (:assetIds) $POSTFIX_ASSET_ITEM """) fun assetItems(assetIds: List): LiveData> - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """$PREFIX_ASSET_ITEM WHERE a1.balance > 0 @@ -74,7 +74,7 @@ interface AssetDao : BaseDao { symbol: String, ): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """$PREFIX_ASSET_ITEM WHERE (a1.symbol LIKE '%' || :symbol || '%' $ESCAPE_SUFFIX OR a1.name LIKE '%' || :name || '%' $ESCAPE_SUFFIX) @@ -88,15 +88,15 @@ interface AssetDao : BaseDao { symbol: String, ): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("$PREFIX_ASSET_ITEM WHERE a1.asset_id = :id") fun assetItem(id: String): LiveData - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("$PREFIX_ASSET_ITEM WHERE a1.asset_id = :assetId") suspend fun simpleAssetItem(assetId: String): AssetItem? - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("$PREFIX_ASSET_ITEM WHERE a1.balance > 0 $POSTFIX_ASSET_ITEM") fun assetItemsWithBalance(): LiveData> diff --git a/app/src/main/java/one/mixin/android/db/CircleDao.kt b/app/src/main/java/one/mixin/android/db/CircleDao.kt index 8ff27ea00f..f5ee11570b 100644 --- a/app/src/main/java/one/mixin/android/db/CircleDao.kt +++ b/app/src/main/java/one/mixin/android/db/CircleDao.kt @@ -3,6 +3,7 @@ package one.mixin.android.db import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RoomWarnings import androidx.room.Transaction import androidx.room.Update @@ -13,6 +14,7 @@ import one.mixin.android.vo.ConversationCircleManagerItem import one.mixin.android.vo.ConversationMinimal @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface CircleDao : BaseDao { @Transaction @@ -106,7 +108,7 @@ interface CircleDao : BaseDao { @Query("SELECT * FROM circles WHERE circle_id = :circleId") fun findCircleById(circleId: String): Circle? - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT c.conversation_id AS conversationId, c.icon_url AS groupIconUrl, c.category AS category, diff --git a/app/src/main/java/one/mixin/android/db/ConversationDao.kt b/app/src/main/java/one/mixin/android/db/ConversationDao.kt index ae51521db7..1f55a3ccd3 100644 --- a/app/src/main/java/one/mixin/android/db/ConversationDao.kt +++ b/app/src/main/java/one/mixin/android/db/ConversationDao.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData import androidx.paging.DataSource import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RoomWarnings import one.mixin.android.vo.Conversation import one.mixin.android.vo.ConversationItem @@ -14,6 +15,8 @@ import one.mixin.android.vo.GroupMinimal import one.mixin.android.vo.ParticipantSessionMinimal @Dao +@RewriteQueriesToDropUnusedColumns +@SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface ConversationDao : BaseDao { companion object { const val PREFIX_CONVERSATION_ITEM = @@ -39,7 +42,7 @@ interface ConversationDao : BaseDao { } // Read SQL - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH, RoomWarnings.QUERY_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """$PREFIX_CONVERSATION_ITEM WHERE c.category IN ('CONTACT', 'GROUP') @@ -48,7 +51,7 @@ interface ConversationDao : BaseDao { ) fun conversationList(): DataSource.Factory - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH, RoomWarnings.QUERY_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT c.conversation_id AS conversationId, c.icon_url AS groupIconUrl, c.category AS category, @@ -112,7 +115,7 @@ interface ConversationDao : BaseDao { @Query("SELECT c.draft FROM conversations c WHERE c.conversation_id = :conversationId") suspend fun getConversationDraftById(conversationId: String): String? - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH, RoomWarnings.QUERY_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( "SELECT c.conversation_id AS conversationId, c.icon_url AS groupIconUrl, c.category AS category, " + "c.name AS groupName, c.status AS status, c.last_read_message_id AS lastReadMessageId, " + diff --git a/app/src/main/java/one/mixin/android/db/MarketCoinDao.kt b/app/src/main/java/one/mixin/android/db/MarketCoinDao.kt index a9a06bf780..2c3d0ad250 100644 --- a/app/src/main/java/one/mixin/android/db/MarketCoinDao.kt +++ b/app/src/main/java/one/mixin/android/db/MarketCoinDao.kt @@ -2,12 +2,14 @@ package one.mixin.android.db import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RoomWarnings import one.mixin.android.db.TokenDao.Companion.PREFIX_ASSET_ITEM import one.mixin.android.vo.market.MarketCoin import one.mixin.android.vo.safe.TokenItem @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface MarketCoinDao : BaseDao { @Query("$PREFIX_ASSET_ITEM LEFT JOIN market_coins mc on mc.asset_id = a1.asset_id WHERE mc.coin_id = :coinId") diff --git a/app/src/main/java/one/mixin/android/db/MarketDao.kt b/app/src/main/java/one/mixin/android/db/MarketDao.kt index 07ffb7885b..6e581a8da2 100644 --- a/app/src/main/java/one/mixin/android/db/MarketDao.kt +++ b/app/src/main/java/one/mixin/android/db/MarketDao.kt @@ -12,6 +12,7 @@ import one.mixin.android.vo.market.Market import one.mixin.android.vo.market.MarketItem @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface MarketDao : BaseDao { @Query("SELECT m.*, mf.is_favored FROM markets m LEFT JOIN market_favored mf on mf.coin_id = m.coin_id LEFT JOIN market_coins mc ON mc.coin_id = m.coin_id WHERE mc.asset_id = :assetId") diff --git a/app/src/main/java/one/mixin/android/db/MessageDao.kt b/app/src/main/java/one/mixin/android/db/MessageDao.kt index 2281773be4..d3ba49fe04 100644 --- a/app/src/main/java/one/mixin/android/db/MessageDao.kt +++ b/app/src/main/java/one/mixin/android/db/MessageDao.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData import androidx.paging.DataSource import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RawQuery import androidx.room.RoomWarnings import androidx.sqlite.db.SupportSQLiteQuery @@ -28,6 +29,7 @@ import one.mixin.android.vo.QuoteMinimal import one.mixin.android.vo.SearchMessageDetailItem @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface MessageDao : BaseDao { companion object { @@ -64,7 +66,7 @@ interface MessageDao : BaseDao { } // Read SQL - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("$PREFIX_MESSAGE_ITEM WHERE m.conversation_id = :conversationId AND m.category IN $CHAT_CATEGORY ORDER BY m.created_at ASC LIMIT :limit OFFSET :offset") suspend fun getChatMessages( conversationId: String, @@ -84,7 +86,7 @@ interface MessageDao : BaseDao { messageId: String, ): String? - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.id AS messageId, m.conversation_id AS conversationId, u.user_id AS userId, @@ -102,7 +104,7 @@ interface MessageDao : BaseDao { ) fun getMediaMessages(conversationId: String): DataSource.Factory - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.id AS messageId, m.conversation_id AS conversationId, u.user_id AS userId, @@ -142,7 +144,7 @@ interface MessageDao : BaseDao { """) suspend fun countIndexMediaMessages(conversationId: String): Int - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.id AS messageId, m.conversation_id AS conversationId, u.user_id AS userId, @@ -181,7 +183,7 @@ interface MessageDao : BaseDao { """) suspend fun countIndexMediaMessagesExcludeLive(conversationId: String): Int - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.id AS messageId, m.conversation_id AS conversationId, u.user_id AS userId, u.avatar_url AS userAvatarUrl, @@ -197,7 +199,7 @@ interface MessageDao : BaseDao { ) fun getAudioMessages(conversationId: String): DataSource.Factory - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.id AS messageId, m.conversation_id AS conversationId, u.user_id AS userId, u.avatar_url AS userAvatarUrl, @@ -225,7 +227,7 @@ interface MessageDao : BaseDao { ) fun getLinkMessages(conversationId: String): DataSource.Factory - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.id AS messageId, m.conversation_id AS conversationId, u.user_id AS userId, @@ -240,7 +242,7 @@ interface MessageDao : BaseDao { ) fun getFileMessages(conversationId: String): DataSource.Factory - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.id AS messageId, m.conversation_id AS conversationId, u.user_id AS userId, @@ -344,7 +346,7 @@ interface MessageDao : BaseDao { limit: Int, ): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.* FROM messages m @@ -358,7 +360,7 @@ interface MessageDao : BaseDao { rowId: Long, ): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.* FROM messages m @@ -373,7 +375,7 @@ interface MessageDao : BaseDao { conversationIds: Collection, ): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.* FROM messages m @@ -388,7 +390,7 @@ interface MessageDao : BaseDao { createdAt: String, ): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.* FROM messages m @@ -414,7 +416,7 @@ interface MessageDao : BaseDao { @Query("SELECT DISTINCT conversation_id FROM messages WHERE id IN (:messages)") fun findConversationsByMessages(messages: List): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT rowid, id FROM messages WHERE conversation_id = :conversationId @@ -446,7 +448,7 @@ interface MessageDao : BaseDao { encryptedCategory: String, ): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ $PREFIX_MESSAGE_ITEM WHERE m.conversation_id = :conversationId AND (m.category IN ($AUDIOS)) AND m.created_at >= :createdAt AND @@ -459,7 +461,7 @@ interface MessageDao : BaseDao { messageId: String, ): MessageItem? - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT * FROM messages WHERE conversation_id = :conversationId AND (category IN ($AUDIOS)) @@ -587,7 +589,7 @@ interface MessageDao : BaseDao { @Query("SELECT count(id) FROM messages WHERE conversation_id = :conversationId") suspend fun countDeleteMessageByConversationId(conversationId: String): Int - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.id AS messageId, m.conversation_id AS conversationId, u.user_id AS userId, @@ -604,7 +606,7 @@ interface MessageDao : BaseDao { ) fun findAudiosByConversationId(conversationId: String): DataSource.Factory - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT count(1) FROM messages @@ -621,7 +623,7 @@ interface MessageDao : BaseDao { conversationId: String, ): Int - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT m.id AS messageId, m.conversation_id AS conversationId, u.user_id AS userId, @@ -638,7 +640,7 @@ interface MessageDao : BaseDao { ids: List, ): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("$PREFIX_MESSAGE_ITEM WHERE m.id = :messageId") fun findMessageItemByMessageId(messageId: String): LiveData @@ -648,7 +650,7 @@ interface MessageDao : BaseDao { @Query("SELECT id FROM messages LIMIT 1") suspend fun hasMessage(): String? - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("SELECT * FROM messages WHERE id = :messageId") fun findMessageMediaById(messageId: String): MessageMedia? diff --git a/app/src/main/java/one/mixin/android/db/MessageMentionDao.kt b/app/src/main/java/one/mixin/android/db/MessageMentionDao.kt index 7a6cba20a0..b4df030eeb 100644 --- a/app/src/main/java/one/mixin/android/db/MessageMentionDao.kt +++ b/app/src/main/java/one/mixin/android/db/MessageMentionDao.kt @@ -3,11 +3,13 @@ package one.mixin.android.db import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RoomWarnings import one.mixin.android.ui.transfer.vo.compatible.TransferMessageMention import one.mixin.android.vo.MessageMention @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface MessageMentionDao : BaseDao { @Query("SELECT count(1) FROM message_mentions WHERE conversation_id = :conversationId AND has_read = 0") @@ -54,14 +56,14 @@ interface MessageMentionDao : BaseDao { @Query("SELECT * FROM message_mentions WHERE message_id = :id") fun findMessageMentionById(id: String): MessageMention? - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("SELECT mm.* FROM message_mentions mm WHERE mm.rowid > :rowId ORDER BY mm.rowid ASC LIMIT :limit") fun getMessageMentionByLimitAndRowId( limit: Int, rowId: Long, ): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("SELECT mm.* FROM message_mentions mm WHERE mm.rowid > :rowId AND conversation_id IN (:conversationIds) ORDER BY mm.rowid ASC LIMIT :limit") fun getMessageMentionByLimitAndRowId( limit: Int, diff --git a/app/src/main/java/one/mixin/android/db/OutputDao.kt b/app/src/main/java/one/mixin/android/db/OutputDao.kt index 7516bb34df..c1a8428a47 100644 --- a/app/src/main/java/one/mixin/android/db/OutputDao.kt +++ b/app/src/main/java/one/mixin/android/db/OutputDao.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData import androidx.paging.PagingSource import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RoomWarnings import androidx.room.Transaction import one.mixin.android.ui.home.web3.components.InscriptionState @@ -14,6 +15,7 @@ import one.mixin.android.vo.safe.SafeCollection import timber.log.Timber @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface OutputDao : BaseDao { @Query("SELECT * FROM outputs WHERE (state = 'unspent' OR state = 'pending') AND asset = :asset AND (inscription_hash IS NULL OR inscription_hash = '') ORDER BY CASE WHEN state = 'pending' THEN 1 ELSE 0 END, sequence ASC LIMIT :limit") diff --git a/app/src/main/java/one/mixin/android/db/ParticipantSessionDao.kt b/app/src/main/java/one/mixin/android/db/ParticipantSessionDao.kt index 887f2a34f1..3062e9537e 100644 --- a/app/src/main/java/one/mixin/android/db/ParticipantSessionDao.kt +++ b/app/src/main/java/one/mixin/android/db/ParticipantSessionDao.kt @@ -4,6 +4,7 @@ import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RoomWarnings import androidx.room.Transaction import androidx.room.Update @@ -12,6 +13,7 @@ import one.mixin.android.vo.ParticipantSessionKey import one.mixin.android.vo.ParticipantSessionSent @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface ParticipantSessionDao : BaseDao { @Query("SELECT * FROM participant_session WHERE conversation_id = :conversationId AND user_id = :userId AND session_id = :sessionId") @@ -24,7 +26,7 @@ interface ParticipantSessionDao : BaseDao { @Query("SELECT * FROM participant_session WHERE conversation_id = :conversationId") fun getParticipantSessionsByConversationId(conversationId: String): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("SELECT * FROM participant_session WHERE conversation_id = :conversationId AND user_id != :userId LIMIT 1") fun getParticipantSessionKeyWithoutSelf( conversationId: String, diff --git a/app/src/main/java/one/mixin/android/db/SafeSnapshotDao.kt b/app/src/main/java/one/mixin/android/db/SafeSnapshotDao.kt index 9994b64eb1..f0799c685b 100644 --- a/app/src/main/java/one/mixin/android/db/SafeSnapshotDao.kt +++ b/app/src/main/java/one/mixin/android/db/SafeSnapshotDao.kt @@ -5,6 +5,7 @@ import androidx.paging.DataSource import androidx.paging.PagingSource import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RawQuery import androidx.room.RoomWarnings import androidx.room.Transaction @@ -19,6 +20,7 @@ import one.mixin.android.vo.safe.SafeSnapshot import one.mixin.android.vo.safe.Token @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface SafeSnapshotDao : BaseDao { companion object { @@ -156,5 +158,4 @@ interface SafeSnapshotDao : BaseDao { @Query("SELECT * FROM safe_snapshots WHERE withdrawal LIKE '%'||:receiver||'%' ORDER BY created_at DESC LIMIT 1") suspend fun findLastWithdrawalSnapshotByReceiver(receiver: String): SafeSnapshot? - } diff --git a/app/src/main/java/one/mixin/android/db/TokenDao.kt b/app/src/main/java/one/mixin/android/db/TokenDao.kt index 58ae5dfa4f..a9a8b20588 100644 --- a/app/src/main/java/one/mixin/android/db/TokenDao.kt +++ b/app/src/main/java/one/mixin/android/db/TokenDao.kt @@ -3,6 +3,7 @@ package one.mixin.android.db import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RawQuery import androidx.room.RoomRawQuery import androidx.room.RoomWarnings @@ -18,6 +19,7 @@ import one.mixin.android.vo.safe.TokenItem import one.mixin.android.vo.safe.UnifiedAssetItem @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface TokenDao : BaseDao { companion object { diff --git a/app/src/main/java/one/mixin/android/db/TopAssetDao.kt b/app/src/main/java/one/mixin/android/db/TopAssetDao.kt index 5c934c278c..f5f9c1c1fc 100644 --- a/app/src/main/java/one/mixin/android/db/TopAssetDao.kt +++ b/app/src/main/java/one/mixin/android/db/TopAssetDao.kt @@ -3,14 +3,16 @@ package one.mixin.android.db import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RoomWarnings import one.mixin.android.vo.TopAsset import one.mixin.android.vo.TopAssetItem @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface TopAssetDao : BaseDao { - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT ta.asset_id as asset_id, ta.symbol as symbol, ta.name as name, ta.icon_url as icon_url, ta.chain_id as chain_id, a.icon_url as chain_icon_url, diff --git a/app/src/main/java/one/mixin/android/db/TranscriptMessageDao.kt b/app/src/main/java/one/mixin/android/db/TranscriptMessageDao.kt index 2dd95b89d4..157e5586d5 100644 --- a/app/src/main/java/one/mixin/android/db/TranscriptMessageDao.kt +++ b/app/src/main/java/one/mixin/android/db/TranscriptMessageDao.kt @@ -3,6 +3,7 @@ package one.mixin.android.db import androidx.paging.DataSource import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RoomWarnings import one.mixin.android.db.contants.AUDIOS import one.mixin.android.db.contants.DATA @@ -15,6 +16,7 @@ import one.mixin.android.vo.TranscriptAttachmentMigration import one.mixin.android.vo.TranscriptMessage @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface TranscriptMessageDao : BaseDao { companion object { @@ -31,7 +33,7 @@ interface TranscriptMessageDao : BaseDao { @Query("SELECT * FROM transcript_messages WHERE message_id = :messageId AND category IN ($IMAGES, $VIDEOS, $DATA, $AUDIOS) AND (media_status = 'DONE' OR media_status = 'READ')") fun findAttachmentMessage(messageId: String): TranscriptMessage? - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("SELECT * FROM transcript_messages WHERE transcript_id = :transcriptId") fun getTranscript(transcriptId: String): List @@ -62,7 +64,7 @@ interface TranscriptMessageDao : BaseDao { mediaStatus: String, ) - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT t.transcript_id AS transcriptId, t.message_id AS messageId, t.user_id AS userId , IFNULL(u.full_name, t.user_full_name) AS userFullName, u.app_id AS appId, u.identity_number AS userIdentityNumber, @@ -88,7 +90,7 @@ interface TranscriptMessageDao : BaseDao { messageId: String, ): Int - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """ SELECT t.transcript_id AS transcriptId, t.message_id AS messageId, t.user_id AS userId , IFNULL(u.full_name, t.user_full_name) AS userFullName, u.app_id AS appId, u.identity_number AS userIdentityNumber, t.category AS type, t.content, t.created_at AS createdAt, t.media_status AS mediaStatus, t.media_name AS mediaName, diff --git a/app/src/main/java/one/mixin/android/db/UserDao.kt b/app/src/main/java/one/mixin/android/db/UserDao.kt index 6c7ade9a6e..42f09c7faf 100644 --- a/app/src/main/java/one/mixin/android/db/UserDao.kt +++ b/app/src/main/java/one/mixin/android/db/UserDao.kt @@ -3,6 +3,7 @@ package one.mixin.android.db import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RoomWarnings import androidx.room.Transaction import kotlinx.coroutines.flow.Flow @@ -15,6 +16,7 @@ import one.mixin.android.vo.User import one.mixin.android.vo.UserItem @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface UserDao : BaseDao { @@ -189,7 +191,7 @@ interface UserDao : BaseDao { relationship: String, ) - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( "SELECT u.user_id, u.identity_number, u.biography, u.full_name, u.relationship FROM participants p, users u " + "WHERE p.conversation_id = :conversationId AND p.user_id = u.user_id", @@ -214,14 +216,14 @@ interface UserDao : BaseDao { phone: String, ) - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("SELECT u.* FROM users u INNER JOIN conversations c ON c.owner_id = u.user_id WHERE c.category = 'CONTACT' AND u.app_id IS NULL") fun findContactUsers(): LiveData> @Query("SELECT * FROM users WHERE user_id IN (:userIds)") suspend fun findMultiUsersByIds(userIds: Set): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """SELECT * FROM users u INNER JOIN participants p ON p.user_id = u.user_id WHERE p.conversation_id = :conversationId AND u.user_id IN (:userIds) @@ -232,7 +234,7 @@ interface UserDao : BaseDao { userIds: Set, ): List - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query( """SELECT * FROM users u INNER JOIN participants p ON p.user_id = u.user_id WHERE p.conversation_id = :conversationId AND u.user_id = :userId diff --git a/app/src/main/java/one/mixin/android/db/pending/PendingMessageDao.kt b/app/src/main/java/one/mixin/android/db/pending/PendingMessageDao.kt index fd45d2ff57..cc87004e58 100644 --- a/app/src/main/java/one/mixin/android/db/pending/PendingMessageDao.kt +++ b/app/src/main/java/one/mixin/android/db/pending/PendingMessageDao.kt @@ -46,7 +46,7 @@ interface PendingMessageDao : BaseDao { messageId: String, ): String? - @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) + @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) @Query("SELECT category, id, conversation_id, media_url FROM pending_messages WHERE id = :messageId") fun findMessageMediaById(messageId: String): MessageMedia? diff --git a/app/src/main/java/one/mixin/android/db/web3/Web3WalletDao.kt b/app/src/main/java/one/mixin/android/db/web3/Web3WalletDao.kt index c6a5aff4c8..22804ee720 100644 --- a/app/src/main/java/one/mixin/android/db/web3/Web3WalletDao.kt +++ b/app/src/main/java/one/mixin/android/db/web3/Web3WalletDao.kt @@ -3,6 +3,7 @@ package one.mixin.android.db.web3 import android.content.Context import androidx.room.Dao import androidx.room.Query +import androidx.room.RewriteQueriesToDropUnusedColumns import androidx.room.RoomWarnings import androidx.room.Transaction import kotlinx.coroutines.flow.Flow @@ -13,6 +14,7 @@ import one.mixin.android.db.web3.vo.Web3Wallet import one.mixin.android.vo.WalletCategory @Dao +@RewriteQueriesToDropUnusedColumns @SuppressWarnings(RoomWarnings.QUERY_MISMATCH) interface Web3WalletDao : BaseDao { @@ -28,19 +30,19 @@ interface Web3WalletDao : BaseDao { } @Query(""" - SELECT * FROM ($WALLET_ITEM_QUERY) w WHERE w.id != :excludeWalletId AND w.name LIKE '%' || :query || '%' AND + SELECT * FROM ($WALLET_ITEM_QUERY) AS w WHERE w.id != :excludeWalletId AND w.name LIKE '%' || :query || '%' AND (EXISTS (SELECT 1 FROM addresses a WHERE a.wallet_id = w.id AND a.chain_id = :chainId) OR w.safeChainId = :chainId) ORDER BY createdAt ASC """) suspend fun getWalletsExcludingByName(excludeWalletId: String, chainId: String, query: String): List - @Query("SELECT * FROM ($WALLET_ITEM_QUERY) w WHERE w.id != :excludeWalletId AND w.name LIKE '%' || :query || '%' ORDER BY createdAt ASC") + @Query("SELECT * FROM ($WALLET_ITEM_QUERY) AS w WHERE w.id != :excludeWalletId AND w.name LIKE '%' || :query || '%' ORDER BY createdAt ASC") suspend fun getWalletsExcludingByNameAllChains(excludeWalletId: String, query: String): List - @Query("SELECT * FROM ($WALLET_ITEM_QUERY) ORDER BY createdAt ASC") + @Query("SELECT * FROM ($WALLET_ITEM_QUERY) AS w ORDER BY createdAt ASC") fun getWallets(): Flow> - @Query("SELECT * FROM ($WALLET_ITEM_QUERY) ORDER BY createdAt ASC") + @Query("SELECT * FROM ($WALLET_ITEM_QUERY) AS w ORDER BY createdAt ASC") suspend fun getAllWallets(): List @Query("SELECT wallet_id FROM wallets WHERE category = 'classic' ORDER BY created_at ASC LIMIT 1 ") @@ -49,16 +51,16 @@ interface Web3WalletDao : BaseDao { @Query("SELECT * FROM wallets WHERE category = 'classic' LIMIT 1 ") suspend fun anyClassicWallet(): Web3Wallet? - @Query("SELECT * FROM ($WALLET_ITEM_QUERY) WHERE id = :walletId") + @Query("SELECT * FROM ($WALLET_ITEM_QUERY) AS w WHERE w.id = :walletId") suspend fun getWalletById(walletId: String): WalletItem? - @Query("SELECT * FROM ($WALLET_ITEM_QUERY) WHERE category = 'mixin_safe' AND safeChainId = :chainId ORDER BY createdAt ASC") + @Query("SELECT * FROM ($WALLET_ITEM_QUERY) AS w WHERE w.category = 'mixin_safe' AND w.safeChainId = :chainId ORDER BY createdAt ASC") suspend fun getSafeWalletsByChainId(chainId: String): List @Query("SELECT name FROM wallets WHERE category IN (:categories)") suspend fun getAllWalletNames(categories: List): List - @Query("SELECT * FROM ($WALLET_ITEM_QUERY) WHERE category = 'classic' ORDER BY createdAt ASC") + @Query("SELECT * FROM ($WALLET_ITEM_QUERY) AS w WHERE w.category = 'classic' ORDER BY createdAt ASC") suspend fun getAllClassicWallets(): List @Query("DELETE FROM wallets WHERE wallet_id = :walletId") From 8f490c63e37340ff2dffa8b5ed0e9ac4ea366ce9 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 11:08:19 +0800 Subject: [PATCH 02/21] fix(ui): replace deprecated Compose components and update Hilt imports - Replace deprecated ClickableText with Text and LinkAnnotation - Update hiltViewModel import to non-deprecated package - Add @param: target to @DrawableRes in AppDrawables --- .../android/compose/InputAmountScreen.kt | 2 +- .../mixin/android/compose/TextHighlight.kt | 35 ++++++++++--------- .../one/mixin/android/compose/theme/Theme.kt | 5 ++- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/one/mixin/android/compose/InputAmountScreen.kt b/app/src/main/java/one/mixin/android/compose/InputAmountScreen.kt index 1bc6fe036e..75df6d79a2 100644 --- a/app/src/main/java/one/mixin/android/compose/InputAmountScreen.kt +++ b/app/src/main/java/one/mixin/android/compose/InputAmountScreen.kt @@ -60,7 +60,7 @@ import one.mixin.android.session.Session import one.mixin.android.ui.home.web3.components.ActionButton import one.mixin.android.util.getChainName import one.mixin.android.vo.safe.TokenItem -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import one.mixin.android.ui.wallet.WalletViewModel import kotlinx.coroutines.launch import one.mixin.android.ui.home.inscription.component.AutoSizeConstraint diff --git a/app/src/main/java/one/mixin/android/compose/TextHighlight.kt b/app/src/main/java/one/mixin/android/compose/TextHighlight.kt index 0228e569bc..ee878a0b8c 100644 --- a/app/src/main/java/one/mixin/android/compose/TextHighlight.kt +++ b/app/src/main/java/one/mixin/android/compose/TextHighlight.kt @@ -1,13 +1,13 @@ package one.mixin.android.compose -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.text.ClickableText import androidx.compose.material.Surface import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier +import androidx.compose.ui.text.LinkAnnotation import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.TextLinkStyles import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextOverflow @@ -27,7 +27,7 @@ fun HighlightStarLinkText( onClick: (link: String) -> Unit, ) { val annotatedString = - remember { + remember(source, links, highlightStyle) { buildAnnotatedString { var start: Int var end: Int @@ -50,27 +50,28 @@ fun HighlightStarLinkText( kotlin.runCatching { for (i in targets.indices) { val (highlightStart, highlightEnd) = targets[i] - addStyle( - highlightStyle, - highlightStart, - highlightEnd, - ) - addStringAnnotation(TAG_URL, annotation = links[i], highlightStart, highlightEnd) + val link = if (i < links.size) links[i] else "" + if (link.isNotEmpty()) { + addLink( + LinkAnnotation.Url( + url = link, + styles = TextLinkStyles(style = highlightStyle), + linkInteractionListener = { + onClick(link) + } + ), + highlightStart, + highlightEnd, + ) + } } } } } - ClickableText( + Text( modifier = modifier, text = annotatedString, - onClick = { position -> - annotatedString.getStringAnnotations(position, position).firstOrNull()?.let { - if (it.tag == TAG_URL) { - onClick(it.item) - } - } - }, style = textStyle, ) } diff --git a/app/src/main/java/one/mixin/android/compose/theme/Theme.kt b/app/src/main/java/one/mixin/android/compose/theme/Theme.kt index 5438cc4dbf..a1e5264ece 100644 --- a/app/src/main/java/one/mixin/android/compose/theme/Theme.kt +++ b/app/src/main/java/one/mixin/android/compose/theme/Theme.kt @@ -78,10 +78,9 @@ class AppColors( ) class AppDrawables( - @DrawableRes + @param:DrawableRes val bgAlertCard: Int, - - ) +) object MixinAppTheme { val colors: AppColors From aedb3cf347d6cfec01cf1f5f6d4e5992ef029947 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 11:08:23 +0800 Subject: [PATCH 03/21] fix(crypto): address deprecation and naming warnings in crypto module - Suppress DEPRECATION warnings for EncryptedSharedPreferences - Fix migration parameter naming in SignalDatabase - Remove redundant else branch in MixinIdentityKeyStore --- .../java/one/mixin/android/crypto/CryptoUtil.kt | 1 + .../one/mixin/android/crypto/CryptoWalletHelper.kt | 1 + .../one/mixin/android/crypto/db/SignalDatabase.kt | 14 +++++++------- .../crypto/storage/MixinIdentityKeyStore.kt | 1 - 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/one/mixin/android/crypto/CryptoUtil.kt b/app/src/main/java/one/mixin/android/crypto/CryptoUtil.kt index f6ba80a382..feb7d6458a 100644 --- a/app/src/main/java/one/mixin/android/crypto/CryptoUtil.kt +++ b/app/src/main/java/one/mixin/android/crypto/CryptoUtil.kt @@ -328,6 +328,7 @@ fun storeValueInEncryptedPreferences(context: Context, alias: String, entropy: B encryptedPrefs.edit(commit = true) { putString(alias, encodedKey) } } +@Suppress("DEPRECATION") fun removeValueFromEncryptedPreferences(context: Context, alias: String) { runCatching { val encryptedPrefs = EncryptedSharedPreferences.create( diff --git a/app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt b/app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt index 670225f96c..39b5b05a75 100644 --- a/app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt +++ b/app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt @@ -323,6 +323,7 @@ object CryptoWalletHelper { encryptedPrefs?.remove(walletId) } + @Suppress("DEPRECATION") fun clear(context: Context) { context.deleteSharedPreferences(ENCRYPTED_WEB3_KEY) } diff --git a/app/src/main/java/one/mixin/android/crypto/db/SignalDatabase.kt b/app/src/main/java/one/mixin/android/crypto/db/SignalDatabase.kt index c87c0cf2de..607f03a95b 100644 --- a/app/src/main/java/one/mixin/android/crypto/db/SignalDatabase.kt +++ b/app/src/main/java/one/mixin/android/crypto/db/SignalDatabase.kt @@ -42,13 +42,13 @@ abstract class SignalDatabase : RoomDatabase() { private val MIGRATION_2_3: Migration = object : Migration(2, 3) { - override fun migrate(database: SupportSQLiteDatabase) { - database.execSQL("DROP INDEX IF EXISTS index_sessions_address") - database.execSQL("ALTER TABLE sessions ADD COLUMN device INTEGER NOT NULL DEFAULT 1") - database.execSQL("CREATE UNIQUE INDEX index_sessions_address_device ON sessions (address, device)") - database.execSQL("UPDATE sessions SET address = substr(address, 1, 36), device = 1 WHERE length(address) = 38") - database.execSQL("ALTER TABLE ratchet_sender_keys ADD COLUMN message_id TEXT") - database.execSQL("ALTER TABLE ratchet_sender_keys ADD COLUMN created_at TEXT NOT NULL DEFAULT ''") + override fun migrate(db: SupportSQLiteDatabase) { + db.execSQL("DROP INDEX IF EXISTS index_sessions_address") + db.execSQL("ALTER TABLE sessions ADD COLUMN device INTEGER NOT NULL DEFAULT 1") + db.execSQL("CREATE UNIQUE INDEX index_sessions_address_device ON sessions (address, device)") + db.execSQL("UPDATE sessions SET address = substr(address, 1, 36), device = 1 WHERE length(address) = 38") + db.execSQL("ALTER TABLE ratchet_sender_keys ADD COLUMN message_id TEXT") + db.execSQL("ALTER TABLE ratchet_sender_keys ADD COLUMN created_at TEXT NOT NULL DEFAULT ''") } } diff --git a/app/src/main/java/one/mixin/android/crypto/storage/MixinIdentityKeyStore.kt b/app/src/main/java/one/mixin/android/crypto/storage/MixinIdentityKeyStore.kt index 2147a0a587..6e1cdb61fd 100644 --- a/app/src/main/java/one/mixin/android/crypto/storage/MixinIdentityKeyStore.kt +++ b/app/src/main/java/one/mixin/android/crypto/storage/MixinIdentityKeyStore.kt @@ -54,7 +54,6 @@ class MixinIdentityKeyStore(private val context: Context) : IdentityKeyStore { return when (direction) { IdentityKeyStore.Direction.SENDING -> isTrustedForSending(identityKey, dao.getIdentity(theirAddress)) IdentityKeyStore.Direction.RECEIVING -> true - else -> throw AssertionError("Unknown direction: $direction") } } } From 161d817ee5d76757f294e8871bf53bc05f76add9 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 11:08:26 +0800 Subject: [PATCH 04/21] fix(core): misc cleanup and annotation target fixes - Remove unnecessary non-null assertion in TransactionResponse - Suppress deprecation for AssetsExtra in MixinDatabase - Update fallbackToDestructiveMigration call in PerpsDatabase - Add @IgnoredOnParcel to WalletItem - Add @param: target to @TypeConverters in Web3Transaction --- .../one/mixin/android/api/response/TransactionResponse.kt | 2 +- app/src/main/java/one/mixin/android/db/MixinDatabase.kt | 1 + app/src/main/java/one/mixin/android/db/PerpsDatabase.kt | 2 +- .../main/java/one/mixin/android/db/web3/vo/WalletItem.kt | 3 +++ .../java/one/mixin/android/db/web3/vo/Web3Transaction.kt | 6 +++--- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/one/mixin/android/api/response/TransactionResponse.kt b/app/src/main/java/one/mixin/android/api/response/TransactionResponse.kt index 72a072d170..b6a25e35f7 100644 --- a/app/src/main/java/one/mixin/android/api/response/TransactionResponse.kt +++ b/app/src/main/java/one/mixin/android/api/response/TransactionResponse.kt @@ -116,6 +116,6 @@ fun getTransactionResult( if (firstTransaction == null) { throw NullPointerException("The first transaction was not found") } else { - return Pair(firstTransaction!!, secondTransaction) + return Pair(firstTransaction, secondTransaction) } } diff --git a/app/src/main/java/one/mixin/android/db/MixinDatabase.kt b/app/src/main/java/one/mixin/android/db/MixinDatabase.kt index a8c7746079..44665d38af 100644 --- a/app/src/main/java/one/mixin/android/db/MixinDatabase.kt +++ b/app/src/main/java/one/mixin/android/db/MixinDatabase.kt @@ -145,6 +145,7 @@ import java.util.concurrent.Executors import kotlin.math.max import kotlin.math.min +@SuppressWarnings("deprecation") @Database( entities = [ (User::class), diff --git a/app/src/main/java/one/mixin/android/db/PerpsDatabase.kt b/app/src/main/java/one/mixin/android/db/PerpsDatabase.kt index 986e6086f9..775d0fd2ef 100644 --- a/app/src/main/java/one/mixin/android/db/PerpsDatabase.kt +++ b/app/src/main/java/one/mixin/android/db/PerpsDatabase.kt @@ -117,7 +117,7 @@ abstract class PerpsDatabase : RoomDatabase() { } }, ).addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4) - .fallbackToDestructiveMigration() + .fallbackToDestructiveMigration(true) .enableMultiInstanceInvalidation() .setQueryExecutor( Executors.newFixedThreadPool( diff --git a/app/src/main/java/one/mixin/android/db/web3/vo/WalletItem.kt b/app/src/main/java/one/mixin/android/db/web3/vo/WalletItem.kt index 4573e6cb13..3b843a653a 100644 --- a/app/src/main/java/one/mixin/android/db/web3/vo/WalletItem.kt +++ b/app/src/main/java/one/mixin/android/db/web3/vo/WalletItem.kt @@ -2,6 +2,7 @@ package one.mixin.android.db.web3.vo import android.os.Parcelable import androidx.room.Ignore +import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import one.mixin.android.extension.equalsIgnoreCase import one.mixin.android.vo.WalletCategory @@ -21,9 +22,11 @@ data class WalletItem( ) : Parcelable { @Ignore + @IgnoredOnParcel var hasLocalPrivateKey: Boolean = false @Ignore + @IgnoredOnParcel var value: BigDecimal = BigDecimal.ZERO val safeChain: SafeChain? diff --git a/app/src/main/java/one/mixin/android/db/web3/vo/Web3Transaction.kt b/app/src/main/java/one/mixin/android/db/web3/vo/Web3Transaction.kt index e4d7a6bc56..42c83afc32 100644 --- a/app/src/main/java/one/mixin/android/db/web3/vo/Web3Transaction.kt +++ b/app/src/main/java/one/mixin/android/db/web3/vo/Web3Transaction.kt @@ -49,17 +49,17 @@ data class Web3Transaction( @SerializedName("fee") val fee: String, - @TypeConverters(AssetChangeListConverter::class) + @param:TypeConverters(AssetChangeListConverter::class) @ColumnInfo(name = "senders") @SerializedName("senders") val senders: List?, - @TypeConverters(AssetChangeListConverter::class) + @param:TypeConverters(AssetChangeListConverter::class) @ColumnInfo(name = "receivers") @SerializedName("receivers") val receivers: List?, - @TypeConverters(AssetChangeListConverter::class) + @param:TypeConverters(AssetChangeListConverter::class) @ColumnInfo(name = "approvals") @SerializedName("approvals") val approvals: List? = null, From a795a6764708d775300384e16e1b16b8e89d9b16 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 11:40:06 +0800 Subject: [PATCH 05/21] fix(compose): add missing Column import in TextHighlight preview --- app/src/main/java/one/mixin/android/compose/TextHighlight.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/one/mixin/android/compose/TextHighlight.kt b/app/src/main/java/one/mixin/android/compose/TextHighlight.kt index ee878a0b8c..6200a6ad34 100644 --- a/app/src/main/java/one/mixin/android/compose/TextHighlight.kt +++ b/app/src/main/java/one/mixin/android/compose/TextHighlight.kt @@ -1,5 +1,6 @@ package one.mixin.android.compose +import androidx.compose.foundation.layout.Column import androidx.compose.material.Surface import androidx.compose.material.Text import androidx.compose.runtime.Composable From 7cdc47238450ca3c84a515109c85a12c79072407 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 11:47:33 +0800 Subject: [PATCH 06/21] chore: remove unnecessary non-null assertions and safe calls --- .../conversation/location/LocationActivity.kt | 10 +++++----- .../transfer/widget/TransferErroContent.kt | 20 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt b/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt index 940c070dda..4ad93bb7f3 100644 --- a/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt @@ -568,30 +568,30 @@ class LocationActivity : BaseActivity(), OnMapReadyCallback { if (south == null) { item.location.lat } else { - min(south!!, item.location.lat) + min(south, item.location.lat) } west = if (west == null) { item.location.lng } else { - min(west!!, item.location.lng) + min(west, item.location.lng) } north = if (north == null) { item.location.lat } else { - max(north!!, item.location.lat) + max(north, item.location.lat) } east = if (east == null) { item.location.lng } else { - max(east!!, item.location.lng) + max(east, item.location.lng) } mixinMapView.addMarker(index, item) if (south != null && west != null && north != null && east != null) { - val bound = MixinLatLngBounds(MixinLatLng(south!!, west!!), MixinLatLng(north!!, east!!)) + val bound = MixinLatLngBounds(MixinLatLng(south, west), MixinLatLng(north, east)) mixinMapView.moveBounds(bound) } } diff --git a/app/src/main/java/one/mixin/android/ui/wallet/transfer/widget/TransferErroContent.kt b/app/src/main/java/one/mixin/android/ui/wallet/transfer/widget/TransferErroContent.kt index 66e68ce56a..48bcd8908f 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/transfer/widget/TransferErroContent.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/transfer/widget/TransferErroContent.kt @@ -56,26 +56,26 @@ class TransferErrorContent : LinearLayout { balance.isVisible = true balance.setContent( R.string.Balance, - "${feeExtra?.balance?.numberFormat8() ?: "0"} ${fee.symbol ?: ""}", + "${feeExtra?.balance?.numberFormat8() ?: "0"} ${fee.symbol}", amountAs(feeExtra?.balance ?: "0", fee) ) } else { - val asset = assetBiometricItem.asset?:return + val asset = assetBiometricItem.asset ?: return amount.isVisible = true amount.setContent( R.string.Amount, - "${assetBiometricItem.amount} ${asset?.symbol}", - amountAs(assetBiometricItem.amount, asset!!) + "${assetBiometricItem.amount} ${asset.symbol}", + amountAs(assetBiometricItem.amount, asset) ) network.setContent( R.string.network, getChainName( - asset!!.chainId, - asset!!.chainName, - asset!!.assetKey + asset.chainId, + asset.chainName, + asset.assetKey ) ?: "" ) - if (assetBiometricItem is WithdrawBiometricItem && assetBiometricItem.fee?.token != null && asset?.assetId == assetBiometricItem.fee?.token?.assetId) { + if (assetBiometricItem is WithdrawBiometricItem && assetBiometricItem.fee?.token != null && asset.assetId == assetBiometricItem.fee?.token?.assetId) { val (totalAmount, totalPrice) = formatWithdrawBiometricItem(assetBiometricItem) total.isVisible = true total.setContent(R.string.Total, totalAmount, totalPrice) @@ -96,8 +96,8 @@ class TransferErrorContent : LinearLayout { balance.isVisible = true balance.setContent( R.string.Balance, - "${extra?.balance?.numberFormat8() ?: "0"} ${asset?.symbol ?: ""}", - amountAs(extra?.balance ?: "0", asset!!) + "${extra?.balance?.numberFormat8() ?: "0"} ${asset.symbol}", + amountAs(extra?.balance ?: "0", asset) ) } } From 048290d1a144857c767d23ef137dd05169ce16c8 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 11:54:03 +0800 Subject: [PATCH 07/21] chore: clean up redundant null assertions, conversions and elvis ops --- .../java/one/mixin/android/net/Diagnosis.kt | 9 +++------ .../landing/components/MnemonicPhraseInput.kt | 4 ++-- .../wallet/AddFeeBottomSheetDialogFragment.kt | 17 +++++++++-------- .../one/mixin/android/util/backup/Backup.kt | 6 +++--- .../java/one/mixin/android/vo/MixinInvoice.kt | 6 +++--- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/one/mixin/android/net/Diagnosis.kt b/app/src/main/java/one/mixin/android/net/Diagnosis.kt index 7d07ab52db..f238f3d34c 100644 --- a/app/src/main/java/one/mixin/android/net/Diagnosis.kt +++ b/app/src/main/java/one/mixin/android/net/Diagnosis.kt @@ -133,13 +133,10 @@ private fun getExportIp( val client = OkHttpClient() var ipRequest = Request.Builder().url(EXPORT_IP_PRIMARY).build() try { - var data = - client.newCall(ipRequest).execute().body?.string() - ?: throw IOException("EXPORT_IP_PRIMARY no data") + var data = client.newCall(ipRequest).execute().body.string() val url = data.substringIgnoreError(data.indexOf("src=") + 4, data.lastIndexOf("frameborder")).replace("'".toRegex(), "").replace(" ".toRegex(), "") ipRequest = Request.Builder().url(url).build() - data = client.newCall(ipRequest).execute().body?.string() - ?: throw IOException("EXPORT_IP_PRIMARY no data") + data = client.newCall(ipRequest).execute().body.string() val dataIp = data.substringIgnoreError(data.indexOf("您的IP地址信息") + 10) val dataAddress = dataIp.substringIgnoreError(0, dataIp.indexOf("
")) val ips = dataAddress.split(" ").toTypedArray() @@ -149,7 +146,7 @@ private fun getExportIp( Timber.i("Get export ip from $EXPORT_IP_PRIMARY meet ${e.localizedMessage}") try { ipRequest = Request.Builder().url(EXPORT_IP_SECONDARY).build() - val exportIp = client.newCall(ipRequest).execute().body?.string() + val exportIp = client.newCall(ipRequest).execute().body.string() result.append("${context.getString(R.string.export_ip)}: $exportIp") } catch (e: Exception) { Timber.i("Get export ip from $EXPORT_IP_SECONDARY meet ${e.localizedMessage}") diff --git a/app/src/main/java/one/mixin/android/ui/landing/components/MnemonicPhraseInput.kt b/app/src/main/java/one/mixin/android/ui/landing/components/MnemonicPhraseInput.kt index 1f6cca90d1..e92fcefbcd 100644 --- a/app/src/main/java/one/mixin/android/ui/landing/components/MnemonicPhraseInput.kt +++ b/app/src/main/java/one/mixin/android/ui/landing/components/MnemonicPhraseInput.kt @@ -496,7 +496,7 @@ fun MnemonicPhraseInput( ExportRequest( publicKey = edKey!!.publicKey.toHex(), signature = initFromSeedAndSign(edKey.privateKey, selfId.toByteArray()).toHex(), - pinBase64 = encryptedTipBody(selfId, pin!!), + pinBase64 = encryptedTipBody(selfId, pin), ) ) r.data?.let { @@ -744,7 +744,7 @@ fun MnemonicPhraseInput( ExportRequest( publicKey = edKey!!.publicKey.toHex(), signature = initFromSeedAndSign(edKey.privateKey, selfId.toByteArray()).toHex(), - pinBase64 = encryptedTipBody(selfId, pin!!), + pinBase64 = encryptedTipBody(selfId, pin), ) ) r.data?.let { diff --git a/app/src/main/java/one/mixin/android/ui/wallet/AddFeeBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/AddFeeBottomSheetDialogFragment.kt index 5bcb352796..4bf23b4fc2 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/AddFeeBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/AddFeeBottomSheetDialogFragment.kt @@ -6,6 +6,7 @@ import dagger.hilt.android.AndroidEntryPoint import one.mixin.android.R import one.mixin.android.databinding.FragmentAddFeeBottomSheetBinding import one.mixin.android.db.web3.vo.Web3TokenItem +import one.mixin.android.extension.getParcelableCompat import one.mixin.android.extension.withArgs import one.mixin.android.ui.common.MixinBottomSheetDialogFragment import one.mixin.android.util.viewBinding @@ -49,8 +50,8 @@ class AddFeeBottomSheetDialogFragment : MixinBottomSheetDialogFragment() { (dialog as BottomSheet).apply { setCustomView(contentView) } - val tokenItem = requireArguments().getParcelable(ARGS_TOKEN) - val web3TokenItem = requireArguments().getParcelable(ARGS_WEB3_TOKEN) + val tokenItem = requireArguments().getParcelableCompat(ARGS_TOKEN, TokenItem::class.java) + val web3TokenItem = requireArguments().getParcelableCompat(ARGS_WEB3_TOKEN, Web3TokenItem::class.java) binding.apply { titleTv.text = "${getString(R.string.Add)} ${tokenItem?.symbol ?: web3TokenItem?.symbol ?: ""}" subtitleTv.text = tokenItem?.chainName ?: web3TokenItem?.chainName ?: "" @@ -58,9 +59,9 @@ class AddFeeBottomSheetDialogFragment : MixinBottomSheetDialogFragment() { dismiss() } if (tokenItem != null) { - swapTv.text = getString(R.string.swap_token, tokenItem.symbol ?: "-") - swapDescTv.text = getString(R.string.swap_token_description, tokenItem.symbol ?: "-") - depositTv.text = getString(R.string.deposit_token, tokenItem.symbol ?: "-") + swapTv.text = getString(R.string.swap_token, tokenItem.symbol) + swapDescTv.text = getString(R.string.swap_token_description, tokenItem.symbol) + depositTv.text = getString(R.string.deposit_token, tokenItem.symbol) swapLayout.setOnClickListener { onAction?.invoke(ActionType.SWAP, tokenItem) dismiss() @@ -70,9 +71,9 @@ class AddFeeBottomSheetDialogFragment : MixinBottomSheetDialogFragment() { dismiss() } } else if (web3TokenItem != null) { - swapTv.text = getString(R.string.swap_token, web3TokenItem.symbol ?: "-") - swapDescTv.text = getString(R.string.swap_token_description, web3TokenItem.symbol ?: "-") - depositTv.text = getString(R.string.deposit_token, web3TokenItem.symbol ?: "-") + swapTv.text = getString(R.string.swap_token, web3TokenItem.symbol) + swapDescTv.text = getString(R.string.swap_token_description, web3TokenItem.symbol) + depositTv.text = getString(R.string.deposit_token, web3TokenItem.symbol) swapLayout.setOnClickListener { onWeb3Action?.invoke(ActionType.SWAP, web3TokenItem) dismiss() diff --git a/app/src/main/java/one/mixin/android/util/backup/Backup.kt b/app/src/main/java/one/mixin/android/util/backup/Backup.kt index 7f1b6e07ed..0f2e9d3ebe 100644 --- a/app/src/main/java/one/mixin/android/util/backup/Backup.kt +++ b/app/src/main/java/one/mixin/android/util/backup/Backup.kt @@ -90,7 +90,7 @@ suspend fun backup( SQLiteDatabase.OPEN_READWRITE, ) } catch (e: Exception) { - result?.delete() + result.delete() db?.close() Timber.e(e) withContext(Dispatchers.Main) { @@ -118,10 +118,10 @@ suspend fun backup( } } if (tmpName.contains(BACKUP_POSTFIX)) { - result?.renameTo(File("$backupDir${File.separator}$name")) + result.renameTo(File("$backupDir${File.separator}$name")) } } catch (e: Exception) { - result?.delete() + result.delete() Timber.e(e) withContext(Dispatchers.Main) { callback(Result.FAILURE) diff --git a/app/src/main/java/one/mixin/android/vo/MixinInvoice.kt b/app/src/main/java/one/mixin/android/vo/MixinInvoice.kt index f32a00b0e5..ceee66b1d7 100644 --- a/app/src/main/java/one/mixin/android/vo/MixinInvoice.kt +++ b/app/src/main/java/one/mixin/android/vo/MixinInvoice.kt @@ -280,8 +280,8 @@ data class MixinInvoice( } val entry = InvoiceEntry( - traceId = traceId.toString(), - assetId = assetId.toString(), + traceId = traceId, + assetId = assetId, amount = amount, extra = extra, indexReferences = indexReferences, @@ -344,7 +344,7 @@ data class InvoiceEntry( } fun isStorage(): Boolean { - return assetId.toString() == Constants.AssetId.XIN_ASSET_ID && + return assetId == Constants.AssetId.XIN_ASSET_ID && extra.isNotEmpty() && extra.size > EXTRA_SIZE_GENERAL_LIMIT && amount.compareTo(estimateStorageCost(extra)) == 0 From c82bd9af7f3736c0a5560e4138501b3311d77e5d Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 11:58:39 +0800 Subject: [PATCH 08/21] chore(crypto): suppress EncryptedSharedPreferences/MasterKey deprecation --- app/src/main/java/one/mixin/android/crypto/CryptoUtil.kt | 2 +- .../main/java/one/mixin/android/crypto/CryptoWalletHelper.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/one/mixin/android/crypto/CryptoUtil.kt b/app/src/main/java/one/mixin/android/crypto/CryptoUtil.kt index feb7d6458a..8f3634da4d 100644 --- a/app/src/main/java/one/mixin/android/crypto/CryptoUtil.kt +++ b/app/src/main/java/one/mixin/android/crypto/CryptoUtil.kt @@ -1,4 +1,4 @@ -@file:Suppress("NOTHING_TO_INLINE") +@file:Suppress("NOTHING_TO_INLINE", "DEPRECATION") package one.mixin.android.crypto diff --git a/app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt b/app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt index 39b5b05a75..df05475aff 100644 --- a/app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt +++ b/app/src/main/java/one/mixin/android/crypto/CryptoWalletHelper.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.crypto import android.content.Context From 822d1ddb416d64fe3ff1486176447b21220340af Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 12:04:21 +0800 Subject: [PATCH 09/21] chore: suppress deprecated PagedList warnings across affected files --- .../java/one/mixin/android/repository/ConversationRepository.kt | 2 ++ .../android/ui/common/recyclerview/SafePagedListAdapter.kt | 2 ++ .../android/ui/conversation/chathistory/ChatHistoryActivity.kt | 2 ++ .../java/one/mixin/android/ui/home/ConversationListFragment.kt | 2 ++ .../java/one/mixin/android/ui/home/ConversationListViewModel.kt | 2 ++ .../java/one/mixin/android/ui/media/PagedListPagerAdapter.kt | 2 ++ .../java/one/mixin/android/ui/media/SharedMediaViewModel.kt | 2 ++ .../java/one/mixin/android/ui/media/pager/MediaPagerActivity.kt | 2 ++ .../mixin/android/ui/player/MusicBottomSheetDialogFragment.kt | 2 ++ app/src/main/java/one/mixin/android/ui/player/MusicService.kt | 2 ++ .../one/mixin/android/ui/player/internal/ConversationLoader.kt | 2 ++ .../java/one/mixin/android/ui/search/SearchMessageFragment.kt | 2 ++ .../main/java/one/mixin/android/ui/search/SearchViewModel.kt | 2 ++ 13 files changed, 26 insertions(+) diff --git a/app/src/main/java/one/mixin/android/repository/ConversationRepository.kt b/app/src/main/java/one/mixin/android/repository/ConversationRepository.kt index 513da78d67..b018bae2ff 100644 --- a/app/src/main/java/one/mixin/android/repository/ConversationRepository.kt +++ b/app/src/main/java/one/mixin/android/repository/ConversationRepository.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.repository import android.os.CancellationSignal diff --git a/app/src/main/java/one/mixin/android/ui/common/recyclerview/SafePagedListAdapter.kt b/app/src/main/java/one/mixin/android/ui/common/recyclerview/SafePagedListAdapter.kt index 03420ed480..d5384fec0b 100644 --- a/app/src/main/java/one/mixin/android/ui/common/recyclerview/SafePagedListAdapter.kt +++ b/app/src/main/java/one/mixin/android/ui/common/recyclerview/SafePagedListAdapter.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.common.recyclerview import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/conversation/chathistory/ChatHistoryActivity.kt b/app/src/main/java/one/mixin/android/ui/conversation/chathistory/ChatHistoryActivity.kt index d8daa28f67..aae86bf3f0 100644 --- a/app/src/main/java/one/mixin/android/ui/conversation/chathistory/ChatHistoryActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/conversation/chathistory/ChatHistoryActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.conversation.chathistory import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/home/ConversationListFragment.kt b/app/src/main/java/one/mixin/android/ui/home/ConversationListFragment.kt index ef89caeffd..2682ed0853 100644 --- a/app/src/main/java/one/mixin/android/ui/home/ConversationListFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/home/ConversationListFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.home import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/home/ConversationListViewModel.kt b/app/src/main/java/one/mixin/android/ui/home/ConversationListViewModel.kt index f718319d8c..bbaf0fd1c6 100644 --- a/app/src/main/java/one/mixin/android/ui/home/ConversationListViewModel.kt +++ b/app/src/main/java/one/mixin/android/ui/home/ConversationListViewModel.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.home import androidx.lifecycle.LiveData diff --git a/app/src/main/java/one/mixin/android/ui/media/PagedListPagerAdapter.kt b/app/src/main/java/one/mixin/android/ui/media/PagedListPagerAdapter.kt index db4e4d846c..34c2d8b7d6 100644 --- a/app/src/main/java/one/mixin/android/ui/media/PagedListPagerAdapter.kt +++ b/app/src/main/java/one/mixin/android/ui/media/PagedListPagerAdapter.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.media import android.view.View diff --git a/app/src/main/java/one/mixin/android/ui/media/SharedMediaViewModel.kt b/app/src/main/java/one/mixin/android/ui/media/SharedMediaViewModel.kt index cbaf1aea16..d7b46134a3 100644 --- a/app/src/main/java/one/mixin/android/ui/media/SharedMediaViewModel.kt +++ b/app/src/main/java/one/mixin/android/ui/media/SharedMediaViewModel.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.media import android.net.Uri diff --git a/app/src/main/java/one/mixin/android/ui/media/pager/MediaPagerActivity.kt b/app/src/main/java/one/mixin/android/ui/media/pager/MediaPagerActivity.kt index 8d406cced3..fdd51e1c66 100644 --- a/app/src/main/java/one/mixin/android/ui/media/pager/MediaPagerActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/media/pager/MediaPagerActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.media.pager import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/player/MusicBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/player/MusicBottomSheetDialogFragment.kt index 21442f064b..d625cca8b5 100644 --- a/app/src/main/java/one/mixin/android/ui/player/MusicBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/player/MusicBottomSheetDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.player import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/player/MusicService.kt b/app/src/main/java/one/mixin/android/ui/player/MusicService.kt index 91374ba5eb..9ff4aa2cc6 100644 --- a/app/src/main/java/one/mixin/android/ui/player/MusicService.kt +++ b/app/src/main/java/one/mixin/android/ui/player/MusicService.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.player import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/player/internal/ConversationLoader.kt b/app/src/main/java/one/mixin/android/ui/player/internal/ConversationLoader.kt index 1e1f86262a..670e14edea 100644 --- a/app/src/main/java/one/mixin/android/ui/player/internal/ConversationLoader.kt +++ b/app/src/main/java/one/mixin/android/ui/player/internal/ConversationLoader.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.player.internal import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/search/SearchMessageFragment.kt b/app/src/main/java/one/mixin/android/ui/search/SearchMessageFragment.kt index 42983b6d72..28017b10ea 100644 --- a/app/src/main/java/one/mixin/android/ui/search/SearchMessageFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/search/SearchMessageFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.search import android.os.Bundle diff --git a/app/src/main/java/one/mixin/android/ui/search/SearchViewModel.kt b/app/src/main/java/one/mixin/android/ui/search/SearchViewModel.kt index 34a4157d0c..a602a4bd93 100644 --- a/app/src/main/java/one/mixin/android/ui/search/SearchViewModel.kt +++ b/app/src/main/java/one/mixin/android/ui/search/SearchViewModel.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.search import android.content.SharedPreferences From 615238b3fffad1a5bea26078e581afcc9a1762b6 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 12:10:43 +0800 Subject: [PATCH 10/21] chore: suppress deprecation warnings across modules --- app/src/main/java/one/mixin/android/db/MixinDatabase.kt | 2 ++ .../mixin/android/db/datasource/MixinLimitOffsetDataSource.kt | 2 ++ app/src/main/java/one/mixin/android/db/provider/DataProvider.kt | 2 ++ .../main/java/one/mixin/android/extension/ContextExtension.kt | 2 ++ app/src/main/java/one/mixin/android/extension/FileExtension.kt | 2 ++ .../main/java/one/mixin/android/extension/ImageViewExtension.kt | 2 ++ .../main/java/one/mixin/android/extension/TextViewExtension.kt | 2 ++ app/src/main/java/one/mixin/android/extension/ViewExtension.kt | 2 ++ app/src/main/java/one/mixin/android/fts/FtsDataSource.kt | 2 ++ app/src/main/java/one/mixin/android/job/ConvertVideoJob.kt | 2 ++ app/src/main/java/one/mixin/android/job/SendService.kt | 2 ++ app/src/main/java/one/mixin/android/media/OpusAudioRecorder.kt | 2 ++ .../main/java/one/mixin/android/repository/TokenRepository.kt | 2 ++ .../main/java/one/mixin/android/startup/EmojiAppInitializer.kt | 2 ++ app/src/main/java/one/mixin/android/ui/PipVideoView.kt | 2 ++ app/src/main/java/one/mixin/android/ui/auth/AppAuthActivity.kt | 2 ++ app/src/main/java/one/mixin/android/ui/call/CallActivity.kt | 2 ++ .../android/ui/common/JoinGroupBottomSheetDialogFragment.kt | 2 ++ .../android/ui/common/NoKeyWarningBottomSheetDialogFragment.kt | 2 ++ .../ui/common/NonMessengerUserBottomSheetDialogFragment.kt | 2 ++ .../one/mixin/android/ui/common/QrBottomSheetDialogFragment.kt | 2 ++ .../one/mixin/android/ui/common/message/SendMessageHelper.kt | 2 ++ .../profile/ReferralBindPreviewBottomSheetDialogFragment.kt | 2 ++ .../one/mixin/android/ui/contacts/ContactBottomSheetDialog.kt | 2 ++ .../main/java/one/mixin/android/ui/contacts/ContactsActivity.kt | 2 ++ .../one/mixin/android/ui/conversation/ConversationFragment.kt | 2 ++ .../one/mixin/android/ui/conversation/GalleryAlbumFragment.kt | 2 ++ .../one/mixin/android/ui/conversation/chat/ChatItemCallback.kt | 2 ++ .../mixin/android/ui/conversation/location/LocationActivity.kt | 2 ++ .../android/ui/conversation/preview/PreviewDialogFragment.kt | 2 ++ .../main/java/one/mixin/android/ui/forward/ForwardActivity.kt | 2 ++ app/src/main/java/one/mixin/android/ui/group/GroupActivity.kt | 2 ++ .../java/one/mixin/android/ui/group/InviteQrBottomFragment.kt | 2 ++ app/src/main/java/one/mixin/android/ui/home/MainActivity.kt | 2 ++ .../android/ui/home/circle/ConversationCircleEditFragment.kt | 2 ++ app/src/main/java/one/mixin/android/ui/home/web3/BrowserPage.kt | 2 ++ .../java/one/mixin/android/ui/home/web3/trade/SwapTokenPage.kt | 2 ++ .../home/web3/trade/perps/PerpsAddBottomSheetDialogFragment.kt | 2 ++ .../home/web3/trade/perps/PerpsTpSlBottomSheetDialogFragment.kt | 2 ++ .../one/mixin/android/ui/imageeditor/ImageEditorActivity.kt | 2 ++ .../java/one/mixin/android/ui/landing/VerificationFragment.kt | 2 ++ .../android/ui/landing/components/HighlightedTextWithClick.kt | 2 ++ app/src/main/java/one/mixin/android/ui/logs/LogViewerScreen.kt | 2 ++ .../main/java/one/mixin/android/ui/media/SharedMediaActivity.kt | 2 ++ .../java/one/mixin/android/ui/media/pager/PlayerControlView.kt | 2 ++ .../main/java/one/mixin/android/ui/media/pager/PlayerView.kt | 2 ++ .../ui/media/pager/transcript/TranscriptMediaPagerActivity.kt | 2 ++ app/src/main/java/one/mixin/android/ui/player/MusicActivity.kt | 2 ++ .../one/mixin/android/ui/player/internal/MusicMetaLoader.kt | 2 ++ .../java/one/mixin/android/ui/preview/TextPreviewActivity.kt | 2 ++ .../main/java/one/mixin/android/ui/qr/BaseCameraxFragment.kt | 2 ++ app/src/main/java/one/mixin/android/ui/qr/CaptureActivity.kt | 2 ++ app/src/main/java/one/mixin/android/ui/qr/CaptureFragment.kt | 2 ++ .../java/one/mixin/android/ui/search/SearchExploreFragment.kt | 2 ++ .../java/one/mixin/android/ui/search/SearchMessageAdapter.kt | 2 ++ .../java/one/mixin/android/ui/search/SearchSingleFragment.kt | 2 ++ .../one/mixin/android/ui/search/components/RecentSearchPage.kt | 2 ++ .../java/one/mixin/android/ui/setting/AppearanceFragment.kt | 2 ++ .../java/one/mixin/android/ui/setting/DatabaseDebugFragment.kt | 2 ++ .../main/java/one/mixin/android/ui/setting/SafeDebugFragment.kt | 2 ++ .../main/java/one/mixin/android/ui/setting/SettingActivity.kt | 2 ++ .../java/one/mixin/android/ui/setting/SettingSizeFragment.kt | 2 ++ .../one/mixin/android/ui/setting/SettingWallpaperFragment.kt | 2 ++ .../android/ui/setting/member/MixinMemberOrderDetailFragment.kt | 2 ++ .../java/one/mixin/android/ui/setting/ui/page/AppearancePage.kt | 2 ++ .../java/one/mixin/android/ui/sticker/StickerAddFragment.kt | 2 ++ .../one/mixin/android/ui/sticker/StickerManagementFragment.kt | 2 ++ app/src/main/java/one/mixin/android/ui/tip/TipActivity.kt | 2 ++ .../java/one/mixin/android/ui/tip/wc/WalletConnectActivity.kt | 2 ++ .../main/java/one/mixin/android/ui/transfer/TransferActivity.kt | 2 ++ .../java/one/mixin/android/ui/url/UrlInterpreterActivity.kt | 2 ++ .../java/one/mixin/android/ui/wallet/DepositQrBottomFragment.kt | 2 ++ .../java/one/mixin/android/ui/wallet/DepositShareActivity.kt | 2 ++ .../main/java/one/mixin/android/ui/wallet/IdentityFragment.kt | 2 ++ .../android/ui/wallet/PinBiometricsBottomSheetDialogFragment.kt | 2 ++ .../java/one/mixin/android/ui/wallet/WalletSecurityActivity.kt | 2 ++ .../mixin/android/ui/wallet/adapter/SelectableAddressAdapter.kt | 2 ++ .../mixin/android/ui/wallet/adapter/SelectableCoinAdapter.kt | 2 ++ .../mixin/android/ui/wallet/adapter/SelectableTokenAdapter.kt | 2 ++ .../mixin/android/ui/wallet/adapter/SelectableUserAdapter.kt | 2 ++ .../android/ui/wallet/adapter/SelectableWeb3TokenAdapter.kt | 2 ++ .../android/ui/wallet/components/ImportWalletDetailPage.kt | 2 ++ .../mixin/android/ui/wallet/components/InTransitionDuration.kt | 2 ++ .../one/mixin/android/ui/wallet/fiatmoney/FiatMoneyViewModel.kt | 2 ++ .../mixin/android/ui/wallet/fiatmoney/OrderConfirmFragment.kt | 2 ++ .../mixin/android/ui/wallet/fiatmoney/OrderStatusFragment.kt | 2 ++ .../ui/wallet/fiatmoney/SelectCardBottomSheetDialogFragment.kt | 2 ++ app/src/main/java/one/mixin/android/ui/web/WebActivity.kt | 2 ++ app/src/main/java/one/mixin/android/ui/web/WebFragment.kt | 2 ++ app/src/main/java/one/mixin/android/util/Base58.kt | 2 ++ .../util/mlkit/scan/camera/config/ResolutionCameraConfig.kt | 2 ++ .../one/mixin/android/util/mlkit/scan/manager/BeepManager.kt | 2 ++ .../java/one/mixin/android/util/mlkit/scan/utils/BitmapUtils.kt | 2 ++ app/src/main/java/one/mixin/android/util/video/MixinPlayer.kt | 2 ++ .../one/mixin/android/web3/details/Web3TransactionFragment.kt | 2 ++ .../one/mixin/android/web3/details/Web3TransactionsFragment.kt | 2 ++ .../one/mixin/android/web3/swap/Components/RecentSwapTokens.kt | 2 ++ app/src/main/java/one/mixin/android/widget/AddressTextView.kt | 2 ++ .../main/java/one/mixin/android/widget/BlurTransformation.kt | 2 ++ app/src/main/java/one/mixin/android/widget/BottomSheet.kt | 2 ++ app/src/main/java/one/mixin/android/widget/ContentEditText.kt | 2 ++ .../main/java/one/mixin/android/widget/DebugClickListener.kt | 2 ++ .../main/java/one/mixin/android/widget/GestureFrameLayout.kt | 2 ++ .../main/java/one/mixin/android/widget/GestureMessageLayout.kt | 2 ++ app/src/main/java/one/mixin/android/widget/PercentView.kt | 2 ++ .../java/one/mixin/android/widget/PlayerBottomControlView.kt | 2 ++ app/src/main/java/one/mixin/android/widget/QuoteView.kt | 2 ++ app/src/main/java/one/mixin/android/widget/ReplyView.kt | 2 ++ app/src/main/java/one/mixin/android/widget/ToolView.kt | 2 ++ app/src/main/java/one/mixin/android/widget/ViewfinderView.kt | 2 ++ app/src/main/java/one/mixin/android/widget/bot/BotDock.kt | 2 ++ .../widget/gallery/internal/model/SelectedItemCollection.kt | 2 ++ .../java/one/mixin/android/widget/gallery/ui/GalleryActivity.kt | 2 ++ .../mixin/android/widget/linktext/GestureAutoLinkTextView.kt | 2 ++ .../main/java/one/mixin/android/widget/theme/ThemeActivity.kt | 2 ++ 115 files changed, 230 insertions(+) diff --git a/app/src/main/java/one/mixin/android/db/MixinDatabase.kt b/app/src/main/java/one/mixin/android/db/MixinDatabase.kt index 44665d38af..520edd4c5f 100644 --- a/app/src/main/java/one/mixin/android/db/MixinDatabase.kt +++ b/app/src/main/java/one/mixin/android/db/MixinDatabase.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.db import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/db/datasource/MixinLimitOffsetDataSource.kt b/app/src/main/java/one/mixin/android/db/datasource/MixinLimitOffsetDataSource.kt index 4603be3122..89f1392113 100644 --- a/app/src/main/java/one/mixin/android/db/datasource/MixinLimitOffsetDataSource.kt +++ b/app/src/main/java/one/mixin/android/db/datasource/MixinLimitOffsetDataSource.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.db.datasource import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/db/provider/DataProvider.kt b/app/src/main/java/one/mixin/android/db/provider/DataProvider.kt index e06dc41bc7..82a035129b 100644 --- a/app/src/main/java/one/mixin/android/db/provider/DataProvider.kt +++ b/app/src/main/java/one/mixin/android/db/provider/DataProvider.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.db.provider import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/extension/ContextExtension.kt b/app/src/main/java/one/mixin/android/extension/ContextExtension.kt index e0816a658d..3879cf7c8d 100644 --- a/app/src/main/java/one/mixin/android/extension/ContextExtension.kt +++ b/app/src/main/java/one/mixin/android/extension/ContextExtension.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.extension import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/extension/FileExtension.kt b/app/src/main/java/one/mixin/android/extension/FileExtension.kt index c7b04b50c1..accdd78404 100644 --- a/app/src/main/java/one/mixin/android/extension/FileExtension.kt +++ b/app/src/main/java/one/mixin/android/extension/FileExtension.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.extension import android.Manifest diff --git a/app/src/main/java/one/mixin/android/extension/ImageViewExtension.kt b/app/src/main/java/one/mixin/android/extension/ImageViewExtension.kt index 4d5ecf4215..164a3fd665 100644 --- a/app/src/main/java/one/mixin/android/extension/ImageViewExtension.kt +++ b/app/src/main/java/one/mixin/android/extension/ImageViewExtension.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.extension import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/extension/TextViewExtension.kt b/app/src/main/java/one/mixin/android/extension/TextViewExtension.kt index 3a7f4719ce..03bf49bc92 100644 --- a/app/src/main/java/one/mixin/android/extension/TextViewExtension.kt +++ b/app/src/main/java/one/mixin/android/extension/TextViewExtension.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.extension import android.content.res.ColorStateList diff --git a/app/src/main/java/one/mixin/android/extension/ViewExtension.kt b/app/src/main/java/one/mixin/android/extension/ViewExtension.kt index d39534decf..df622686a1 100644 --- a/app/src/main/java/one/mixin/android/extension/ViewExtension.kt +++ b/app/src/main/java/one/mixin/android/extension/ViewExtension.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.extension import android.animation.Animator diff --git a/app/src/main/java/one/mixin/android/fts/FtsDataSource.kt b/app/src/main/java/one/mixin/android/fts/FtsDataSource.kt index 7b8809472a..933307dd4e 100644 --- a/app/src/main/java/one/mixin/android/fts/FtsDataSource.kt +++ b/app/src/main/java/one/mixin/android/fts/FtsDataSource.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.fts import android.os.CancellationSignal diff --git a/app/src/main/java/one/mixin/android/job/ConvertVideoJob.kt b/app/src/main/java/one/mixin/android/job/ConvertVideoJob.kt index 6d1f122b26..a4a4ce859c 100644 --- a/app/src/main/java/one/mixin/android/job/ConvertVideoJob.kt +++ b/app/src/main/java/one/mixin/android/job/ConvertVideoJob.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.job import android.net.Uri diff --git a/app/src/main/java/one/mixin/android/job/SendService.kt b/app/src/main/java/one/mixin/android/job/SendService.kt index 9281a8fef0..6a7ba3064d 100644 --- a/app/src/main/java/one/mixin/android/job/SendService.kt +++ b/app/src/main/java/one/mixin/android/job/SendService.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.job import android.app.IntentService diff --git a/app/src/main/java/one/mixin/android/media/OpusAudioRecorder.kt b/app/src/main/java/one/mixin/android/media/OpusAudioRecorder.kt index f11ba74c2a..76d853154e 100644 --- a/app/src/main/java/one/mixin/android/media/OpusAudioRecorder.kt +++ b/app/src/main/java/one/mixin/android/media/OpusAudioRecorder.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.media import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/repository/TokenRepository.kt b/app/src/main/java/one/mixin/android/repository/TokenRepository.kt index e9c6720bdb..788d4fe787 100644 --- a/app/src/main/java/one/mixin/android/repository/TokenRepository.kt +++ b/app/src/main/java/one/mixin/android/repository/TokenRepository.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.repository import android.os.CancellationSignal diff --git a/app/src/main/java/one/mixin/android/startup/EmojiAppInitializer.kt b/app/src/main/java/one/mixin/android/startup/EmojiAppInitializer.kt index 5bad9d1768..f33f06f6af 100644 --- a/app/src/main/java/one/mixin/android/startup/EmojiAppInitializer.kt +++ b/app/src/main/java/one/mixin/android/startup/EmojiAppInitializer.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.startup import android.content.Context diff --git a/app/src/main/java/one/mixin/android/ui/PipVideoView.kt b/app/src/main/java/one/mixin/android/ui/PipVideoView.kt index 44c4b66a17..6dff1a9079 100644 --- a/app/src/main/java/one/mixin/android/ui/PipVideoView.kt +++ b/app/src/main/java/one/mixin/android/ui/PipVideoView.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui import android.animation.Animator diff --git a/app/src/main/java/one/mixin/android/ui/auth/AppAuthActivity.kt b/app/src/main/java/one/mixin/android/ui/auth/AppAuthActivity.kt index 59a2f7a0b1..75f68e26e6 100644 --- a/app/src/main/java/one/mixin/android/ui/auth/AppAuthActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/auth/AppAuthActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.auth import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/call/CallActivity.kt b/app/src/main/java/one/mixin/android/ui/call/CallActivity.kt index f787078e00..c81a6bc3a7 100644 --- a/app/src/main/java/one/mixin/android/ui/call/CallActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/call/CallActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.call import android.content.Context diff --git a/app/src/main/java/one/mixin/android/ui/common/JoinGroupBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/common/JoinGroupBottomSheetDialogFragment.kt index b3dd533b84..c102cc3f2e 100644 --- a/app/src/main/java/one/mixin/android/ui/common/JoinGroupBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/common/JoinGroupBottomSheetDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.common import android.app.Dialog diff --git a/app/src/main/java/one/mixin/android/ui/common/NoKeyWarningBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/common/NoKeyWarningBottomSheetDialogFragment.kt index 6df89c8311..984813e321 100644 --- a/app/src/main/java/one/mixin/android/ui/common/NoKeyWarningBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/common/NoKeyWarningBottomSheetDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.common import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/common/NonMessengerUserBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/common/NonMessengerUserBottomSheetDialogFragment.kt index 33a8963725..6deab00db5 100644 --- a/app/src/main/java/one/mixin/android/ui/common/NonMessengerUserBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/common/NonMessengerUserBottomSheetDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.common import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/common/QrBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/common/QrBottomSheetDialogFragment.kt index b5db12cb15..6c11b2a2ef 100644 --- a/app/src/main/java/one/mixin/android/ui/common/QrBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/common/QrBottomSheetDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.common import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/common/message/SendMessageHelper.kt b/app/src/main/java/one/mixin/android/ui/common/message/SendMessageHelper.kt index 9620987c04..e84db33755 100644 --- a/app/src/main/java/one/mixin/android/ui/common/message/SendMessageHelper.kt +++ b/app/src/main/java/one/mixin/android/ui/common/message/SendMessageHelper.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.common.message import android.graphics.Bitmap diff --git a/app/src/main/java/one/mixin/android/ui/common/profile/ReferralBindPreviewBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/common/profile/ReferralBindPreviewBottomSheetDialogFragment.kt index 105078b4e0..4ac1fca7cf 100644 --- a/app/src/main/java/one/mixin/android/ui/common/profile/ReferralBindPreviewBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/common/profile/ReferralBindPreviewBottomSheetDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.common.profile import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/contacts/ContactBottomSheetDialog.kt b/app/src/main/java/one/mixin/android/ui/contacts/ContactBottomSheetDialog.kt index 511201da51..2988cacd34 100644 --- a/app/src/main/java/one/mixin/android/ui/contacts/ContactBottomSheetDialog.kt +++ b/app/src/main/java/one/mixin/android/ui/contacts/ContactBottomSheetDialog.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.contacts import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/contacts/ContactsActivity.kt b/app/src/main/java/one/mixin/android/ui/contacts/ContactsActivity.kt index 4c64622636..4de90cd829 100644 --- a/app/src/main/java/one/mixin/android/ui/contacts/ContactsActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/contacts/ContactsActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.contacts import android.app.Activity diff --git a/app/src/main/java/one/mixin/android/ui/conversation/ConversationFragment.kt b/app/src/main/java/one/mixin/android/ui/conversation/ConversationFragment.kt index 30d8147e76..67b1e76854 100644 --- a/app/src/main/java/one/mixin/android/ui/conversation/ConversationFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/conversation/ConversationFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.conversation import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/conversation/GalleryAlbumFragment.kt b/app/src/main/java/one/mixin/android/ui/conversation/GalleryAlbumFragment.kt index 57bee09d6a..f5e6015460 100644 --- a/app/src/main/java/one/mixin/android/ui/conversation/GalleryAlbumFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/conversation/GalleryAlbumFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.conversation import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/conversation/chat/ChatItemCallback.kt b/app/src/main/java/one/mixin/android/ui/conversation/chat/ChatItemCallback.kt index 812c12d1be..e7cd15cac0 100644 --- a/app/src/main/java/one/mixin/android/ui/conversation/chat/ChatItemCallback.kt +++ b/app/src/main/java/one/mixin/android/ui/conversation/chat/ChatItemCallback.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.conversation.chat import android.content.Context diff --git a/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt b/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt index 4ad93bb7f3..e372b1b2e0 100644 --- a/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.conversation.location import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/conversation/preview/PreviewDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/conversation/preview/PreviewDialogFragment.kt index 9d4758e135..addb7ab40b 100644 --- a/app/src/main/java/one/mixin/android/ui/conversation/preview/PreviewDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/conversation/preview/PreviewDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.conversation.preview import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/forward/ForwardActivity.kt b/app/src/main/java/one/mixin/android/ui/forward/ForwardActivity.kt index 6c134855f6..36ccbe2f7e 100644 --- a/app/src/main/java/one/mixin/android/ui/forward/ForwardActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/forward/ForwardActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.forward import android.app.Activity diff --git a/app/src/main/java/one/mixin/android/ui/group/GroupActivity.kt b/app/src/main/java/one/mixin/android/ui/group/GroupActivity.kt index de26a79018..dcf938b3b1 100644 --- a/app/src/main/java/one/mixin/android/ui/group/GroupActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/group/GroupActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.group import android.content.Context diff --git a/app/src/main/java/one/mixin/android/ui/group/InviteQrBottomFragment.kt b/app/src/main/java/one/mixin/android/ui/group/InviteQrBottomFragment.kt index 1b2b07ab73..3a63aa7000 100644 --- a/app/src/main/java/one/mixin/android/ui/group/InviteQrBottomFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/group/InviteQrBottomFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.group import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/home/MainActivity.kt b/app/src/main/java/one/mixin/android/ui/home/MainActivity.kt index 95e0c3bbd8..042c3f752a 100644 --- a/app/src/main/java/one/mixin/android/ui/home/MainActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/home/MainActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.home import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/home/circle/ConversationCircleEditFragment.kt b/app/src/main/java/one/mixin/android/ui/home/circle/ConversationCircleEditFragment.kt index a909ff3c01..bd17384544 100644 --- a/app/src/main/java/one/mixin/android/ui/home/circle/ConversationCircleEditFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/home/circle/ConversationCircleEditFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.home.circle import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/BrowserPage.kt b/app/src/main/java/one/mixin/android/ui/home/web3/BrowserPage.kt index d18e6e3b68..e2f845fbdb 100644 --- a/app/src/main/java/one/mixin/android/ui/home/web3/BrowserPage.kt +++ b/app/src/main/java/one/mixin/android/ui/home/web3/BrowserPage.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.home.web3 import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/trade/SwapTokenPage.kt b/app/src/main/java/one/mixin/android/ui/home/web3/trade/SwapTokenPage.kt index cd17c5ffec..db4ac59672 100644 --- a/app/src/main/java/one/mixin/android/ui/home/web3/trade/SwapTokenPage.kt +++ b/app/src/main/java/one/mixin/android/ui/home/web3/trade/SwapTokenPage.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.home.web3.trade import androidx.compose.foundation.clickable diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsAddBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsAddBottomSheetDialogFragment.kt index 2c33f66c4e..5fedaa9192 100644 --- a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsAddBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsAddBottomSheetDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.home.web3.trade.perps import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsTpSlBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsTpSlBottomSheetDialogFragment.kt index 2cbc184dfa..e2e488739c 100644 --- a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsTpSlBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsTpSlBottomSheetDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.home.web3.trade.perps import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/imageeditor/ImageEditorActivity.kt b/app/src/main/java/one/mixin/android/ui/imageeditor/ImageEditorActivity.kt index 2ad8fabb71..552c680af2 100644 --- a/app/src/main/java/one/mixin/android/ui/imageeditor/ImageEditorActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/imageeditor/ImageEditorActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.imageeditor import android.app.Activity diff --git a/app/src/main/java/one/mixin/android/ui/landing/VerificationFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/VerificationFragment.kt index bac7807f9f..96b41a3c3c 100644 --- a/app/src/main/java/one/mixin/android/ui/landing/VerificationFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/landing/VerificationFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.landing import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/landing/components/HighlightedTextWithClick.kt b/app/src/main/java/one/mixin/android/ui/landing/components/HighlightedTextWithClick.kt index 6d402d7355..91e327d31c 100644 --- a/app/src/main/java/one/mixin/android/ui/landing/components/HighlightedTextWithClick.kt +++ b/app/src/main/java/one/mixin/android/ui/landing/components/HighlightedTextWithClick.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.landing.components import androidx.compose.foundation.text.ClickableText diff --git a/app/src/main/java/one/mixin/android/ui/logs/LogViewerScreen.kt b/app/src/main/java/one/mixin/android/ui/logs/LogViewerScreen.kt index 96c2735574..092d0b7d1d 100644 --- a/app/src/main/java/one/mixin/android/ui/logs/LogViewerScreen.kt +++ b/app/src/main/java/one/mixin/android/ui/logs/LogViewerScreen.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.logs import android.content.Intent diff --git a/app/src/main/java/one/mixin/android/ui/media/SharedMediaActivity.kt b/app/src/main/java/one/mixin/android/ui/media/SharedMediaActivity.kt index be07151d45..f96debbd31 100644 --- a/app/src/main/java/one/mixin/android/ui/media/SharedMediaActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/media/SharedMediaActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.media import android.content.Context diff --git a/app/src/main/java/one/mixin/android/ui/media/pager/PlayerControlView.kt b/app/src/main/java/one/mixin/android/ui/media/pager/PlayerControlView.kt index ace4ac1007..4d64ee09b5 100644 --- a/app/src/main/java/one/mixin/android/ui/media/pager/PlayerControlView.kt +++ b/app/src/main/java/one/mixin/android/ui/media/pager/PlayerControlView.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.media.pager import android.content.Context diff --git a/app/src/main/java/one/mixin/android/ui/media/pager/PlayerView.kt b/app/src/main/java/one/mixin/android/ui/media/pager/PlayerView.kt index a627dc29c2..a746340286 100644 --- a/app/src/main/java/one/mixin/android/ui/media/pager/PlayerView.kt +++ b/app/src/main/java/one/mixin/android/ui/media/pager/PlayerView.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.media.pager import android.content.Context diff --git a/app/src/main/java/one/mixin/android/ui/media/pager/transcript/TranscriptMediaPagerActivity.kt b/app/src/main/java/one/mixin/android/ui/media/pager/transcript/TranscriptMediaPagerActivity.kt index e06a1bd597..6732eda836 100644 --- a/app/src/main/java/one/mixin/android/ui/media/pager/transcript/TranscriptMediaPagerActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/media/pager/transcript/TranscriptMediaPagerActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.media.pager.transcript import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/player/MusicActivity.kt b/app/src/main/java/one/mixin/android/ui/player/MusicActivity.kt index 24767d669a..42a3ff908f 100644 --- a/app/src/main/java/one/mixin/android/ui/player/MusicActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/player/MusicActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.player import android.app.PendingIntent diff --git a/app/src/main/java/one/mixin/android/ui/player/internal/MusicMetaLoader.kt b/app/src/main/java/one/mixin/android/ui/player/internal/MusicMetaLoader.kt index cb5374db47..34fa2eb542 100644 --- a/app/src/main/java/one/mixin/android/ui/player/internal/MusicMetaLoader.kt +++ b/app/src/main/java/one/mixin/android/ui/player/internal/MusicMetaLoader.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.player.internal import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/preview/TextPreviewActivity.kt b/app/src/main/java/one/mixin/android/ui/preview/TextPreviewActivity.kt index d0d9efd370..0ced99dec6 100644 --- a/app/src/main/java/one/mixin/android/ui/preview/TextPreviewActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/preview/TextPreviewActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.preview import android.content.Context diff --git a/app/src/main/java/one/mixin/android/ui/qr/BaseCameraxFragment.kt b/app/src/main/java/one/mixin/android/ui/qr/BaseCameraxFragment.kt index 65ff60c3eb..5aab26625b 100644 --- a/app/src/main/java/one/mixin/android/ui/qr/BaseCameraxFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/qr/BaseCameraxFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.qr import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/qr/CaptureActivity.kt b/app/src/main/java/one/mixin/android/ui/qr/CaptureActivity.kt index ed10ad25e6..d318d72bb8 100644 --- a/app/src/main/java/one/mixin/android/ui/qr/CaptureActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/qr/CaptureActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.qr import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/qr/CaptureFragment.kt b/app/src/main/java/one/mixin/android/ui/qr/CaptureFragment.kt index 48ca6f79a4..7042ca3434 100644 --- a/app/src/main/java/one/mixin/android/ui/qr/CaptureFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/qr/CaptureFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.qr import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt b/app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt index cdaab9b75e..926b9b5121 100644 --- a/app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.search import android.os.Bundle diff --git a/app/src/main/java/one/mixin/android/ui/search/SearchMessageAdapter.kt b/app/src/main/java/one/mixin/android/ui/search/SearchMessageAdapter.kt index 2074e05d32..baa466cbff 100644 --- a/app/src/main/java/one/mixin/android/ui/search/SearchMessageAdapter.kt +++ b/app/src/main/java/one/mixin/android/ui/search/SearchMessageAdapter.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.search import android.graphics.drawable.Drawable diff --git a/app/src/main/java/one/mixin/android/ui/search/SearchSingleFragment.kt b/app/src/main/java/one/mixin/android/ui/search/SearchSingleFragment.kt index f060bd4677..99520610a3 100644 --- a/app/src/main/java/one/mixin/android/ui/search/SearchSingleFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/search/SearchSingleFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.search import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/search/components/RecentSearchPage.kt b/app/src/main/java/one/mixin/android/ui/search/components/RecentSearchPage.kt index 9739699bea..2ed6dd600d 100644 --- a/app/src/main/java/one/mixin/android/ui/search/components/RecentSearchPage.kt +++ b/app/src/main/java/one/mixin/android/ui/search/components/RecentSearchPage.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.search.components import android.net.Uri diff --git a/app/src/main/java/one/mixin/android/ui/setting/AppearanceFragment.kt b/app/src/main/java/one/mixin/android/ui/setting/AppearanceFragment.kt index de375130ca..99e235f003 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/AppearanceFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/AppearanceFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.setting import android.os.Build diff --git a/app/src/main/java/one/mixin/android/ui/setting/DatabaseDebugFragment.kt b/app/src/main/java/one/mixin/android/ui/setting/DatabaseDebugFragment.kt index 57c0d62b8d..9f0c720bdc 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/DatabaseDebugFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/DatabaseDebugFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.setting import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/setting/SafeDebugFragment.kt b/app/src/main/java/one/mixin/android/ui/setting/SafeDebugFragment.kt index ba8ec40ba1..5e50e2fe14 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/SafeDebugFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/SafeDebugFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.setting import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/setting/SettingActivity.kt b/app/src/main/java/one/mixin/android/ui/setting/SettingActivity.kt index b64c80c0aa..5d4e645913 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/SettingActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/SettingActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.setting import android.app.Activity diff --git a/app/src/main/java/one/mixin/android/ui/setting/SettingSizeFragment.kt b/app/src/main/java/one/mixin/android/ui/setting/SettingSizeFragment.kt index c93acaf698..ff95dd3202 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/SettingSizeFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/SettingSizeFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.setting import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/setting/SettingWallpaperFragment.kt b/app/src/main/java/one/mixin/android/ui/setting/SettingWallpaperFragment.kt index 53db89efca..8b89b6ef43 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/SettingWallpaperFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/SettingWallpaperFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.setting import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/setting/member/MixinMemberOrderDetailFragment.kt b/app/src/main/java/one/mixin/android/ui/setting/member/MixinMemberOrderDetailFragment.kt index 9945e9482b..a803e23a6e 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/member/MixinMemberOrderDetailFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/member/MixinMemberOrderDetailFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.setting.member import android.os.Bundle diff --git a/app/src/main/java/one/mixin/android/ui/setting/ui/page/AppearancePage.kt b/app/src/main/java/one/mixin/android/ui/setting/ui/page/AppearancePage.kt index dbfa44c29e..44b9f9ef45 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/ui/page/AppearancePage.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/ui/page/AppearancePage.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.setting.ui.page import android.os.Build diff --git a/app/src/main/java/one/mixin/android/ui/sticker/StickerAddFragment.kt b/app/src/main/java/one/mixin/android/ui/sticker/StickerAddFragment.kt index 9892f4316b..54991f3b81 100644 --- a/app/src/main/java/one/mixin/android/ui/sticker/StickerAddFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/sticker/StickerAddFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.sticker import android.app.Dialog diff --git a/app/src/main/java/one/mixin/android/ui/sticker/StickerManagementFragment.kt b/app/src/main/java/one/mixin/android/ui/sticker/StickerManagementFragment.kt index 8020794075..f8c239e52b 100644 --- a/app/src/main/java/one/mixin/android/ui/sticker/StickerManagementFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/sticker/StickerManagementFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.sticker import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/tip/TipActivity.kt b/app/src/main/java/one/mixin/android/ui/tip/TipActivity.kt index 25929178be..076d7db87b 100644 --- a/app/src/main/java/one/mixin/android/ui/tip/TipActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/tip/TipActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.tip import android.app.Activity diff --git a/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectActivity.kt b/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectActivity.kt index 19df2a976d..b938113690 100644 --- a/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.tip.wc import android.app.Activity diff --git a/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt b/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt index 12776780cb..c85684ab57 100644 --- a/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.transfer import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/url/UrlInterpreterActivity.kt b/app/src/main/java/one/mixin/android/ui/url/UrlInterpreterActivity.kt index a364f7c933..45405212e9 100644 --- a/app/src/main/java/one/mixin/android/ui/url/UrlInterpreterActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/url/UrlInterpreterActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.url import android.content.Context diff --git a/app/src/main/java/one/mixin/android/ui/wallet/DepositQrBottomFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/DepositQrBottomFragment.kt index 2bd19b345b..46284df9bb 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/DepositQrBottomFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/DepositQrBottomFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/wallet/DepositShareActivity.kt b/app/src/main/java/one/mixin/android/ui/wallet/DepositShareActivity.kt index a7b2acb004..0c82006908 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/DepositShareActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/DepositShareActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/wallet/IdentityFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/IdentityFragment.kt index c778d548af..010c9d3297 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/IdentityFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/IdentityFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet import android.os.Bundle diff --git a/app/src/main/java/one/mixin/android/ui/wallet/PinBiometricsBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/PinBiometricsBottomSheetDialogFragment.kt index 674ede083d..88a6c4a903 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/PinBiometricsBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/PinBiometricsBottomSheetDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/wallet/WalletSecurityActivity.kt b/app/src/main/java/one/mixin/android/ui/wallet/WalletSecurityActivity.kt index c78974541e..305b3cadb4 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/WalletSecurityActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/WalletSecurityActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet import android.app.Activity diff --git a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableAddressAdapter.kt b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableAddressAdapter.kt index 766c1ad304..61739162eb 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableAddressAdapter.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableAddressAdapter.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet.adapter import android.view.LayoutInflater diff --git a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableCoinAdapter.kt b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableCoinAdapter.kt index 705ec8e727..7c583035b6 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableCoinAdapter.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableCoinAdapter.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet.adapter import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableTokenAdapter.kt b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableTokenAdapter.kt index 65165bb84b..3efaa5574e 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableTokenAdapter.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableTokenAdapter.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet.adapter import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableUserAdapter.kt b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableUserAdapter.kt index fe80079259..24c662f965 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableUserAdapter.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableUserAdapter.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet.adapter import android.view.LayoutInflater diff --git a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableWeb3TokenAdapter.kt b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableWeb3TokenAdapter.kt index be0e09add8..05fceaac3e 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableWeb3TokenAdapter.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SelectableWeb3TokenAdapter.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet.adapter import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/wallet/components/ImportWalletDetailPage.kt b/app/src/main/java/one/mixin/android/ui/wallet/components/ImportWalletDetailPage.kt index d383a15c08..88cafb4b01 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/components/ImportWalletDetailPage.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/components/ImportWalletDetailPage.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet.components import one.mixin.android.ui.home.web3.components.PageScaffold diff --git a/app/src/main/java/one/mixin/android/ui/wallet/components/InTransitionDuration.kt b/app/src/main/java/one/mixin/android/ui/wallet/components/InTransitionDuration.kt index 39df64fb05..83b417e45c 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/components/InTransitionDuration.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/components/InTransitionDuration.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet.components import androidx.compose.animation.core.LinearOutSlowInEasing import androidx.compose.animation.core.MutableTransitionState diff --git a/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/FiatMoneyViewModel.kt b/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/FiatMoneyViewModel.kt index 6842825624..ed351b7feb 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/FiatMoneyViewModel.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/FiatMoneyViewModel.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet.fiatmoney import android.os.Parcelable diff --git a/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/OrderConfirmFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/OrderConfirmFragment.kt index 8dad4ef0fe..8c66d0c75f 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/OrderConfirmFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/OrderConfirmFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet.fiatmoney import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/OrderStatusFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/OrderStatusFragment.kt index 5e709dea08..2d8a6bd164 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/OrderStatusFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/OrderStatusFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet.fiatmoney import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/SelectCardBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/SelectCardBottomSheetDialogFragment.kt index dd67862273..0ce74141e6 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/SelectCardBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/SelectCardBottomSheetDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.wallet.fiatmoney import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/ui/web/WebActivity.kt b/app/src/main/java/one/mixin/android/ui/web/WebActivity.kt index 6f9c5e0b58..a205537ba1 100644 --- a/app/src/main/java/one/mixin/android/ui/web/WebActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/web/WebActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.web import android.app.Activity diff --git a/app/src/main/java/one/mixin/android/ui/web/WebFragment.kt b/app/src/main/java/one/mixin/android/ui/web/WebFragment.kt index 28e42c0755..b182ddfac5 100644 --- a/app/src/main/java/one/mixin/android/ui/web/WebFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/web/WebFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.ui.web import android.Manifest diff --git a/app/src/main/java/one/mixin/android/util/Base58.kt b/app/src/main/java/one/mixin/android/util/Base58.kt index 94aec59492..61880aed6b 100644 --- a/app/src/main/java/one/mixin/android/util/Base58.kt +++ b/app/src/main/java/one/mixin/android/util/Base58.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.util import one.mixin.android.extension.sha256 diff --git a/app/src/main/java/one/mixin/android/util/mlkit/scan/camera/config/ResolutionCameraConfig.kt b/app/src/main/java/one/mixin/android/util/mlkit/scan/camera/config/ResolutionCameraConfig.kt index fd2f571c59..b3e6bd8dae 100644 --- a/app/src/main/java/one/mixin/android/util/mlkit/scan/camera/config/ResolutionCameraConfig.kt +++ b/app/src/main/java/one/mixin/android/util/mlkit/scan/camera/config/ResolutionCameraConfig.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.util.mlkit.scan.camera.config import android.content.Context diff --git a/app/src/main/java/one/mixin/android/util/mlkit/scan/manager/BeepManager.kt b/app/src/main/java/one/mixin/android/util/mlkit/scan/manager/BeepManager.kt index 54f0f1832f..24e8cef58a 100644 --- a/app/src/main/java/one/mixin/android/util/mlkit/scan/manager/BeepManager.kt +++ b/app/src/main/java/one/mixin/android/util/mlkit/scan/manager/BeepManager.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.util.mlkit.scan.manager import android.content.Context diff --git a/app/src/main/java/one/mixin/android/util/mlkit/scan/utils/BitmapUtils.kt b/app/src/main/java/one/mixin/android/util/mlkit/scan/utils/BitmapUtils.kt index 87e2ef273d..ff45b12312 100644 --- a/app/src/main/java/one/mixin/android/util/mlkit/scan/utils/BitmapUtils.kt +++ b/app/src/main/java/one/mixin/android/util/mlkit/scan/utils/BitmapUtils.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.util.mlkit.scan.utils import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/util/video/MixinPlayer.kt b/app/src/main/java/one/mixin/android/util/video/MixinPlayer.kt index c27b9c26a9..f71b79e7ec 100644 --- a/app/src/main/java/one/mixin/android/util/video/MixinPlayer.kt +++ b/app/src/main/java/one/mixin/android/util/video/MixinPlayer.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.util.video import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/web3/details/Web3TransactionFragment.kt b/app/src/main/java/one/mixin/android/web3/details/Web3TransactionFragment.kt index fb7aaddeee..b94b4f087b 100644 --- a/app/src/main/java/one/mixin/android/web3/details/Web3TransactionFragment.kt +++ b/app/src/main/java/one/mixin/android/web3/details/Web3TransactionFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.web3.details import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/web3/details/Web3TransactionsFragment.kt b/app/src/main/java/one/mixin/android/web3/details/Web3TransactionsFragment.kt index 086bd6748c..aab825344c 100644 --- a/app/src/main/java/one/mixin/android/web3/details/Web3TransactionsFragment.kt +++ b/app/src/main/java/one/mixin/android/web3/details/Web3TransactionsFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.web3.details import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/web3/swap/Components/RecentSwapTokens.kt b/app/src/main/java/one/mixin/android/web3/swap/Components/RecentSwapTokens.kt index 4f8c12f709..9ab703a283 100644 --- a/app/src/main/java/one/mixin/android/web3/swap/Components/RecentSwapTokens.kt +++ b/app/src/main/java/one/mixin/android/web3/swap/Components/RecentSwapTokens.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.web3.swap.Components import androidx.compose.foundation.BorderStroke diff --git a/app/src/main/java/one/mixin/android/widget/AddressTextView.kt b/app/src/main/java/one/mixin/android/widget/AddressTextView.kt index f30c19e059..32ade5c030 100644 --- a/app/src/main/java/one/mixin/android/widget/AddressTextView.kt +++ b/app/src/main/java/one/mixin/android/widget/AddressTextView.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.content.Context diff --git a/app/src/main/java/one/mixin/android/widget/BlurTransformation.kt b/app/src/main/java/one/mixin/android/widget/BlurTransformation.kt index a4d9e83d0a..9c455aa2c0 100644 --- a/app/src/main/java/one/mixin/android/widget/BlurTransformation.kt +++ b/app/src/main/java/one/mixin/android/widget/BlurTransformation.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.content.Context diff --git a/app/src/main/java/one/mixin/android/widget/BottomSheet.kt b/app/src/main/java/one/mixin/android/widget/BottomSheet.kt index 79db838a5e..fd280f36c0 100644 --- a/app/src/main/java/one/mixin/android/widget/BottomSheet.kt +++ b/app/src/main/java/one/mixin/android/widget/BottomSheet.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.animation.Animator diff --git a/app/src/main/java/one/mixin/android/widget/ContentEditText.kt b/app/src/main/java/one/mixin/android/widget/ContentEditText.kt index 707d05a631..93c5c4f2de 100644 --- a/app/src/main/java/one/mixin/android/widget/ContentEditText.kt +++ b/app/src/main/java/one/mixin/android/widget/ContentEditText.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/widget/DebugClickListener.kt b/app/src/main/java/one/mixin/android/widget/DebugClickListener.kt index 7197c9bf71..213bd5f728 100644 --- a/app/src/main/java/one/mixin/android/widget/DebugClickListener.kt +++ b/app/src/main/java/one/mixin/android/widget/DebugClickListener.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.os.Handler diff --git a/app/src/main/java/one/mixin/android/widget/GestureFrameLayout.kt b/app/src/main/java/one/mixin/android/widget/GestureFrameLayout.kt index b0eabd34cc..46e240dd31 100644 --- a/app/src/main/java/one/mixin/android/widget/GestureFrameLayout.kt +++ b/app/src/main/java/one/mixin/android/widget/GestureFrameLayout.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.content.Context diff --git a/app/src/main/java/one/mixin/android/widget/GestureMessageLayout.kt b/app/src/main/java/one/mixin/android/widget/GestureMessageLayout.kt index 21b2fdbcb8..3f0f79220e 100644 --- a/app/src/main/java/one/mixin/android/widget/GestureMessageLayout.kt +++ b/app/src/main/java/one/mixin/android/widget/GestureMessageLayout.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.content.Context diff --git a/app/src/main/java/one/mixin/android/widget/PercentView.kt b/app/src/main/java/one/mixin/android/widget/PercentView.kt index 8f61c6a6ea..9e3a01749a 100644 --- a/app/src/main/java/one/mixin/android/widget/PercentView.kt +++ b/app/src/main/java/one/mixin/android/widget/PercentView.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.content.Context diff --git a/app/src/main/java/one/mixin/android/widget/PlayerBottomControlView.kt b/app/src/main/java/one/mixin/android/widget/PlayerBottomControlView.kt index 2fff3520c0..da79b93a60 100644 --- a/app/src/main/java/one/mixin/android/widget/PlayerBottomControlView.kt +++ b/app/src/main/java/one/mixin/android/widget/PlayerBottomControlView.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/widget/QuoteView.kt b/app/src/main/java/one/mixin/android/widget/QuoteView.kt index a126ac20ca..6633594ed3 100644 --- a/app/src/main/java/one/mixin/android/widget/QuoteView.kt +++ b/app/src/main/java/one/mixin/android/widget/QuoteView.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.content.Context diff --git a/app/src/main/java/one/mixin/android/widget/ReplyView.kt b/app/src/main/java/one/mixin/android/widget/ReplyView.kt index 6f2ee8b451..fb4ecc5400 100644 --- a/app/src/main/java/one/mixin/android/widget/ReplyView.kt +++ b/app/src/main/java/one/mixin/android/widget/ReplyView.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.content.Context diff --git a/app/src/main/java/one/mixin/android/widget/ToolView.kt b/app/src/main/java/one/mixin/android/widget/ToolView.kt index e7ddd85155..24db045f2d 100644 --- a/app/src/main/java/one/mixin/android/widget/ToolView.kt +++ b/app/src/main/java/one/mixin/android/widget/ToolView.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.content.Context diff --git a/app/src/main/java/one/mixin/android/widget/ViewfinderView.kt b/app/src/main/java/one/mixin/android/widget/ViewfinderView.kt index efb39f9d1a..9f780f694c 100644 --- a/app/src/main/java/one/mixin/android/widget/ViewfinderView.kt +++ b/app/src/main/java/one/mixin/android/widget/ViewfinderView.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget import android.content.Context diff --git a/app/src/main/java/one/mixin/android/widget/bot/BotDock.kt b/app/src/main/java/one/mixin/android/widget/bot/BotDock.kt index 24bea53b65..f138be71b1 100644 --- a/app/src/main/java/one/mixin/android/widget/bot/BotDock.kt +++ b/app/src/main/java/one/mixin/android/widget/bot/BotDock.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget.bot import android.annotation.SuppressLint diff --git a/app/src/main/java/one/mixin/android/widget/gallery/internal/model/SelectedItemCollection.kt b/app/src/main/java/one/mixin/android/widget/gallery/internal/model/SelectedItemCollection.kt index fe25e482a3..8b80fa12a4 100644 --- a/app/src/main/java/one/mixin/android/widget/gallery/internal/model/SelectedItemCollection.kt +++ b/app/src/main/java/one/mixin/android/widget/gallery/internal/model/SelectedItemCollection.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget.gallery.internal.model import android.content.Context diff --git a/app/src/main/java/one/mixin/android/widget/gallery/ui/GalleryActivity.kt b/app/src/main/java/one/mixin/android/widget/gallery/ui/GalleryActivity.kt index 7178eb1814..9c734c31bb 100644 --- a/app/src/main/java/one/mixin/android/widget/gallery/ui/GalleryActivity.kt +++ b/app/src/main/java/one/mixin/android/widget/gallery/ui/GalleryActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget.gallery.ui import android.app.Activity diff --git a/app/src/main/java/one/mixin/android/widget/linktext/GestureAutoLinkTextView.kt b/app/src/main/java/one/mixin/android/widget/linktext/GestureAutoLinkTextView.kt index 0cd1d5ac4b..a5e84e8cb7 100644 --- a/app/src/main/java/one/mixin/android/widget/linktext/GestureAutoLinkTextView.kt +++ b/app/src/main/java/one/mixin/android/widget/linktext/GestureAutoLinkTextView.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget.linktext import android.content.Context diff --git a/app/src/main/java/one/mixin/android/widget/theme/ThemeActivity.kt b/app/src/main/java/one/mixin/android/widget/theme/ThemeActivity.kt index 289fb621f6..86927455be 100644 --- a/app/src/main/java/one/mixin/android/widget/theme/ThemeActivity.kt +++ b/app/src/main/java/one/mixin/android/widget/theme/ThemeActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package one.mixin.android.widget.theme import android.animation.Animator From 186cea2a5eb7c131bf4613e1d18fa7170882270f Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 12:16:28 +0800 Subject: [PATCH 11/21] chore: suppress deprecated override warnings --- app/src/main/java/one/mixin/android/job/SendService.kt | 2 +- app/src/main/java/one/mixin/android/media/OpusAudioRecorder.kt | 2 +- app/src/main/java/one/mixin/android/ui/auth/AppAuthActivity.kt | 2 +- app/src/main/java/one/mixin/android/ui/common/AvatarActivity.kt | 2 ++ .../ui/common/profile/ProfileBottomSheetDialogFragment.kt | 2 ++ .../mixin/android/ui/conversation/location/LocationActivity.kt | 2 +- .../java/one/mixin/android/ui/landing/InitializeActivity.kt | 2 ++ .../java/one/mixin/android/ui/media/pager/PlayerControlView.kt | 2 +- .../main/java/one/mixin/android/ui/media/pager/PlayerView.kt | 2 +- .../main/java/one/mixin/android/ui/qr/BaseCameraxFragment.kt | 2 +- .../one/mixin/android/ui/setting/SettingWallpaperFragment.kt | 2 +- .../one/mixin/android/ui/sticker/StickerManagementFragment.kt | 2 +- .../main/java/one/mixin/android/ui/transfer/TransferActivity.kt | 2 +- .../java/one/mixin/android/ui/wallet/WalletSecurityActivity.kt | 2 +- app/src/main/java/one/mixin/android/ui/web/WebActivity.kt | 2 +- app/src/main/java/one/mixin/android/ui/web/WebFragment.kt | 2 +- app/src/main/java/one/mixin/android/util/MemoryCallback.kt | 2 ++ app/src/main/java/one/mixin/android/util/video/MixinPlayer.kt | 2 +- .../java/one/mixin/android/widget/PlayerBottomControlView.kt | 2 +- .../java/one/mixin/android/widget/audio/BlinkingDrawable.kt | 2 ++ 20 files changed, 25 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/one/mixin/android/job/SendService.kt b/app/src/main/java/one/mixin/android/job/SendService.kt index 6a7ba3064d..0824ed4166 100644 --- a/app/src/main/java/one/mixin/android/job/SendService.kt +++ b/app/src/main/java/one/mixin/android/job/SendService.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.job diff --git a/app/src/main/java/one/mixin/android/media/OpusAudioRecorder.kt b/app/src/main/java/one/mixin/android/media/OpusAudioRecorder.kt index 76d853154e..0f5666dfc2 100644 --- a/app/src/main/java/one/mixin/android/media/OpusAudioRecorder.kt +++ b/app/src/main/java/one/mixin/android/media/OpusAudioRecorder.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.media diff --git a/app/src/main/java/one/mixin/android/ui/auth/AppAuthActivity.kt b/app/src/main/java/one/mixin/android/ui/auth/AppAuthActivity.kt index 75f68e26e6..30c6366719 100644 --- a/app/src/main/java/one/mixin/android/ui/auth/AppAuthActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/auth/AppAuthActivity.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.ui.auth diff --git a/app/src/main/java/one/mixin/android/ui/common/AvatarActivity.kt b/app/src/main/java/one/mixin/android/ui/common/AvatarActivity.kt index 74c50a3a61..a419f393e4 100644 --- a/app/src/main/java/one/mixin/android/ui/common/AvatarActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/common/AvatarActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("OVERRIDE_DEPRECATION") + package one.mixin.android.ui.common import android.animation.AnimatorSet diff --git a/app/src/main/java/one/mixin/android/ui/common/profile/ProfileBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/common/profile/ProfileBottomSheetDialogFragment.kt index 0d7d5a26a5..d2cc09418a 100644 --- a/app/src/main/java/one/mixin/android/ui/common/profile/ProfileBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/common/profile/ProfileBottomSheetDialogFragment.kt @@ -1,3 +1,5 @@ +@file:Suppress("OVERRIDE_DEPRECATION") + package one.mixin.android.ui.common.profile import android.Manifest diff --git a/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt b/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt index e372b1b2e0..051613a127 100644 --- a/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.ui.conversation.location diff --git a/app/src/main/java/one/mixin/android/ui/landing/InitializeActivity.kt b/app/src/main/java/one/mixin/android/ui/landing/InitializeActivity.kt index 2b6bff4cab..2183f22221 100644 --- a/app/src/main/java/one/mixin/android/ui/landing/InitializeActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/landing/InitializeActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("OVERRIDE_DEPRECATION") + package one.mixin.android.ui.landing import android.content.Context diff --git a/app/src/main/java/one/mixin/android/ui/media/pager/PlayerControlView.kt b/app/src/main/java/one/mixin/android/ui/media/pager/PlayerControlView.kt index 4d64ee09b5..f292792b65 100644 --- a/app/src/main/java/one/mixin/android/ui/media/pager/PlayerControlView.kt +++ b/app/src/main/java/one/mixin/android/ui/media/pager/PlayerControlView.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.ui.media.pager diff --git a/app/src/main/java/one/mixin/android/ui/media/pager/PlayerView.kt b/app/src/main/java/one/mixin/android/ui/media/pager/PlayerView.kt index a746340286..96b4d7bc55 100644 --- a/app/src/main/java/one/mixin/android/ui/media/pager/PlayerView.kt +++ b/app/src/main/java/one/mixin/android/ui/media/pager/PlayerView.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.ui.media.pager diff --git a/app/src/main/java/one/mixin/android/ui/qr/BaseCameraxFragment.kt b/app/src/main/java/one/mixin/android/ui/qr/BaseCameraxFragment.kt index 5aab26625b..85806d2d22 100644 --- a/app/src/main/java/one/mixin/android/ui/qr/BaseCameraxFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/qr/BaseCameraxFragment.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.ui.qr diff --git a/app/src/main/java/one/mixin/android/ui/setting/SettingWallpaperFragment.kt b/app/src/main/java/one/mixin/android/ui/setting/SettingWallpaperFragment.kt index 8b89b6ef43..80fe8da3e2 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/SettingWallpaperFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/SettingWallpaperFragment.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.ui.setting diff --git a/app/src/main/java/one/mixin/android/ui/sticker/StickerManagementFragment.kt b/app/src/main/java/one/mixin/android/ui/sticker/StickerManagementFragment.kt index f8c239e52b..d092108f3d 100644 --- a/app/src/main/java/one/mixin/android/ui/sticker/StickerManagementFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/sticker/StickerManagementFragment.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.ui.sticker diff --git a/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt b/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt index c85684ab57..12ec921bde 100644 --- a/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.ui.transfer diff --git a/app/src/main/java/one/mixin/android/ui/wallet/WalletSecurityActivity.kt b/app/src/main/java/one/mixin/android/ui/wallet/WalletSecurityActivity.kt index 305b3cadb4..f2eac7a95c 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/WalletSecurityActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/WalletSecurityActivity.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.ui.wallet diff --git a/app/src/main/java/one/mixin/android/ui/web/WebActivity.kt b/app/src/main/java/one/mixin/android/ui/web/WebActivity.kt index a205537ba1..3a7caab719 100644 --- a/app/src/main/java/one/mixin/android/ui/web/WebActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/web/WebActivity.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.ui.web diff --git a/app/src/main/java/one/mixin/android/ui/web/WebFragment.kt b/app/src/main/java/one/mixin/android/ui/web/WebFragment.kt index b182ddfac5..922793a361 100644 --- a/app/src/main/java/one/mixin/android/ui/web/WebFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/web/WebFragment.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.ui.web diff --git a/app/src/main/java/one/mixin/android/util/MemoryCallback.kt b/app/src/main/java/one/mixin/android/util/MemoryCallback.kt index 5bdabfca4f..6f3f96058d 100644 --- a/app/src/main/java/one/mixin/android/util/MemoryCallback.kt +++ b/app/src/main/java/one/mixin/android/util/MemoryCallback.kt @@ -1,3 +1,5 @@ +@file:Suppress("OVERRIDE_DEPRECATION") + package one.mixin.android.util import android.content.ComponentCallbacks2 diff --git a/app/src/main/java/one/mixin/android/util/video/MixinPlayer.kt b/app/src/main/java/one/mixin/android/util/video/MixinPlayer.kt index f71b79e7ec..9dab059fe0 100644 --- a/app/src/main/java/one/mixin/android/util/video/MixinPlayer.kt +++ b/app/src/main/java/one/mixin/android/util/video/MixinPlayer.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.util.video diff --git a/app/src/main/java/one/mixin/android/widget/PlayerBottomControlView.kt b/app/src/main/java/one/mixin/android/widget/PlayerBottomControlView.kt index da79b93a60..49ad776e95 100644 --- a/app/src/main/java/one/mixin/android/widget/PlayerBottomControlView.kt +++ b/app/src/main/java/one/mixin/android/widget/PlayerBottomControlView.kt @@ -1,4 +1,4 @@ -@file:Suppress("DEPRECATION") +@file:Suppress("OVERRIDE_DEPRECATION", "DEPRECATION") package one.mixin.android.widget diff --git a/app/src/main/java/one/mixin/android/widget/audio/BlinkingDrawable.kt b/app/src/main/java/one/mixin/android/widget/audio/BlinkingDrawable.kt index e54fceb7cc..6ade453923 100644 --- a/app/src/main/java/one/mixin/android/widget/audio/BlinkingDrawable.kt +++ b/app/src/main/java/one/mixin/android/widget/audio/BlinkingDrawable.kt @@ -1,3 +1,5 @@ +@file:Suppress("OVERRIDE_DEPRECATION") + package one.mixin.android.widget.audio import android.animation.ObjectAnimator From 1b3f99f6e0b2d2f29db49b52460b094e814ec37d Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 12:25:01 +0800 Subject: [PATCH 12/21] chore: add explicit annotation use-site targets --- .../main/java/one/mixin/android/compose/TextHighlight.kt | 2 +- .../one/mixin/android/db/web3/vo/Web3TransactionItem.kt | 6 +++--- .../one/mixin/android/repository/SafeBoxStoreManager.kt | 2 +- .../java/one/mixin/android/repository/Web3Repository.kt | 2 +- .../one/mixin/android/ui/common/message/ChatRoomHelper.kt | 2 +- .../main/java/one/mixin/android/ui/home/bot/InternalApp.kt | 6 +++--- .../mixin/android/ui/home/inscription/menu/SortMenuData.kt | 2 +- .../android/ui/home/web3/trade/perps/PerpetualGuidePage.kt | 2 +- .../java/one/mixin/android/ui/landing/LandingFeatureItem.kt | 2 +- .../java/one/mixin/android/ui/transfer/TransferClient.kt | 2 +- .../main/java/one/mixin/android/ui/wallet/SortMenuData.kt | 2 +- .../java/one/mixin/android/ui/wallet/Web3TypeMenuData.kt | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/one/mixin/android/compose/TextHighlight.kt b/app/src/main/java/one/mixin/android/compose/TextHighlight.kt index 6200a6ad34..d659235558 100644 --- a/app/src/main/java/one/mixin/android/compose/TextHighlight.kt +++ b/app/src/main/java/one/mixin/android/compose/TextHighlight.kt @@ -28,7 +28,7 @@ fun HighlightStarLinkText( onClick: (link: String) -> Unit, ) { val annotatedString = - remember(source, links, highlightStyle) { + remember(source, links, highlightStyle, onClick) { buildAnnotatedString { var start: Int var end: Int diff --git a/app/src/main/java/one/mixin/android/db/web3/vo/Web3TransactionItem.kt b/app/src/main/java/one/mixin/android/db/web3/vo/Web3TransactionItem.kt index be2f205d9a..e2c7088293 100644 --- a/app/src/main/java/one/mixin/android/db/web3/vo/Web3TransactionItem.kt +++ b/app/src/main/java/one/mixin/android/db/web3/vo/Web3TransactionItem.kt @@ -33,15 +33,15 @@ data class Web3TransactionItem( @ColumnInfo(name = "fee") val fee: String, - @TypeConverters(AssetChangeListConverter::class) + @field:TypeConverters(AssetChangeListConverter::class) @ColumnInfo(name = "senders") val senders: List, - @TypeConverters(AssetChangeListConverter::class) + @field:TypeConverters(AssetChangeListConverter::class) @ColumnInfo(name = "receivers") val receivers: List, - @TypeConverters(AssetChangeListConverter::class) + @field:TypeConverters(AssetChangeListConverter::class) @ColumnInfo(name = "approvals") val approvals: List? = null, diff --git a/app/src/main/java/one/mixin/android/repository/SafeBoxStoreManager.kt b/app/src/main/java/one/mixin/android/repository/SafeBoxStoreManager.kt index 62ccbc1f78..9832031d2a 100644 --- a/app/src/main/java/one/mixin/android/repository/SafeBoxStoreManager.kt +++ b/app/src/main/java/one/mixin/android/repository/SafeBoxStoreManager.kt @@ -20,7 +20,7 @@ import javax.inject.Singleton class SafeBoxStoreManager @Inject constructor( - @ApplicationContext private val appContext: Context, + @param:ApplicationContext private val appContext: Context, ) { private data class StoreEntry( val store: DataStore, diff --git a/app/src/main/java/one/mixin/android/repository/Web3Repository.kt b/app/src/main/java/one/mixin/android/repository/Web3Repository.kt index 41dc6e6523..d563fd3b7f 100644 --- a/app/src/main/java/one/mixin/android/repository/Web3Repository.kt +++ b/app/src/main/java/one/mixin/android/repository/Web3Repository.kt @@ -66,7 +66,7 @@ import javax.inject.Inject class Web3Repository @Inject constructor( - @ApplicationContext private val context: Context, + @param:ApplicationContext private val context: Context, val routeService: RouteService, val web3TokenDao: Web3TokenDao, val web3TransactionDao: Web3TransactionDao, diff --git a/app/src/main/java/one/mixin/android/ui/common/message/ChatRoomHelper.kt b/app/src/main/java/one/mixin/android/ui/common/message/ChatRoomHelper.kt index 181471aab5..ab2fb3d6ba 100644 --- a/app/src/main/java/one/mixin/android/ui/common/message/ChatRoomHelper.kt +++ b/app/src/main/java/one/mixin/android/ui/common/message/ChatRoomHelper.kt @@ -20,7 +20,7 @@ import javax.inject.Inject class ChatRoomHelper @Inject internal constructor( - @ApplicationScope private val applicationScope: CoroutineScope, + @param:ApplicationScope private val applicationScope: CoroutineScope, private val conversationDao: ConversationDao, private val remoteMessageStatusDao: RemoteMessageStatusDao, private val messageMentionDao: MessageMentionDao, diff --git a/app/src/main/java/one/mixin/android/ui/home/bot/InternalApp.kt b/app/src/main/java/one/mixin/android/ui/home/bot/InternalApp.kt index 2aff83749d..7bd6ca9b16 100644 --- a/app/src/main/java/one/mixin/android/ui/home/bot/InternalApp.kt +++ b/app/src/main/java/one/mixin/android/ui/home/bot/InternalApp.kt @@ -7,9 +7,9 @@ import one.mixin.android.vo.BotInterface data class Bot( val id: String, - @StringRes val name: Int, - @StringRes val description: Int, - @DrawableRes val icon: Int, + @param:StringRes val name: Int, + @param:StringRes val description: Int, + @param:DrawableRes val icon: Int, ) : BotInterface { override fun getBotId() = id } diff --git a/app/src/main/java/one/mixin/android/ui/home/inscription/menu/SortMenuData.kt b/app/src/main/java/one/mixin/android/ui/home/inscription/menu/SortMenuData.kt index 08b1aadaf3..c567fee358 100644 --- a/app/src/main/java/one/mixin/android/ui/home/inscription/menu/SortMenuData.kt +++ b/app/src/main/java/one/mixin/android/ui/home/inscription/menu/SortMenuData.kt @@ -4,4 +4,4 @@ import androidx.annotation.DrawableRes import androidx.annotation.StringRes import one.mixin.android.tip.wc.SortOrder -data class SortMenuData(val menu: SortOrder, @DrawableRes val iconResId: Int, @StringRes val title: Int) +data class SortMenuData(val menu: SortOrder, @param:DrawableRes val iconResId: Int, @param:StringRes val title: Int) diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpetualGuidePage.kt b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpetualGuidePage.kt index 7be2d36103..0a0099fc67 100644 --- a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpetualGuidePage.kt +++ b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpetualGuidePage.kt @@ -79,7 +79,7 @@ data class ScenarioData( data class GuideRowData( val label: String, val value: String, - @DrawableRes val iconRes: Int? = null, + @param:DrawableRes val iconRes: Int? = null, ) data class AdjusterConfig( diff --git a/app/src/main/java/one/mixin/android/ui/landing/LandingFeatureItem.kt b/app/src/main/java/one/mixin/android/ui/landing/LandingFeatureItem.kt index 51d38c0454..daef710f87 100644 --- a/app/src/main/java/one/mixin/android/ui/landing/LandingFeatureItem.kt +++ b/app/src/main/java/one/mixin/android/ui/landing/LandingFeatureItem.kt @@ -3,7 +3,7 @@ package one.mixin.android.ui.landing import androidx.annotation.DrawableRes data class LandingFeatureItem( - @DrawableRes val imageResId: Int, + @param:DrawableRes val imageResId: Int, val title: String, val description: String, ) diff --git a/app/src/main/java/one/mixin/android/ui/transfer/TransferClient.kt b/app/src/main/java/one/mixin/android/ui/transfer/TransferClient.kt index 5e8f8151a8..592fb225e0 100644 --- a/app/src/main/java/one/mixin/android/ui/transfer/TransferClient.kt +++ b/app/src/main/java/one/mixin/android/ui/transfer/TransferClient.kt @@ -120,7 +120,7 @@ class TransferClient val ftsDatabase: FtsDatabase, val status: TransferStatusLiveData, private val serializationJson: Json, - @ApplicationScope + @param:ApplicationScope private val applicationScope: CoroutineScope, private val jobManager: MixinJobManager, ) { diff --git a/app/src/main/java/one/mixin/android/ui/wallet/SortMenuData.kt b/app/src/main/java/one/mixin/android/ui/wallet/SortMenuData.kt index 6248dbfa7d..aa645c045a 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/SortMenuData.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/SortMenuData.kt @@ -3,4 +3,4 @@ package one.mixin.android.ui.wallet import androidx.annotation.DrawableRes import androidx.annotation.StringRes -data class TypeMenuData(val menu: SnapshotType, @DrawableRes val iconResId: Int?, @StringRes val title: Int) +data class TypeMenuData(val menu: SnapshotType, @param:DrawableRes val iconResId: Int?, @param:StringRes val title: Int) diff --git a/app/src/main/java/one/mixin/android/ui/wallet/Web3TypeMenuData.kt b/app/src/main/java/one/mixin/android/ui/wallet/Web3TypeMenuData.kt index 7c64f44c10..a28a14bc86 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/Web3TypeMenuData.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/Web3TypeMenuData.kt @@ -3,4 +3,4 @@ package one.mixin.android.ui.wallet import androidx.annotation.DrawableRes import androidx.annotation.StringRes -data class Web3TypeMenuData(val menu: Web3TokenFilterType, @DrawableRes val iconResId: Int?, @StringRes val title: Int) \ No newline at end of file +data class Web3TypeMenuData(val menu: Web3TokenFilterType, @param:DrawableRes val iconResId: Int?, @param:StringRes val title: Int) \ No newline at end of file From 9ae386737a3ad6aeb791a9ca596aacb45330eeae Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 12:32:06 +0800 Subject: [PATCH 13/21] chore: simplify always-true/false conditions --- .../android/job/AttachmentDownloadJob.kt | 4 +-- .../mixin/android/job/RefreshAddressJob.kt | 2 +- .../job/TranscriptAttachmentDownloadJob.kt | 4 +-- .../link/LinkBottomSheetDialogFragment.kt | 26 ++++++++----------- .../conversation/location/LocationActivity.kt | 6 ++--- .../WalletConnectBottomSheetDialogFragment.kt | 4 --- .../ui/wallet/Web3HiddenAssetsFragment.kt | 5 ---- .../ui/wallet/fiatmoney/CalculateFragment.kt | 6 +---- .../android/vo/ChatHistoryMessageItem.kt | 5 ++-- 9 files changed, 21 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/one/mixin/android/job/AttachmentDownloadJob.kt b/app/src/main/java/one/mixin/android/job/AttachmentDownloadJob.kt index f81faeaa10..9d17c98e26 100644 --- a/app/src/main/java/one/mixin/android/job/AttachmentDownloadJob.kt +++ b/app/src/main/java/one/mixin/android/job/AttachmentDownloadJob.kt @@ -191,9 +191,9 @@ class AttachmentDownloadJob( attachmentProcess.remove(message.messageId) destination.delete() return true - } else if (response.isSuccessful && !isCancelled && response.body != null) { + } else if (response.isSuccessful && !isCancelled) { val sink = destination.sink().buffer() - sink.writeAll(response.body!!.source()) + sink.writeAll(response.body.source()) sink.close() if (message.category.endsWith("_IMAGE")) { val attachmentCipherInputStream = diff --git a/app/src/main/java/one/mixin/android/job/RefreshAddressJob.kt b/app/src/main/java/one/mixin/android/job/RefreshAddressJob.kt index 3b6b06cd33..e50e992333 100644 --- a/app/src/main/java/one/mixin/android/job/RefreshAddressJob.kt +++ b/app/src/main/java/one/mixin/android/job/RefreshAddressJob.kt @@ -14,7 +14,7 @@ class RefreshAddressJob(private val chainId: String) : BaseJob( override fun onRun() = runBlocking { val response = tokenService.addresses(chainId) - if (response != null && response.isSuccess && response.data != null) { + if (response.isSuccess && response.data != null) { response.data?.let { addressDao.insertList(it) } diff --git a/app/src/main/java/one/mixin/android/job/TranscriptAttachmentDownloadJob.kt b/app/src/main/java/one/mixin/android/job/TranscriptAttachmentDownloadJob.kt index dbb2f1dff5..f565922578 100644 --- a/app/src/main/java/one/mixin/android/job/TranscriptAttachmentDownloadJob.kt +++ b/app/src/main/java/one/mixin/android/job/TranscriptAttachmentDownloadJob.kt @@ -160,9 +160,9 @@ class TranscriptAttachmentDownloadJob( if (response.code == 404) { destination.delete() return true - } else if (response.isSuccessful && !isCancelled && response.body != null) { + } else if (response.isSuccessful && !isCancelled) { val sink = destination.sink().buffer() - sink.writeAll(response.body!!.source()) + sink.writeAll(response.body.source()) sink.close() when { transcriptMessage.type.endsWith("_IMAGE") -> { diff --git a/app/src/main/java/one/mixin/android/ui/conversation/link/LinkBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/conversation/link/LinkBottomSheetDialogFragment.kt index 3becd50957..064373dcb7 100644 --- a/app/src/main/java/one/mixin/android/ui/conversation/link/LinkBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/conversation/link/LinkBottomSheetDialogFragment.kt @@ -764,21 +764,17 @@ class LinkBottomSheetDialogFragment : SchemeBottomSheet() { } else if (address == null) { showError(R.string.error_address_not_sync) } else { - if (asset != null) { - TransferBottomSheetDialogFragment.newInstance( - AddressManageBiometricItem( - asset = asset, - addressId = addressId, - label = address.label, - destination = address.destination, - tag = address.tag, - type = TransferBottomSheetDialogFragment.DELETE, - ), - ).showNow(this@LinkBottomSheetDialogFragment.parentFragmentManager, TransferBottomSheetDialogFragment.TAG) - dismiss() - } else { - showError() - } + TransferBottomSheetDialogFragment.newInstance( + AddressManageBiometricItem( + asset = asset, + addressId = addressId, + label = address.label, + destination = address.destination, + tag = address.tag, + type = TransferBottomSheetDialogFragment.DELETE, + ), + ).showNow(this@LinkBottomSheetDialogFragment.parentFragmentManager, TransferBottomSheetDialogFragment.TAG) + dismiss() } } } else { diff --git a/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt b/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt index 051613a127..a2f4b36a11 100644 --- a/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/conversation/location/LocationActivity.kt @@ -592,10 +592,8 @@ class LocationActivity : BaseActivity(), OnMapReadyCallback { } mixinMapView.addMarker(index, item) - if (south != null && west != null && north != null && east != null) { - val bound = MixinLatLngBounds(MixinLatLng(south, west), MixinLatLng(north, east)) - mixinMapView.moveBounds(bound) - } + val bound = MixinLatLngBounds(MixinLatLng(south, west), MixinLatLng(north, east)) + mixinMapView.moveBounds(bound) } } } diff --git a/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectBottomSheetDialogFragment.kt index 85e6423d2e..b7d80dae8d 100644 --- a/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectBottomSheetDialogFragment.kt @@ -337,10 +337,6 @@ class WalletConnectBottomSheetDialogFragment : MixinComposeBottomSheetDialogFrag val tx = signData.signMessage if (tx !is WCEthereumTransaction) return val assetId = chain.getWeb3ChainId() - if (assetId == null) { - Timber.d("$TAG refreshEstimatedGasAndAsset assetId not support") - return - } tickerFlow(15.seconds) .onEach { diff --git a/app/src/main/java/one/mixin/android/ui/wallet/Web3HiddenAssetsFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/Web3HiddenAssetsFragment.kt index fee2ddbf88..1d06c32024 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/Web3HiddenAssetsFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/Web3HiddenAssetsFragment.kt @@ -17,7 +17,6 @@ import one.mixin.android.db.web3.vo.Web3TokenItem import one.mixin.android.extension.config import one.mixin.android.extension.dp import one.mixin.android.extension.navigate -import one.mixin.android.extension.toast import one.mixin.android.ui.common.BaseFragment import one.mixin.android.ui.common.recyclerview.HeaderAdapter import one.mixin.android.ui.home.web3.Web3ViewModel @@ -143,10 +142,6 @@ class Web3HiddenAssetsFragment : BaseFragment(R.layout.fragment_hidden_assets), override fun onNormalItemClick(item: T) { val token = item as Web3TokenItem lifecycleScope.launch { - if (walletId == null) { - toast(R.string.Data_error) - return@launch - } val address = web3ViewModel.getAddressesByChainId(walletId, token.chainId) view?.navigate( R.id.action_web3_hidden_assets_to_web3_transactions, diff --git a/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/CalculateFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/CalculateFragment.kt index 88d906b25a..27a3b535e4 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/CalculateFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/CalculateFragment.kt @@ -398,10 +398,7 @@ class CalculateFragment : BaseFragment(R.layout.fragment_calculate) { } else { value } - if (amount == null) { - toast(R.string.error_invalid_number) - } else { - viewLifecycleScope.launch inner@{ + viewLifecycleScope.launch inner@{ if (viewDestroyed()) throw IllegalStateException("View has been destroyed") try { val asset = fiatMoneyViewModel.asset ?: throw IllegalStateException("Asset is null") @@ -438,7 +435,6 @@ class CalculateFragment : BaseFragment(R.layout.fragment_calculate) { ErrorHandler.handleError(e) } } - } } } proceedToBuy() diff --git a/app/src/main/java/one/mixin/android/vo/ChatHistoryMessageItem.kt b/app/src/main/java/one/mixin/android/vo/ChatHistoryMessageItem.kt index a877f31262..56ddf901e8 100644 --- a/app/src/main/java/one/mixin/android/vo/ChatHistoryMessageItem.kt +++ b/app/src/main/java/one/mixin/android/vo/ChatHistoryMessageItem.kt @@ -220,11 +220,10 @@ fun ChatHistoryMessageItem.absolutePath(context: Context = MixinApplication.appC else -> null } } - val url = mediaUrl + val url = mediaUrl ?: return null return when { - url == null || mediaUrl == null -> null isLive() -> url - mediaUrl.isFileUri() && File(mediaUrl).exists() -> url + url.isFileUri() && File(url).exists() -> url else -> File(context.getTranscriptDirPath(), url).toUri().toString() } } From 16b4c1fcf0898008549d5d704a344fd79a11e8d5 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 12:40:31 +0800 Subject: [PATCH 14/21] chore: clean up assorted warnings and suppress misleading ones --- .../java/one/mixin/android/ui/conversation/holder/AppCard.kt | 2 ++ .../java/one/mixin/android/ui/group/InviteQrBottomFragment.kt | 2 +- .../one/mixin/android/ui/tip/wc/sessionproposal/WCPinBoard.kt | 1 + .../java/one/mixin/android/ui/wallet/DepositQrBottomFragment.kt | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/one/mixin/android/ui/conversation/holder/AppCard.kt b/app/src/main/java/one/mixin/android/ui/conversation/holder/AppCard.kt index 4f0c2a5235..bab65aba99 100644 --- a/app/src/main/java/one/mixin/android/ui/conversation/holder/AppCard.kt +++ b/app/src/main/java/one/mixin/android/ui/conversation/holder/AppCard.kt @@ -1,3 +1,5 @@ +@file:Suppress("SENSELESS_COMPARISON", "UNNECESSARY_NOT_NULL_ASSERTION") + package one.mixin.android.ui.conversation.holder import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/app/src/main/java/one/mixin/android/ui/group/InviteQrBottomFragment.kt b/app/src/main/java/one/mixin/android/ui/group/InviteQrBottomFragment.kt index 3a63aa7000..02d5b0cbd7 100644 --- a/app/src/main/java/one/mixin/android/ui/group/InviteQrBottomFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/group/InviteQrBottomFragment.kt @@ -110,7 +110,7 @@ class InviteQrBottomFragment : MixinBottomSheetDialogFragment() { ) } qr.doOnPreDraw { - Observable.create?> { e -> + Observable.create> { e -> url?.generateQRCode(qr.width)?.let { e.onNext(it) } diff --git a/app/src/main/java/one/mixin/android/ui/tip/wc/sessionproposal/WCPinBoard.kt b/app/src/main/java/one/mixin/android/ui/tip/wc/sessionproposal/WCPinBoard.kt index d8f7bd3abb..b9b5cd4b5b 100644 --- a/app/src/main/java/one/mixin/android/ui/tip/wc/sessionproposal/WCPinBoard.kt +++ b/app/src/main/java/one/mixin/android/ui/tip/wc/sessionproposal/WCPinBoard.kt @@ -1,4 +1,5 @@ @file:OptIn(ExperimentalAnimationApi::class) +@file:Suppress("DEPRECATION") package one.mixin.android.ui.tip.wc.sessionproposal diff --git a/app/src/main/java/one/mixin/android/ui/wallet/DepositQrBottomFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/DepositQrBottomFragment.kt index 46284df9bb..298060e84e 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/DepositQrBottomFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/DepositQrBottomFragment.kt @@ -122,7 +122,7 @@ class DepositQrBottomFragment : MixinBottomSheetDialogFragment() { } qr.doOnPreDraw { - Observable.create?> { e -> + Observable.create> { e -> val code = when (type) { TYPE_TAG -> depositEntry.tag From b70223fece3781a10f8fd1b1db1e40b95570ca88 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 12:47:53 +0800 Subject: [PATCH 15/21] fix(forward): correct duplicate ShareCategory branch and clean redundant null checks --- .../mixin/android/extension/TextExtension.kt | 2 +- .../one/mixin/android/job/SendMessageJob.kt | 2 +- .../common/OutputBottomSheetDialogFragment.kt | 19 ++++++++----------- .../android/ui/forward/ForwardFragment.kt | 4 ++-- .../PerpsCloseBottomSheetDialogFragment.kt | 4 ++-- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/one/mixin/android/extension/TextExtension.kt b/app/src/main/java/one/mixin/android/extension/TextExtension.kt index e49304e289..801569d3fe 100644 --- a/app/src/main/java/one/mixin/android/extension/TextExtension.kt +++ b/app/src/main/java/one/mixin/android/extension/TextExtension.kt @@ -9,7 +9,7 @@ private val urlPatter: Pattern by lazy { Pattern.compile("[a-zA-z]+://[^\\s]*") fun String.endAt(): String? { val matcher = endAtPatter.matcher(this) return when { - matcher.find() -> matcher.group(matcher.groupCount() - 1).substring(1) + matcher.find() -> matcher.group(matcher.groupCount() - 1)?.substring(1) endsWith("@") -> "" else -> null } diff --git a/app/src/main/java/one/mixin/android/job/SendMessageJob.kt b/app/src/main/java/one/mixin/android/job/SendMessageJob.kt index 5dbaafb16c..020634c09b 100644 --- a/app/src/main/java/one/mixin/android/job/SendMessageJob.kt +++ b/app/src/main/java/one/mixin/android/job/SendMessageJob.kt @@ -275,7 +275,7 @@ open class SendMessageJob( encryptedProtocol.encryptMessage( keyPair, plaintext, - participantSessionKey.publicKey!!.base64RawURLDecode(), + participantSessionKey.publicKey.base64RawURLDecode(), participantSessionKey.sessionId, extensionSessionKey?.publicKey?.base64RawURLDecode(), extensionSessionKey?.sessionId, diff --git a/app/src/main/java/one/mixin/android/ui/common/OutputBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/common/OutputBottomSheetDialogFragment.kt index d09eddb97f..9c92d0c0f5 100644 --- a/app/src/main/java/one/mixin/android/ui/common/OutputBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/common/OutputBottomSheetDialogFragment.kt @@ -248,14 +248,13 @@ class OutputBottomSheetDialogFragment : ValuableBiometricBottomSheetDialogFragme bottomViewModel.insertSnapshot(data) } - t.traceId?.let { traceId -> - lifecycleScope.launch { - val trace = bottomViewModel.suspendFindTraceById(traceId) - if (trace != null) { - if (data is SafeSnapshot) { - trace.snapshotId = data.snapshotId - bottomViewModel.insertTrace(trace) - } + val traceId = t.traceId + lifecycleScope.launch { + val trace = bottomViewModel.suspendFindTraceById(traceId) + if (trace != null) { + if (data is SafeSnapshot) { + trace.snapshotId = data.snapshotId + bottomViewModel.insertTrace(trace) } } } @@ -278,9 +277,7 @@ class OutputBottomSheetDialogFragment : ValuableBiometricBottomSheetDialogFragme BLOCKCHAIN_ERROR, ) ) { - t.traceId?.let { traceId -> - bottomViewModel.suspendDeleteTraceById(traceId) - } + bottomViewModel.suspendDeleteTraceById(t.traceId) if (errorCode == INSUFFICIENT_TRANSACTION_FEE && t is WithdrawBiometricItem) { val item = t as WithdrawBiometricItem diff --git a/app/src/main/java/one/mixin/android/ui/forward/ForwardFragment.kt b/app/src/main/java/one/mixin/android/ui/forward/ForwardFragment.kt index d55387bb49..00a0352398 100644 --- a/app/src/main/java/one/mixin/android/ui/forward/ForwardFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/forward/ForwardFragment.kt @@ -472,7 +472,7 @@ class ForwardFragment : BaseFragment(R.layout.fragment_forward) { if (errorRes != null) { withContext(Dispatchers.Main) { errorString = requireContext().getString(errorRes) - toast(errorString!!) + toast(errorString) } } }, @@ -482,7 +482,7 @@ class ForwardFragment : BaseFragment(R.layout.fragment_forward) { val contactData = GsonHelper.customGson.fromJson(content, ContactMessagePayload::class.java) ?: return@checkData chatViewModel.sendContactMessage(conversationId, sender, contactData.userId, encryptCategory) } - ShareCategory.Contact -> { + ShareCategory.Post -> { chatViewModel.sendPostMessage(conversationId, sender, content, encryptCategory) } ShareCategory.AppCard -> { diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsCloseBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsCloseBottomSheetDialogFragment.kt index db290a381f..fa159cb052 100644 --- a/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsCloseBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsCloseBottomSheetDialogFragment.kt @@ -202,8 +202,8 @@ class PerpsCloseBottomSheetDialogFragment : MixinComposeBottomSheetDialogFragmen viewModel.loadPositionDetail( positionId = positionId, onSuccess = { position -> - latestMarkPrice = position.markPrice ?: "0" - latestUnrealizedPnl = position.unrealizedPnl ?: "0" + latestMarkPrice = position.markPrice + latestUnrealizedPnl = position.unrealizedPnl lifecycleScope.launch { viewModel.getMarketFromDb(position.marketId)?.let { market -> From cc1c36cc774d99eb061fdb3eb88047601f5b62b3 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 12:55:38 +0800 Subject: [PATCH 16/21] chore: remove redundant null checks, safe calls and when else branches --- app/src/main/java/one/mixin/android/pay/Lighting.kt | 5 +++-- app/src/main/java/one/mixin/android/tip/wc/WalletConnect.kt | 2 +- .../java/one/mixin/android/ui/forward/ForwardFragment.kt | 3 --- .../java/one/mixin/android/ui/transfer/TransferActivity.kt | 6 ++---- .../java/one/mixin/android/ui/wallet/IdentityFragment.kt | 2 -- .../one/mixin/android/ui/wallet/TransactionsFragment.kt | 2 +- .../mixin/android/ui/wallet/ViewWalletAddressFragment.kt | 2 +- .../main/java/one/mixin/android/ui/wallet/WalletActivity.kt | 4 ---- .../ui/wallet/Web3TokenFilterBottomSheetDialogFragment.kt | 1 - 9 files changed, 8 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/one/mixin/android/pay/Lighting.kt b/app/src/main/java/one/mixin/android/pay/Lighting.kt index ba6b98d6cd..10bd6de62f 100644 --- a/app/src/main/java/one/mixin/android/pay/Lighting.kt +++ b/app/src/main/java/one/mixin/android/pay/Lighting.kt @@ -13,8 +13,9 @@ internal suspend fun parseLightning( parseLighting: suspend (String) -> PaymentResponse? ): ExternalTransfer? { val r = parseLighting(url) ?: return null - val assetId = r.asset?.assetId ?:return null - val chainId = r.asset?.chainId ?:return null + val asset = r.asset ?: return null + val assetId = asset.assetId + val chainId = asset.chainId val destination = r.destination ?: return null val addressResponse = validateAddress(assetId, chainId, destination) ?: return null diff --git a/app/src/main/java/one/mixin/android/tip/wc/WalletConnect.kt b/app/src/main/java/one/mixin/android/tip/wc/WalletConnect.kt index 3d4aa87a8d..fca963f3fa 100644 --- a/app/src/main/java/one/mixin/android/tip/wc/WalletConnect.kt +++ b/app/src/main/java/one/mixin/android/tip/wc/WalletConnect.kt @@ -33,7 +33,7 @@ abstract class WalletConnect { fun isPaymentLink(url: String): Boolean = try { - url.toUri()?.host == "pay.walletconnect.com" && WalletKit.Pay.isPaymentLink(url) + url.toUri().host == "pay.walletconnect.com" && WalletKit.Pay.isPaymentLink(url) } catch (e: Exception) { false } diff --git a/app/src/main/java/one/mixin/android/ui/forward/ForwardFragment.kt b/app/src/main/java/one/mixin/android/ui/forward/ForwardFragment.kt index 00a0352398..5f2bf7bf20 100644 --- a/app/src/main/java/one/mixin/android/ui/forward/ForwardFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/forward/ForwardFragment.kt @@ -482,9 +482,6 @@ class ForwardFragment : BaseFragment(R.layout.fragment_forward) { val contactData = GsonHelper.customGson.fromJson(content, ContactMessagePayload::class.java) ?: return@checkData chatViewModel.sendContactMessage(conversationId, sender, contactData.userId, encryptCategory) } - ShareCategory.Post -> { - chatViewModel.sendPostMessage(conversationId, sender, content, encryptCategory) - } ShareCategory.AppCard -> { chatViewModel.sendAppCardMessage(conversationId, sender, content) } diff --git a/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt b/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt index 12ec921bde..9b9fb54218 100644 --- a/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/transfer/TransferActivity.kt @@ -600,10 +600,8 @@ class TransferActivity : BaseActivity() { override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) - intent?.let { - it.getParcelableExtraCompat(ARGS_COMMAND, TransferCommand::class.java)?.apply { - handleCommand(this) - } + intent.getParcelableExtraCompat(ARGS_COMMAND, TransferCommand::class.java)?.apply { + handleCommand(this) } } diff --git a/app/src/main/java/one/mixin/android/ui/wallet/IdentityFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/IdentityFragment.kt index 010c9d3297..68d26fda40 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/IdentityFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/IdentityFragment.kt @@ -183,7 +183,6 @@ class IdentityFragment : BaseFragment(R.layout.fragment_identity) { is SNSSDKState.FinallyRejected -> Timber.e("Applicant has been finally rejected") is SNSSDKState.TemporarilyDeclined -> Timber.e("Applicant has been declined temporarily") is SNSSDKState.Approved -> Timber.e("Applicant has been approved") - else -> Timber.e("Unknown") } } @@ -201,7 +200,6 @@ class IdentityFragment : BaseFragment(R.layout.fragment_identity) { when (result) { is SNSCompletionResult.SuccessTermination -> Timber.e("The SDK finished successfully") is SNSCompletionResult.AbnormalTermination -> Timber.e(result.exception, "The SDK got closed because of errors") - else -> Timber.e("Unknown") } } diff --git a/app/src/main/java/one/mixin/android/ui/wallet/TransactionsFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/TransactionsFragment.kt index 8c9ebbc36f..1b80d10d98 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/TransactionsFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/TransactionsFragment.kt @@ -255,7 +255,7 @@ class TransactionsFragment : BaseFragment(R.layout.fragment_transactions), OnSna lifecycleScope.launch(Dispatchers.IO) { snapshotItems = list.map { if (!it.withdrawal?.receiver.isNullOrBlank()) { - val receiver = it.withdrawal!!.receiver + val receiver = it.withdrawal.receiver val index: Int = receiver.indexOf(":") if (index == -1) { it.label = walletViewModel.findAddressByReceiver(receiver, "", asset.chainId) diff --git a/app/src/main/java/one/mixin/android/ui/wallet/ViewWalletAddressFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/ViewWalletAddressFragment.kt index 9b581755a6..a2188fddb1 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/ViewWalletAddressFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/ViewWalletAddressFragment.kt @@ -229,7 +229,7 @@ private fun AddressItem( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Start ) { - chains!!.forEachIndexed { index, iconRes -> + chains.forEachIndexed { index, iconRes -> Image( painter = painterResource(id = iconRes), contentDescription = null, diff --git a/app/src/main/java/one/mixin/android/ui/wallet/WalletActivity.kt b/app/src/main/java/one/mixin/android/ui/wallet/WalletActivity.kt index 725d1ab2d2..c4e02f71aa 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/WalletActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/WalletActivity.kt @@ -192,10 +192,6 @@ class WalletActivity : BlazeBaseActivity() { putParcelable(InputFragment.ARGS_BIOMETRIC_ITEM, biometricItem) }) } - else -> { - // Handle any other unexpected destination types - throw IllegalArgumentException("Unknown destination type: $destination") - } } } diff --git a/app/src/main/java/one/mixin/android/ui/wallet/Web3TokenFilterBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/Web3TokenFilterBottomSheetDialogFragment.kt index 171b565628..336fb72a17 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/Web3TokenFilterBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/Web3TokenFilterBottomSheetDialogFragment.kt @@ -66,7 +66,6 @@ class Web3TokenFilterBottomSheetDialogFragment : MixinBottomSheetDialogFragment( Web3TokenFilterType.SWAP -> binding.receiveIv.visibility = View.VISIBLE Web3TokenFilterType.APPROVAL -> binding.receiveIv.visibility = View.VISIBLE Web3TokenFilterType.PENDING -> binding.receiveIv.visibility = View.VISIBLE - else -> {} } } From 4de2adc4d98de7d81b373c8a30a2e30b36138dfb Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 13:01:52 +0800 Subject: [PATCH 17/21] chore: remove redundant null safety and exhaustive when else --- app/src/main/java/one/mixin/android/extension/Dimesions.kt | 2 +- app/src/main/java/one/mixin/android/extension/LogExtension.kt | 2 +- .../ui/common/UtxoConsolidationBottomSheetDialogFragment.kt | 4 +--- .../java/one/mixin/android/ui/home/web3/trade/CandleChart.kt | 2 +- .../java/one/mixin/android/ui/home/web3/trade/TradePage.kt | 2 +- .../main/java/one/mixin/android/ui/landing/RestoreFragment.kt | 2 +- .../android/ui/landing/components/MnemonicPhraseInput.kt | 1 - .../one/mixin/android/ui/setting/SettingStorageViewModel.kt | 2 +- .../android/ui/setting/ui/components/MembershipPlanCard.kt | 2 +- .../android/ui/setting/ui/page/MixinMemberNotificationPage.kt | 2 +- .../android/ui/setting/ui/page/MixinMemberUpgradePage.kt | 2 +- 11 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/one/mixin/android/extension/Dimesions.kt b/app/src/main/java/one/mixin/android/extension/Dimesions.kt index 21833e431f..48c1c3a9d6 100644 --- a/app/src/main/java/one/mixin/android/extension/Dimesions.kt +++ b/app/src/main/java/one/mixin/android/extension/Dimesions.kt @@ -12,6 +12,6 @@ val Int.sp: Int val Float.dp: Int get() = MixinApplication.appContext.dpToPx(this) val Float.composeDp: Dp - get() = Dp(this.toFloat()) + get() = Dp(this) val Float.sp: Int get() = MixinApplication.appContext.spToPx(this) diff --git a/app/src/main/java/one/mixin/android/extension/LogExtension.kt b/app/src/main/java/one/mixin/android/extension/LogExtension.kt index 3be4d65920..bce2896642 100644 --- a/app/src/main/java/one/mixin/android/extension/LogExtension.kt +++ b/app/src/main/java/one/mixin/android/extension/LogExtension.kt @@ -2,4 +2,4 @@ package one.mixin.android.extension import android.util.Log -inline fun Throwable.getStackTraceString(): String = Log.getStackTraceString(this) +fun Throwable.getStackTraceString(): String = Log.getStackTraceString(this) diff --git a/app/src/main/java/one/mixin/android/ui/common/UtxoConsolidationBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/common/UtxoConsolidationBottomSheetDialogFragment.kt index 59f4a20f3a..6b1c8fd4b9 100644 --- a/app/src/main/java/one/mixin/android/ui/common/UtxoConsolidationBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/common/UtxoConsolidationBottomSheetDialogFragment.kt @@ -121,9 +121,7 @@ class UtxoConsolidationBottomSheetDialogFragment : ValuableBiometricBottomSheetD BLOCKCHAIN_ERROR, ) ) { - t.traceId?.let { traceId -> - bottomViewModel.suspendDeleteTraceById(traceId) - } + bottomViewModel.suspendDeleteTraceById(t.traceId) } return null } diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/trade/CandleChart.kt b/app/src/main/java/one/mixin/android/ui/home/web3/trade/CandleChart.kt index f909bff625..a1694bf660 100644 --- a/app/src/main/java/one/mixin/android/ui/home/web3/trade/CandleChart.kt +++ b/app/src/main/java/one/mixin/android/ui/home/web3/trade/CandleChart.kt @@ -501,7 +501,7 @@ private fun ScrollableCandleChart( contentAlignment = Alignment.CenterEnd ) { Text( - text = marketPriceText ?: currentPrice?.toPlainString() ?: "", + text = marketPriceText ?: currentPrice.toPlainString(), fontSize = 10.sp, color = MixinAppTheme.colors.textPrimary, textAlign = TextAlign.End, diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/trade/TradePage.kt b/app/src/main/java/one/mixin/android/ui/home/web3/trade/TradePage.kt index cf3e7f654c..2b25ad91d2 100644 --- a/app/src/main/java/one/mixin/android/ui/home/web3/trade/TradePage.kt +++ b/app/src/main/java/one/mixin/android/ui/home/web3/trade/TradePage.kt @@ -201,7 +201,7 @@ fun TradePage( perpetualTabIndex = tabs.size tabs += TabItem(title = stringResource(R.string.Perpetual)) { PerpetualContent( - onShowTradingGuide = { onShowTradingGuide(perpetualTabIndex ?: 0) }, + onShowTradingGuide = { onShowTradingGuide(perpetualTabIndex) }, onShowMarketList = onShowMarketList, onShowAllMarkets = onShowAllMarkets, onShowAllOpenPositions = onShowAllOpenPositions, diff --git a/app/src/main/java/one/mixin/android/ui/landing/RestoreFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/RestoreFragment.kt index 23691d79e5..40b40b71c5 100644 --- a/app/src/main/java/one/mixin/android/ui/landing/RestoreFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/landing/RestoreFragment.kt @@ -151,7 +151,7 @@ class RestoreFragment : BaseFragment(R.layout.fragment_restore) { if (c.moveToFirst()) { count = c.getIntOrNull(0) ?: 0 } - c?.close() + c.close() c = db.rawQuery("SELECT created_at FROM messages ORDER BY created_at DESC LIMIT 1", null) var lastCreatedAt: String? = null diff --git a/app/src/main/java/one/mixin/android/ui/landing/components/MnemonicPhraseInput.kt b/app/src/main/java/one/mixin/android/ui/landing/components/MnemonicPhraseInput.kt index e92fcefbcd..a261da8ad3 100644 --- a/app/src/main/java/one/mixin/android/ui/landing/components/MnemonicPhraseInput.kt +++ b/app/src/main/java/one/mixin/android/ui/landing/components/MnemonicPhraseInput.kt @@ -482,7 +482,6 @@ fun MnemonicPhraseInput( (legacy && words.size == 12 && isMnemonicValid(words)) MnemonicState.Verify -> mnemonicList == words - else -> false } if (!valid) { errorInfo = invalidMnemonicPhrase diff --git a/app/src/main/java/one/mixin/android/ui/setting/SettingStorageViewModel.kt b/app/src/main/java/one/mixin/android/ui/setting/SettingStorageViewModel.kt index 7df03f5385..cc5729a7bf 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/SettingStorageViewModel.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/SettingStorageViewModel.kt @@ -168,7 +168,7 @@ class SettingStorageViewModel return } conversationRepository.getMediaByConversationIdAndCategory(conversationId, signalCategory, plainCategory, encryptedCategory) - ?.let { list -> + .let { list -> viewModelScope.launch(SINGLE_DB_THREAD) { cleanMessageHelper.deleteMessageMinimals(conversationId, list) } diff --git a/app/src/main/java/one/mixin/android/ui/setting/ui/components/MembershipPlanCard.kt b/app/src/main/java/one/mixin/android/ui/setting/ui/components/MembershipPlanCard.kt index e745aa1a80..8954ea9aed 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/ui/components/MembershipPlanCard.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/ui/components/MembershipPlanCard.kt @@ -85,7 +85,7 @@ fun MembershipPlanCard( Text( text = stringResource( R.string.expires_on, - membership.expiredAt.substringBefore("T") ?: "Unknown" + membership.expiredAt.substringBefore("T") ), color = if (isExpired) MixinAppTheme.colors.walletRed else MixinAppTheme.colors.textMinor, fontSize = 12.sp, diff --git a/app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberNotificationPage.kt b/app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberNotificationPage.kt index 6702bc31cc..2a2696bb4c 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberNotificationPage.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberNotificationPage.kt @@ -37,7 +37,7 @@ fun MixinMemberNotificationPage( onClose: () -> Unit, ) { val viewModel: MemberViewModel = hiltViewModel() - val order = viewModel.getOrdersFlow("f54a28b3-934a-4128-b6da-4b7323204b8c").collectAsState(null)?.value ?: return + val order = viewModel.getOrdersFlow("f54a28b3-934a-4128-b6da-4b7323204b8c").collectAsState(null).value ?: return MixinAppTheme { Box( diff --git a/app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberUpgradePage.kt b/app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberUpgradePage.kt index 68c7d76c37..0fe0395d17 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberUpgradePage.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberUpgradePage.kt @@ -209,7 +209,7 @@ fun MixinMemberUpgradePage( if (isGooglePlayChannel) { plan.playStoreSubscriptionId?.let { playStoreId -> - onGooglePlay(orderResponse.data!!.orderId!!, playStoreId) + onGooglePlay(orderResponse.data!!.orderId, playStoreId) } } else { onUrlGenerated(orderResponse.data!!.paymentUrl!!) From e534e7e1463c031c1754c3d6506e6ec46ef3d324 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 13:07:27 +0800 Subject: [PATCH 18/21] chore: remove redundant conversions and unnecessary null safety --- .../java/one/mixin/android/ui/common/BottomSheetViewModel.kt | 2 +- .../java/one/mixin/android/ui/transfer/TransferInserter.kt | 2 +- .../ui/wallet/TransferContactBottomSheetDialogFragment.kt | 2 +- .../one/mixin/android/ui/wallet/adapter/SnapshotAdapter.kt | 4 ++-- .../transfer/TransferInvoiceBottomSheetDialogFragment.kt | 2 +- app/src/main/java/one/mixin/android/util/TextLoader.kt | 2 +- .../main/java/one/mixin/android/util/database/DatabaseUtil.kt | 4 ++-- app/src/main/java/one/mixin/android/vo/SnapshotItem.kt | 2 +- app/src/main/java/one/mixin/android/vo/TranscriptMessage.kt | 2 +- app/src/main/java/one/mixin/android/widget/AvatarsView.kt | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/one/mixin/android/ui/common/BottomSheetViewModel.kt b/app/src/main/java/one/mixin/android/ui/common/BottomSheetViewModel.kt index 4ca2568de3..4991f80125 100644 --- a/app/src/main/java/one/mixin/android/ui/common/BottomSheetViewModel.kt +++ b/app/src/main/java/one/mixin/android/ui/common/BottomSheetViewModel.kt @@ -950,7 +950,7 @@ class BottomSheetViewModel ghostKeyResponse.data!! } else { throw IllegalArgumentException("Transfer has no recipient") - } ?: throw IllegalArgumentException("Transfer has no recipient") + } Timber.e("Kernel Invoice Transaction UtxoWrapper: $amount $assetId $asset") val utxoWrapper = UtxoWrapper(packUtxo(asset, amount, null)) val input = utxoWrapper.input diff --git a/app/src/main/java/one/mixin/android/ui/transfer/TransferInserter.kt b/app/src/main/java/one/mixin/android/ui/transfer/TransferInserter.kt index 99cccf0b98..1c3a88bf34 100644 --- a/app/src/main/java/one/mixin/android/ui/transfer/TransferInserter.kt +++ b/app/src/main/java/one/mixin/android/ui/transfer/TransferInserter.kt @@ -696,7 +696,7 @@ class TransferInserter(val db: MixinDatabase) { if (safeSnapshot.confirmations == null) { stmt.bindNull(11) } else { - stmt.bindLong(11, safeSnapshot.confirmations.toLong()) + stmt.bindLong(11, safeSnapshot.confirmations) } if (safeSnapshot.openingBalance == null) { stmt.bindNull(12) diff --git a/app/src/main/java/one/mixin/android/ui/wallet/TransferContactBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/TransferContactBottomSheetDialogFragment.kt index b985657db3..82e102c10f 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/TransferContactBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/TransferContactBottomSheetDialogFragment.kt @@ -99,7 +99,7 @@ class TransferContactBottomSheetDialogFragment : MixinBottomSheetDialogFragment( } private fun filter(s: String) { - keyWord = s.toString() + keyWord = s adapter.filter = keyWord userCallback.filter = keyWord } diff --git a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SnapshotAdapter.kt b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SnapshotAdapter.kt index a12b8d4d3d..1ba44d0320 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/adapter/SnapshotAdapter.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/adapter/SnapshotAdapter.kt @@ -29,7 +29,7 @@ class SnapshotAdapter : RecyclerView.Adapter(), override fun getHeaderId(pos: Int): Long { val snapshot = getItem(pos) - return abs(snapshot.createdAt.hashForDate() ?: -1) + return abs(snapshot.createdAt.hashForDate()) } override fun onCreateHeaderViewHolder(parent: ViewGroup) = @@ -43,7 +43,7 @@ class SnapshotAdapter : RecyclerView.Adapter(), vh: SnapshotHeaderViewHolder, pos: Int, ) { - val time = getItem(pos).createdAt ?: return + val time = getItem(pos).createdAt vh.bind(time) } diff --git a/app/src/main/java/one/mixin/android/ui/wallet/transfer/TransferInvoiceBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/transfer/TransferInvoiceBottomSheetDialogFragment.kt index 5dd8fcbf0e..163ab26fc0 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/transfer/TransferInvoiceBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/transfer/TransferInvoiceBottomSheetDialogFragment.kt @@ -67,7 +67,7 @@ class TransferInvoiceBottomSheetDialogFragment : MixinBottomSheetDialogFragment( const val TAG = "TransferInvoiceBottomSheetDialogFragment" const val ARGS_TRANSFER = "args_transfer" - inline fun newInstance(t: String) = + fun newInstance(t: String) = TransferInvoiceBottomSheetDialogFragment().withArgs { putString(ARGS_TRANSFER, t) } diff --git a/app/src/main/java/one/mixin/android/util/TextLoader.kt b/app/src/main/java/one/mixin/android/util/TextLoader.kt index e2b4c0587c..a509bc7965 100644 --- a/app/src/main/java/one/mixin/android/util/TextLoader.kt +++ b/app/src/main/java/one/mixin/android/util/TextLoader.kt @@ -52,7 +52,7 @@ class TextLoader(context: Context) { val request = Request.Builder().url(url).build() val response = okHttpClient.newCall(request).execute() if (response.isSuccessful) { - response.body?.string()?.stripInvisibleCharacters() + response.body.string().stripInvisibleCharacters() } else { null } diff --git a/app/src/main/java/one/mixin/android/util/database/DatabaseUtil.kt b/app/src/main/java/one/mixin/android/util/database/DatabaseUtil.kt index 65e77bc639..627e5f6329 100644 --- a/app/src/main/java/one/mixin/android/util/database/DatabaseUtil.kt +++ b/app/src/main/java/one/mixin/android/util/database/DatabaseUtil.kt @@ -158,7 +158,7 @@ fun moveLegacyDatabaseFile(context: Context, account: Account): Boolean { } val dir = dbDir(context, account.identityNumber) if (!dir.exists()) dir.mkdirs() - c?.close() + c.close() c = null db?.close() db = null @@ -215,7 +215,7 @@ fun moveLegacyPendingDatabaseFile(context: Context, account: Account) { if (!targetDir.exists()) { targetDir.mkdirs() } - c?.close() + c.close() c = null db?.close() db = null diff --git a/app/src/main/java/one/mixin/android/vo/SnapshotItem.kt b/app/src/main/java/one/mixin/android/vo/SnapshotItem.kt index d7996d72da..57d14c2225 100644 --- a/app/src/main/java/one/mixin/android/vo/SnapshotItem.kt +++ b/app/src/main/java/one/mixin/android/vo/SnapshotItem.kt @@ -143,7 +143,7 @@ data class SnapshotItem( val simulateType = simulateType() return when (simulateType) { SafeSnapshotType.withdrawal -> { - withdrawal?.receiver.isNullOrBlank() || withdrawal?.withdrawalHash.isNullOrBlank() + withdrawal?.receiver.isNullOrBlank() || withdrawal.withdrawalHash.isNullOrBlank() } SafeSnapshotType.deposit -> { diff --git a/app/src/main/java/one/mixin/android/vo/TranscriptMessage.kt b/app/src/main/java/one/mixin/android/vo/TranscriptMessage.kt index 2b47ba7d78..61013866f8 100644 --- a/app/src/main/java/one/mixin/android/vo/TranscriptMessage.kt +++ b/app/src/main/java/one/mixin/android/vo/TranscriptMessage.kt @@ -7,7 +7,7 @@ import androidx.core.net.toUri import androidx.room.ColumnInfo import androidx.room.Entity import com.google.gson.annotations.SerializedName -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize import kotlinx.serialization.SerialName import one.mixin.android.MixinApplication import one.mixin.android.extension.getMediaPath diff --git a/app/src/main/java/one/mixin/android/widget/AvatarsView.kt b/app/src/main/java/one/mixin/android/widget/AvatarsView.kt index d9b7d81f2a..10ae62fba8 100644 --- a/app/src/main/java/one/mixin/android/widget/AvatarsView.kt +++ b/app/src/main/java/one/mixin/android/widget/AvatarsView.kt @@ -164,7 +164,7 @@ class AvatarsView : ViewGroup { private fun getTextView(num: Int) = TextView(context).apply { text = "+$num" - setTextSize(TypedValue.COMPLEX_UNIT_PX, (avatarSize * 0.4f).toFloat()) + setTextSize(TypedValue.COMPLEX_UNIT_PX, avatarSize * 0.4f) setTextColor(resources.getColor(R.color.wallet_pending_text_color, null)) setBackgroundResource(R.drawable.bg_multisigs_gray) gravity = Gravity.CENTER From 7ded36b17f1835171c466edf8137a2acfa903f7e Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Thu, 21 May 2026 13:30:17 +0800 Subject: [PATCH 19/21] fix(warnings): align override parameter names --- .../mixin/android/ui/setting/ChooseFolderContract.kt | 8 ++++---- .../android/vo/route/serializer/SafeBoxSerializer.kt | 4 ++-- .../one/mixin/android/widget/BlurTransformation.kt | 12 ++++++------ .../widget/CoilRoundedHexagonTransformation.kt | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/one/mixin/android/ui/setting/ChooseFolderContract.kt b/app/src/main/java/one/mixin/android/ui/setting/ChooseFolderContract.kt index fcc2f7987c..60969cf991 100644 --- a/app/src/main/java/one/mixin/android/ui/setting/ChooseFolderContract.kt +++ b/app/src/main/java/one/mixin/android/ui/setting/ChooseFolderContract.kt @@ -11,13 +11,13 @@ import androidx.activity.result.contract.ActivityResultContract class ChooseFolderContract : ActivityResultContract() { override fun createIntent( context: Context, - lastBackupDirectory: String?, + input: String?, ): Intent { val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE) if (Build.VERSION.SDK_INT >= 26) { intent.putExtra( DocumentsContract.EXTRA_INITIAL_URI, - lastBackupDirectory, + input, ) } @@ -31,11 +31,11 @@ class ChooseFolderContract : ActivityResultContract() { override fun parseResult( resultCode: Int, - result: Intent?, + intent: Intent?, ): Uri? { if (resultCode != Activity.RESULT_OK) { return null } - return result?.data + return intent?.data } } diff --git a/app/src/main/java/one/mixin/android/vo/route/serializer/SafeBoxSerializer.kt b/app/src/main/java/one/mixin/android/vo/route/serializer/SafeBoxSerializer.kt index a3b50802e2..7011166e9f 100644 --- a/app/src/main/java/one/mixin/android/vo/route/serializer/SafeBoxSerializer.kt +++ b/app/src/main/java/one/mixin/android/vo/route/serializer/SafeBoxSerializer.kt @@ -25,9 +25,9 @@ object SafeBoxSerializer : Serializer { } override suspend fun writeTo( - safeBox: SafeBox, + t: SafeBox, output: OutputStream, ) { - output.write(Json.encodeToString(SafeBox.serializer(), safeBox).encodeToByteArray()) + output.write(Json.encodeToString(SafeBox.serializer(), t).encodeToByteArray()) } } diff --git a/app/src/main/java/one/mixin/android/widget/BlurTransformation.kt b/app/src/main/java/one/mixin/android/widget/BlurTransformation.kt index 9c455aa2c0..fcc9f711dd 100644 --- a/app/src/main/java/one/mixin/android/widget/BlurTransformation.kt +++ b/app/src/main/java/one/mixin/android/widget/BlurTransformation.kt @@ -22,23 +22,23 @@ class BlurTransformation(val context: Context, val radius: Int = 25) : Transform override val cacheKey: String = javaClass.name override suspend fun transform( - toTransform: Bitmap, + input: Bitmap, size: Size, ): Bitmap { - val width = toTransform.width - val height = toTransform.height + val width = input.width + val height = input.height val scaledWidth = width / DEFAULT_DOWN_SAMPLING val scaledHeight = height / DEFAULT_DOWN_SAMPLING - var bitmap = createBitmap(toTransform.width, toTransform.height, Bitmap.Config.ARGB_8888) + var bitmap = createBitmap(input.width, input.height, Bitmap.Config.ARGB_8888) - bitmap.density = toTransform.getDensity() + bitmap.density = input.getDensity() val canvas = Canvas(bitmap) canvas.scale(1 / DEFAULT_DOWN_SAMPLING.toFloat(), 1 / DEFAULT_DOWN_SAMPLING.toFloat()) val paint = Paint() paint.flags = Paint.FILTER_BITMAP_FLAG - canvas.drawBitmap(toTransform, 0f, 0f, paint) + canvas.drawBitmap(input, 0f, 0f, paint) bitmap = try { diff --git a/app/src/main/java/one/mixin/android/widget/CoilRoundedHexagonTransformation.kt b/app/src/main/java/one/mixin/android/widget/CoilRoundedHexagonTransformation.kt index e45da3c5e8..35a078c21a 100644 --- a/app/src/main/java/one/mixin/android/widget/CoilRoundedHexagonTransformation.kt +++ b/app/src/main/java/one/mixin/android/widget/CoilRoundedHexagonTransformation.kt @@ -19,7 +19,7 @@ class CoilRoundedHexagonTransformation : Transformation() { override val cacheKey: String = javaClass.name override suspend fun transform( - bitmap: Bitmap, + input: Bitmap, size: Size, ): Bitmap { val path = Path() @@ -29,15 +29,15 @@ class CoilRoundedHexagonTransformation : Transformation() { style = Paint.Style.FILL } - createHexagonPath(bitmap.width.toFloat(), path) - val result = createBitmap(bitmap.width, bitmap.height, bitmap.config ?: Bitmap.Config.ARGB_8888) + createHexagonPath(input.width.toFloat(), path) + val result = createBitmap(input.width, input.height, input.config ?: Bitmap.Config.ARGB_8888) paint.pathEffect = CornerPathEffect(result.width / 10f) val canvas = Canvas(result) canvas.drawPath(path, paint) paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_IN) - canvas.drawBitmap(bitmap, 0f, 0f, paint) + canvas.drawBitmap(input, 0f, 0f, paint) return result } From c797eb1e8c79bac999273f0ea6ecfe4630503e6c Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Mon, 25 May 2026 15:21:59 +0800 Subject: [PATCH 20/21] chore(member): remove unused notification sheet --- ...erNotificationBottomSheetDialogFragment.kt | 89 ------------- .../ui/page/MixinMemberNotificationPage.kt | 119 ------------------ 2 files changed, 208 deletions(-) delete mode 100644 app/src/main/java/one/mixin/android/ui/setting/member/MixinMemberNotificationBottomSheetDialogFragment.kt delete mode 100644 app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberNotificationPage.kt diff --git a/app/src/main/java/one/mixin/android/ui/setting/member/MixinMemberNotificationBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/setting/member/MixinMemberNotificationBottomSheetDialogFragment.kt deleted file mode 100644 index 157703ea61..0000000000 --- a/app/src/main/java/one/mixin/android/ui/setting/member/MixinMemberNotificationBottomSheetDialogFragment.kt +++ /dev/null @@ -1,89 +0,0 @@ -package one.mixin.android.ui.setting.member - -import android.annotation.SuppressLint -import android.app.Dialog -import android.os.Bundle -import android.view.Gravity -import android.view.View -import android.view.ViewGroup -import androidx.compose.runtime.Composable -import dagger.hilt.android.AndroidEntryPoint -import one.mixin.android.R -import one.mixin.android.api.response.MembershipOrder -import one.mixin.android.extension.booleanFromAttribute -import one.mixin.android.extension.dp -import one.mixin.android.extension.isNightMode -import one.mixin.android.extension.withArgs -import one.mixin.android.ui.common.MixinComposeBottomSheetDialogFragment -import one.mixin.android.ui.setting.ui.page.MixinMemberNotificationPage -import one.mixin.android.util.SystemUIManager - -@AndroidEntryPoint -class MixinMemberNotificationBottomSheetDialogFragment : MixinComposeBottomSheetDialogFragment() { - companion object { - const val TAG = "MixinMemberNotificationBottomSheetDialogFragment" - - fun newInstance(order: MembershipOrder? = null): MixinMemberNotificationBottomSheetDialogFragment { - return MixinMemberNotificationBottomSheetDialogFragment().apply { - withArgs { - putParcelable("order", order) - } - } - } - } - - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - } - - override fun getTheme() = R.style.AppTheme_Dialog - - @Composable - override fun ComposeContent() { - MixinMemberNotificationPage( - // order = memberViewModel.orderState.value, - onClose = { dismiss() }, - ) - - } - - override fun getBottomSheetHeight(view: View): Int { - return 450.dp - - } - - override fun showError(error: String) { - } - - @SuppressLint("RestrictedApi") - override fun setupDialog( - dialog: Dialog, - style: Int, - ) { - super.setupDialog(dialog, R.style.MixinBottomSheet) - dialog.window?.let { window -> - SystemUIManager.lightUI(window, requireContext().isNightMode()) - } - dialog.window?.setGravity(Gravity.BOTTOM) - dialog.window?.setLayout( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.WRAP_CONTENT, - ) - } - - override fun onStart() { - super.onStart() - dialog?.window?.let { window -> - SystemUIManager.lightUI( - window, - !requireContext().booleanFromAttribute(R.attr.flag_night), - ) - } - } - - override fun dismiss() { - dismissAllowingStateLoss() - } - -} diff --git a/app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberNotificationPage.kt b/app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberNotificationPage.kt deleted file mode 100644 index 2a2696bb4c..0000000000 --- a/app/src/main/java/one/mixin/android/ui/setting/ui/page/MixinMemberNotificationPage.kt +++ /dev/null @@ -1,119 +0,0 @@ -package one.mixin.android.ui.setting.ui.page - -import androidx.compose.foundation.Image -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Button -import androidx.compose.material.ButtonDefaults -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.collectAsState -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel -import one.mixin.android.R - -import one.mixin.android.compose.theme.MixinAppTheme -import one.mixin.android.ui.setting.ui.components.MembershipIcon -import one.mixin.android.ui.viewmodel.MemberViewModel - -@Composable -fun MixinMemberNotificationPage( - onClose: () -> Unit, -) { - val viewModel: MemberViewModel = hiltViewModel() - val order = viewModel.getOrdersFlow("f54a28b3-934a-4128-b6da-4b7323204b8c").collectAsState(null).value ?: return - - MixinAppTheme { - Box( - modifier = Modifier - .fillMaxSize() - .padding(16.dp) - ) { - Image( - painter = painterResource(R.drawable.bg_membership), - contentDescription = null, - modifier = Modifier - .fillMaxWidth() - .align(Alignment.TopCenter), - ) - Column( - modifier = Modifier - .fillMaxSize(), - horizontalAlignment = Alignment.CenterHorizontally - ) - { - Spacer(modifier = Modifier.height(50.dp)) - MembershipIcon(order.after, modifier = Modifier.size(70.dp)) - Spacer(modifier = Modifier.height(20.dp)) - Text( - text = stringResource(if (order.after == order.before) R.string.Renew_Success else R.string.Upgrade_Success), - fontSize = 20.sp, - fontWeight = FontWeight.W600, - color = MixinAppTheme.colors.textPrimary - ) - Spacer(modifier = Modifier.height(10.dp)) - Text( - modifier = Modifier.padding(horizontal = 10.dp), - text = stringResource( - R.string.membership_congratulation_description, - order.createdAt.substringBefore("T"), - order.stars - ), - textAlign = TextAlign.Center, - color = MixinAppTheme.colors.textMinor, - ) - Spacer(modifier = Modifier.height(40.dp)) - Button( - onClick = { onClose.invoke() }, - modifier = Modifier - .fillMaxWidth() - .padding(16.dp) - .height(48.dp), - shape = RoundedCornerShape(24.dp), - colors = ButtonDefaults.buttonColors( - backgroundColor = MixinAppTheme.colors.accent, - disabledBackgroundColor = Color.Gray - ), - elevation = ButtonDefaults.elevation( - pressedElevation = 0.dp, - defaultElevation = 0.dp, - hoveredElevation = 0.dp, - focusedElevation = 0.dp, - ) - ) { - Text( - text = stringResource(R.string.Got_it), - color = Color.White - ) - } - Spacer(modifier = Modifier.height(10.dp)) - Text( - text = stringResource(R.string.View_Plan), - modifier = Modifier - .padding(5.dp) - .clickable { - onClose.invoke() - }, - color = MixinAppTheme.colors.accent - ) - Spacer(modifier = Modifier.height(20.dp)) - } - } - } -} \ No newline at end of file From 497c6431141f84ffa7c44c3360bf6c2d946df3a3 Mon Sep 17 00:00:00 2001 From: SeniorZhai Date: Mon, 25 May 2026 15:26:24 +0800 Subject: [PATCH 21/21] chore(warnings): clean up remaining compilation warnings --- .../one/mixin/android/db/property/PropertyHelper.kt | 1 + .../mixin/android/db/property/Web3PropertyHelper.kt | 1 + app/src/main/java/one/mixin/android/di/AppModule.kt | 13 ++++++++----- .../one/mixin/android/extension/FileExtension.kt | 6 +++--- .../one/mixin/android/extension/ViewExtension.kt | 2 +- .../java/one/mixin/android/ui/home/MainActivity.kt | 2 +- .../mixin/android/ui/home/circle/CirclesFragment.kt | 2 +- .../android/ui/search/SearchExploreFragment.kt | 4 +++- .../one/mixin/android/ui/search/SearchFragment.kt | 4 ++-- .../mixin/android/ui/sticker/StickerAddFragment.kt | 3 ++- .../ui/sticker/StickerPreviewBottomSheetFragment.kt | 10 +++++----- .../wc/WalletConnectBottomSheetDialogFragment.kt | 4 ++-- .../android/ui/wallet/AllTransactionsFragment.kt | 4 ++-- .../transfer/TransferBottomSheetDialogFragment.kt | 2 +- .../mixin/android/vo/WithdrawalMemoPossibility.kt | 4 ++-- 15 files changed, 35 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/one/mixin/android/db/property/PropertyHelper.kt b/app/src/main/java/one/mixin/android/db/property/PropertyHelper.kt index c848f3e2e1..696d080ce9 100644 --- a/app/src/main/java/one/mixin/android/db/property/PropertyHelper.kt +++ b/app/src/main/java/one/mixin/android/db/property/PropertyHelper.kt @@ -148,6 +148,7 @@ object PropertyHelper { propertyDao.deletePropertyByKey(key) } + @Suppress("UNCHECKED_CAST") suspend fun findValueByKey( key: String, default: T, diff --git a/app/src/main/java/one/mixin/android/db/property/Web3PropertyHelper.kt b/app/src/main/java/one/mixin/android/db/property/Web3PropertyHelper.kt index 3a8e679bba..e00b8f0329 100644 --- a/app/src/main/java/one/mixin/android/db/property/Web3PropertyHelper.kt +++ b/app/src/main/java/one/mixin/android/db/property/Web3PropertyHelper.kt @@ -44,6 +44,7 @@ object Web3PropertyHelper { propertyDao.deletePropertyByKey(key) } + @Suppress("UNCHECKED_CAST") suspend fun findValueByKey( key: String, default: T, diff --git a/app/src/main/java/one/mixin/android/di/AppModule.kt b/app/src/main/java/one/mixin/android/di/AppModule.kt index f6a1e08758..00526304c4 100644 --- a/app/src/main/java/one/mixin/android/di/AppModule.kt +++ b/app/src/main/java/one/mixin/android/di/AppModule.kt @@ -6,6 +6,7 @@ import android.content.ContentResolver import android.content.Context import android.content.SharedPreferences import com.birbit.android.jobqueue.config.Configuration +import com.birbit.android.jobqueue.scheduling.FrameworkScheduler import com.birbit.android.jobqueue.scheduling.FrameworkJobSchedulerService import com.google.android.gms.net.CronetProviderInstaller import com.google.gson.Gson @@ -176,7 +177,7 @@ object AppModule { reportException(e) null } catch (e: Exception) { - if (e is TimeoutException || e is Timeout) { + if (e is TimeoutException) { Timber.e(e) } else { reportException(e) @@ -436,10 +437,12 @@ object AppModule { } .customLogger(JobLogger()) .networkUtil(jobNetworkUtil) - builder.scheduler( - FrameworkJobSchedulerService - .createSchedulerFor(app.applicationContext, MyJobService::class.java), - ) + val scheduler: FrameworkScheduler = + FrameworkJobSchedulerService.createSchedulerFor( + app.applicationContext, + MyJobService::class.java, + ) + builder.scheduler(scheduler) return MixinJobManager(builder.build()) } diff --git a/app/src/main/java/one/mixin/android/extension/FileExtension.kt b/app/src/main/java/one/mixin/android/extension/FileExtension.kt index accdd78404..b2bd875dea 100644 --- a/app/src/main/java/one/mixin/android/extension/FileExtension.kt +++ b/app/src/main/java/one/mixin/android/extension/FileExtension.kt @@ -674,12 +674,12 @@ fun Uri.getFileName(context: Context = MixinApplication.appContext): String { } if (result == null) { result = path - val cut = result!!.lastIndexOf('/') + val cut = result.lastIndexOf('/') if (cut != -1) { - result = result!!.substring(cut + 1) + result = result.substring(cut + 1) } } - return result ?: "" + return result } catch (e: java.lang.Exception) { Timber.e(e) } diff --git a/app/src/main/java/one/mixin/android/extension/ViewExtension.kt b/app/src/main/java/one/mixin/android/extension/ViewExtension.kt index df622686a1..8e99cce300 100644 --- a/app/src/main/java/one/mixin/android/extension/ViewExtension.kt +++ b/app/src/main/java/one/mixin/android/extension/ViewExtension.kt @@ -448,7 +448,7 @@ fun PopupMenu.showIcon() { try { val fMenuHelper: Field = PopupMenu::class.java.getDeclaredField("mPopup") fMenuHelper.isAccessible = true - menuHelper = fMenuHelper.get(this) + menuHelper = requireNotNull(fMenuHelper.get(this)) argTypes = arrayOf(Boolean::class.javaPrimitiveType) menuHelper.javaClass.getDeclaredMethod("setForceShowIcon", *argTypes) .invoke(menuHelper, true) diff --git a/app/src/main/java/one/mixin/android/ui/home/MainActivity.kt b/app/src/main/java/one/mixin/android/ui/home/MainActivity.kt index 042c3f752a..fa0f71f0aa 100644 --- a/app/src/main/java/one/mixin/android/ui/home/MainActivity.kt +++ b/app/src/main/java/one/mixin/android/ui/home/MainActivity.kt @@ -1223,7 +1223,7 @@ class MainActivity : BlazeBaseActivity(), WalletMissingBtcAddressFragment.Callba lastBottomNavItemId = R.id.nav_wallet } - private fun findFragmentByTagTyped(tag: String): T? = + private inline fun findFragmentByTagTyped(tag: String): T? = supportFragmentManager.findFragmentByTag(tag) as? T fun showUpdate(releaseUrl: String?) { diff --git a/app/src/main/java/one/mixin/android/ui/home/circle/CirclesFragment.kt b/app/src/main/java/one/mixin/android/ui/home/circle/CirclesFragment.kt index 964a40ee97..c5ca2f4eae 100644 --- a/app/src/main/java/one/mixin/android/ui/home/circle/CirclesFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/home/circle/CirclesFragment.kt @@ -326,7 +326,7 @@ class CirclesFragment : BaseFragment(), OnStartDragListener { } } - private fun findFragmentByTagTyped(tag: String): T? = + private inline fun findFragmentByTagTyped(tag: String): T? = parentFragmentManager.findFragmentByTag(tag) as? T fun edit(conversationCircleItem: ConversationCircleItem) { diff --git a/app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt b/app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt index 926b9b5121..865e2bb126 100644 --- a/app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt @@ -382,7 +382,9 @@ class SearchExploreFragment : BaseFragment(R.layout.fragment_search_explore) { updateRv(searchDappsJob) } - val tokenItems = searchViewModel.fuzzySearch(cancellationSignal, keyword) as List? + val tokenItems = + searchViewModel.fuzzySearch(cancellationSignal, keyword) + ?.filterIsInstance() searchAdapter.setAssets(tokenItems) refreshAssetsJob = launch { diff --git a/app/src/main/java/one/mixin/android/ui/search/SearchFragment.kt b/app/src/main/java/one/mixin/android/ui/search/SearchFragment.kt index 483c49aa6e..d706b0ce0a 100644 --- a/app/src/main/java/one/mixin/android/ui/search/SearchFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/search/SearchFragment.kt @@ -250,10 +250,10 @@ class SearchFragment : BaseFragment(R.layout.fragment_search) { context?.let { ctx -> ConversationActivity.show(ctx, null, user.userId) } } - override fun onMaoAppClick(appId: String) { + override fun onMaoAppClick(userId: String) { binding.searchRv.hideKeyboard() lifecycleScope.launch { - val app = searchViewModel.findOrSyncApp(appId) + val app = searchViewModel.findOrSyncApp(userId) if (app != null) { searchViewModel.updateRecentUsedBots(this@SearchFragment.defaultSharedPreferences, app.appId) AnalyticsTracker.trackOpenBotHomePage(AnalyticsTracker.BotSource.SEARCH_MAO_NAME, app.appNumber) diff --git a/app/src/main/java/one/mixin/android/ui/sticker/StickerAddFragment.kt b/app/src/main/java/one/mixin/android/ui/sticker/StickerAddFragment.kt index 54991f3b81..a44c93c98d 100644 --- a/app/src/main/java/one/mixin/android/ui/sticker/StickerAddFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/sticker/StickerAddFragment.kt @@ -133,7 +133,8 @@ class StickerAddFragment : BaseFragment() { try { val loader = requireContext().imageLoader val request = ImageRequest.Builder(requireContext()).data(url).build() - val result = (loader.execute(request).request as? SuccessResult)?.image?.asDrawable(requireContext().resources) ?: return@withContext 0 + val result = (loader.execute(request) as? SuccessResult)?.image?.asDrawable(requireContext().resources) + ?: return@withContext 0 val byteArray = result.toBitmap().toBytes() val bitmap = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.size, BitmapFactory.Options()) if (bitmap.width < dp100) { diff --git a/app/src/main/java/one/mixin/android/ui/sticker/StickerPreviewBottomSheetFragment.kt b/app/src/main/java/one/mixin/android/ui/sticker/StickerPreviewBottomSheetFragment.kt index 970daad932..910d0cf618 100644 --- a/app/src/main/java/one/mixin/android/ui/sticker/StickerPreviewBottomSheetFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/sticker/StickerPreviewBottomSheetFragment.kt @@ -90,14 +90,14 @@ class StickerPreviewBottomSheetFragment : MixinBottomSheetDialogFragment() { val stickerLiveData = viewModel.observeStickerById(stickerId) val observer = object : Observer { - override fun onChanged(sticker: Sticker) { + override fun onChanged(value: Sticker) { binding.previewIv.loadSticker( - sticker.assetUrl, - sticker.assetType, - "${sticker.assetUrl}${sticker.albumId}", + value.assetUrl, + value.assetType, + "${value.assetUrl}${value.albumId}", ) - val albumId = sticker.albumId + val albumId = value.albumId if (albumId.isNullOrBlank()) { return } diff --git a/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectBottomSheetDialogFragment.kt index b7d80dae8d..02a7417d3e 100644 --- a/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/tip/wc/WalletConnectBottomSheetDialogFragment.kt @@ -361,8 +361,8 @@ class WalletConnectBottomSheetDialogFragment : MixinComposeBottomSheetDialogFrag } else { tipGas = buildTipGas(chain.chainId, r.data!!) } - if (tipGas != null) { - (signData as? WalletConnect.WCSignData.V2SignData)?.tipGas = tipGas + if (tipGas != null && signData is WalletConnect.WCSignData.V2SignData) { + signData.tipGas = tipGas } } catch (e: Exception) { Timber.e(e) diff --git a/app/src/main/java/one/mixin/android/ui/wallet/AllTransactionsFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/AllTransactionsFragment.kt index b47338af71..71282551f4 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/AllTransactionsFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/AllTransactionsFragment.kt @@ -332,9 +332,9 @@ class AllTransactionsFragment : BaseTransactionsFragment(R.layout.fragment_all_t MultiSelectRecipientsListBottomSheetDialogFragment.newInstance(userItem) .setDateProvider(this@AllTransactionsFragment) .setOnMultiSelectUserListener(object : MultiSelectRecipientsListBottomSheetDialogFragment.OnMultiSelectRecipientListener { - override fun onRecipientSelect(recipients: List?) { + override fun onRecipientSelect(users: List?) { binding.filterUser.close() - filterParams.recipients = recipients + filterParams.recipients = users loadFilter() } diff --git a/app/src/main/java/one/mixin/android/ui/wallet/transfer/TransferBottomSheetDialogFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/transfer/TransferBottomSheetDialogFragment.kt index a3072d3db5..665f75cf7f 100644 --- a/app/src/main/java/one/mixin/android/ui/wallet/transfer/TransferBottomSheetDialogFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/wallet/transfer/TransferBottomSheetDialogFragment.kt @@ -737,7 +737,7 @@ class TransferBottomSheetDialogFragment : MixinBottomSheetDialogFragment() { } val transactionHash = runCatching { - val data = response.data as? List + val data = (response.data as? List<*>)?.filterIsInstance() if (data?.size == 1) { data.first().transactionHash } else { diff --git a/app/src/main/java/one/mixin/android/vo/WithdrawalMemoPossibility.kt b/app/src/main/java/one/mixin/android/vo/WithdrawalMemoPossibility.kt index a732f8124c..926dfab113 100644 --- a/app/src/main/java/one/mixin/android/vo/WithdrawalMemoPossibility.kt +++ b/app/src/main/java/one/mixin/android/vo/WithdrawalMemoPossibility.kt @@ -1,9 +1,9 @@ package one.mixin.android.vo import kotlinx.serialization.KSerializer +import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import kotlinx.serialization.Serializer import kotlinx.serialization.descriptors.PrimitiveKind import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor import kotlinx.serialization.descriptors.SerialDescriptor @@ -22,7 +22,7 @@ enum class WithdrawalMemoPossibility(val value: String) { POSITIVE("positive"), } -@Serializer(forClass = WithdrawalMemoPossibility::class) +@OptIn(ExperimentalSerializationApi::class) object WithdrawalMemoPossibilitySerializer : KSerializer { override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("WithdrawalMemoPossibility", PrimitiveKind.STRING)