Opt/multi database#5124
Open
SeniorZhai wants to merge 59 commits into
Open
Conversation
SeniorZhai
force-pushed
the
opt/multi_database
branch
from
9c9ea4a to
162b795
Compare
SeniorZhai
force-pushed
the
opt/multi_database
branch
from
c1e1d8b to
b8803cb
Compare
SeniorZhai
force-pushed
the
opt/multi_database
branch
from
0f5eb0c to
f460dd6
Compare
# Conflicts: # app/src/main/java/one/mixin/android/repository/AccountRepository.kt # app/src/main/java/one/mixin/android/ui/landing/MnemonicPhraseFragment.kt # app/src/main/java/one/mixin/android/ui/landing/MobileFragment.kt # app/src/main/java/one/mixin/android/ui/landing/viewmodel/LandingViewModel.kt
# Conflicts: # app/src/main/java/one/mixin/android/db/CircleConversationDao.kt # app/src/main/java/one/mixin/android/db/CircleDao.kt # app/src/main/java/one/mixin/android/db/DaoExtension.kt # app/src/main/java/one/mixin/android/db/StickerDao.kt # app/src/main/java/one/mixin/android/db/UserDao.kt # app/src/main/java/one/mixin/android/job/InitializeJob.kt # app/src/main/java/one/mixin/android/job/Injector.kt # app/src/main/java/one/mixin/android/job/RefreshAccountJob.kt # app/src/main/java/one/mixin/android/job/RefreshCircleJob.kt # app/src/main/java/one/mixin/android/job/RefreshConversationJob.kt # app/src/main/java/one/mixin/android/job/RefreshStickerAlbumJob.kt # app/src/main/java/one/mixin/android/job/RefreshStickerAndRelatedAlbumJob.kt # app/src/main/java/one/mixin/android/job/RefreshStickerJob.kt # app/src/main/java/one/mixin/android/messenger/HedwigImp.kt # app/src/main/java/one/mixin/android/repository/AccountRepository.kt # app/src/main/java/one/mixin/android/repository/UserRepository.kt
…i_database # Conflicts: # app/src/main/java/one/mixin/android/db/MarketCapRankDao.kt # app/src/main/java/one/mixin/android/db/RemoteMessageStatusDao.kt # app/src/main/java/one/mixin/android/job/RefreshMarketsJob.kt # app/src/main/java/one/mixin/android/job/SendService.kt # app/src/main/java/one/mixin/android/ui/common/message/ChatRoomHelper.kt
# Conflicts: # app/src/main/java/one/mixin/android/ui/common/PinCodeFragment.kt # app/src/main/java/one/mixin/android/ui/landing/MnemonicPhraseFragment.kt # app/src/main/java/one/mixin/android/util/database/DatabaseUtil.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.