Skip to content

Commit

Permalink
feat: ユーザの操作に関するエラーをアプリ全体で処理できるようにした
Browse files Browse the repository at this point in the history
  • Loading branch information
@pantasystem
pantasystem committed Jan 9, 2024
1 parent 11d76ef commit 2bed164
Show file tree
Hide file tree
Showing 5 changed files with 175 additions and 7 deletions.
8 changes: 8 additions & 0 deletions app/src/main/java/jp/panta/misskeyandroidclient/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import net.pantasystem.milktea.common.ui.ApplyTheme
import net.pantasystem.milktea.common.ui.ToolbarSetter
import net.pantasystem.milktea.common_android_ui.account.AccountSwitchingDialog
import net.pantasystem.milktea.common_android_ui.account.viewmodel.AccountViewModel
import net.pantasystem.milktea.common_android_ui.error.UserActionAppGlobalErrorListener
import net.pantasystem.milktea.common_android_ui.report.ReportViewModel
import net.pantasystem.milktea.common_navigation.MainNavigation
import net.pantasystem.milktea.common_viewmodel.CurrentPageableTimelineViewModel
Expand Down Expand Up @@ -78,6 +79,9 @@ class MainActivity : AppCompatActivity(), ToolbarSetter {
@Inject
internal lateinit var channelAPIMainEventDispatcherAdapter: ChannelAPIMainEventDispatcherAdapter

@Inject
internal lateinit var userActionAppGlobalErrorListener: UserActionAppGlobalErrorListener

private val notesViewModel: NotesViewModel by viewModels()

private val accountViewModel: AccountViewModel by viewModels()
Expand Down Expand Up @@ -167,6 +171,10 @@ class MainActivity : AppCompatActivity(), ToolbarSetter {
}

GoogleApiAvailability.getInstance().makeGooglePlayServicesAvailable(this)
userActionAppGlobalErrorListener(
lifecycle = lifecycle,
fragmentManager = supportFragmentManager
)
}

override fun setToolbar(toolbar: Toolbar, visibleTitle: Boolean) {
Expand Down
20 changes: 20 additions & 0 deletions ...es/features/note/src/main/java/net/pantasystem/milktea/note/option/NoteOptionViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.launch
import net.pantasystem.milktea.app_store.handler.AppGlobalError
import net.pantasystem.milktea.app_store.handler.UserActionAppGlobalErrorStore
import net.pantasystem.milktea.common.Logger
import net.pantasystem.milktea.common_android.resource.StringSource
import net.pantasystem.milktea.model.account.Account
import net.pantasystem.milktea.model.account.AccountRepository
import net.pantasystem.milktea.model.account.page.Pageable
Expand All @@ -24,6 +27,7 @@ class NoteOptionViewModel @Inject constructor(
private val noteRelationGetter: NoteRelationGetter,
private val loggerFactory: Logger.Factory,
private val featureEnables: FeatureEnables,
private val userActionAppGlobalErrorStore: UserActionAppGlobalErrorStore,
private val savedStateHandle: SavedStateHandle
) : ViewModel() {
companion object {
Expand Down Expand Up @@ -98,6 +102,14 @@ class NoteOptionViewModel @Inject constructor(
viewModelScope.launch {
noteRepository.createThreadMute(noteId).onFailure {
logger.error("create thread mute failed", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"NoteOptionViewModel.createThreadMute",
AppGlobalError.ErrorLevel.Error,
StringSource("Create thread mute failed"),
it
)
)
}
savedStateHandle[NOTE_ID] = noteId
}
Expand All @@ -107,6 +119,14 @@ class NoteOptionViewModel @Inject constructor(
viewModelScope.launch {
noteRepository.deleteThreadMute(noteId).onFailure {
logger.error("delete thread mute failed", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"NoteOptionViewModel.deleteThreadMute",
AppGlobalError.ErrorLevel.Error,
StringSource("Delete thread mute failed"),
it
)
)
}
savedStateHandle[NOTE_ID] = noteId
}
Expand Down
112 changes: 105 additions & 7 deletions modules/features/note/src/main/java/net/pantasystem/milktea/note/viewmodel/NotesViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.launch
import net.pantasystem.milktea.app_store.handler.AppGlobalError
import net.pantasystem.milktea.app_store.handler.UserActionAppGlobalErrorStore
import net.pantasystem.milktea.app_store.notes.NoteTranslationStore
import net.pantasystem.milktea.common.Logger
import net.pantasystem.milktea.common.mapCancellableCatching
Expand Down Expand Up @@ -48,6 +50,7 @@ class NotesViewModel @Inject constructor(
private val deleteReactionUseCase: DeleteReactionsUseCase,
private val voteUseCase: VoteUseCase,
private val configRepository: LocalConfigRepository,
private val userActionAppGlobalErrorStore: UserActionAppGlobalErrorStore,
loggerFactory: Logger.Factory
) : ViewModel() {
private val logger by lazy {
Expand Down Expand Up @@ -76,6 +79,15 @@ class NotesViewModel @Inject constructor(
quoteRenoteTarget.tryEmit(
QuoteRenoteData.ofTimeline(it.id)
)
}.onFailure {
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.showQuoteNoteEditor",
level = AppGlobalError.ErrorLevel.Warning,
message = StringSource("Load note failed"),
throwable = it
)
)
}
}
}
Expand All @@ -86,6 +98,15 @@ class NotesViewModel @Inject constructor(
quoteRenoteTarget.tryEmit(
QuoteRenoteData.ofChannel(it.id, requireNotNull(it.channelId))
)
}.onFailure {
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.showQuoteToChannelNoteEditor",
level = AppGlobalError.ErrorLevel.Warning,
message = StringSource("Load note failed"),
throwable = it
)
)
}
}
}
Expand All @@ -108,6 +129,14 @@ class NotesViewModel @Inject constructor(
viewModelScope.launch {
toggleReactionUseCase(noteId, reaction).onFailure {
logger.error("リアクション失敗", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.toggleReaction",
level = AppGlobalError.ErrorLevel.Warning,
message = StringSource("Reaction failed"),
throwable = it
)
)
}
}
}
Expand All @@ -116,6 +145,14 @@ class NotesViewModel @Inject constructor(
viewModelScope.launch {
deleteReactionUseCase(noteId).onFailure {
logger.error("リアクションの解除に失敗", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.deleteReactions",
level = AppGlobalError.ErrorLevel.Warning,
message = StringSource("Delete reactions failed"),
throwable = it
)
)
}
}
}
Expand All @@ -132,20 +169,33 @@ class NotesViewModel @Inject constructor(

fun deleteFavorite(noteId: Note.Id) {
viewModelScope.launch {
val result = deleteFavoriteUseCase(noteId).getOrNull() != null
_statusMessage.tryEmit(if (result) {
StringSource(R.string.removed_from_favorites)
} else {
StringSource(R.string.failed_to_delete_favorites)
})
deleteFavoriteUseCase(noteId).onFailure {
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.deleteFavorite",
level = AppGlobalError.ErrorLevel.Warning,
message = StringSource(R.string.failed_to_delete_favorites),
throwable = it
)
)
}.onSuccess {
_statusMessage.tryEmit(StringSource(R.string.removed_from_favorites))
}
}
}


fun addBookmark(noteId: Note.Id) {
viewModelScope.launch {
createBookmarkUseCase(noteId).onFailure {
logger.error("add book mark error", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.addBookmark",
level = AppGlobalError.ErrorLevel.Warning,
message = StringSource("Add bookmark failed"),
throwable = it
)
)
}
}
}
Expand All @@ -154,6 +204,14 @@ class NotesViewModel @Inject constructor(
viewModelScope.launch {
deleteBookmarkUseCase(noteId).onFailure {
logger.error("remove book mark error", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.removeBookmark",
level = AppGlobalError.ErrorLevel.Warning,
message = StringSource("Remove bookmark failed"),
throwable = it
)
)
}
}
}
Expand All @@ -164,6 +222,14 @@ class NotesViewModel @Inject constructor(
_statusMessage.tryEmit(StringSource(R.string.successfully_deleted))
}.onFailure {
logger.error("ノート削除に失敗", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.removeNote",
level = AppGlobalError.ErrorLevel.Error,
message = StringSource("Delete note failed"),
throwable = it
)
)
}
}

Expand All @@ -175,6 +241,14 @@ class NotesViewModel @Inject constructor(
_openNoteEditorEvent.tryEmit(it)
}.onFailure {
logger.error("削除に失敗しました", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.removeAndEditNote",
level = AppGlobalError.ErrorLevel.Error,
message = StringSource("Delete note failed"),
throwable = it
)
)
}
}

Expand All @@ -187,6 +261,14 @@ class NotesViewModel @Inject constructor(
viewModelScope.launch {
voteUseCase(noteId, choice).onFailure {
logger.error("投票に失敗しました", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.vote",
level = AppGlobalError.ErrorLevel.Warning,
message = StringSource("Vote failed"),
throwable = it
)
)
}.onSuccess {
logger.debug("投票に成功しました")
}
Expand All @@ -197,6 +279,14 @@ class NotesViewModel @Inject constructor(
viewModelScope.launch {
toggleFavoriteUseCase(note.id).onFailure {
logger.error("favoriteに失敗", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.onToggleFavoriteUseCase",
level = AppGlobalError.ErrorLevel.Warning,
message = StringSource("Toggle favorite failed"),
throwable = it
)
)
}
}
}
Expand All @@ -215,6 +305,14 @@ class NotesViewModel @Inject constructor(
configRepository.save(it)
}.onFailure {
logger.error("警告表示の抑制に失敗", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
tag = "NotesViewModel.neverShowSensitiveMediaDialog",
level = AppGlobalError.ErrorLevel.Warning,
message = StringSource("Never show sensitive media dialog failed"),
throwable = it
)
)
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions modules/features/userlist/src/main/java/net/pantasystem/milktea/userlist/ListListActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.ExperimentalCoroutinesApi
import net.pantasystem.milktea.app_store.account.AccountStore
import net.pantasystem.milktea.common.ui.ApplyTheme
import net.pantasystem.milktea.common_android_ui.error.UserActionAppGlobalErrorListener
import net.pantasystem.milktea.common_compose.MilkteaStyleConfigApplyAndTheme
import net.pantasystem.milktea.common_navigation.UserListArgs
import net.pantasystem.milktea.common_navigation.UserListNavigation
Expand Down Expand Up @@ -63,6 +64,9 @@ class ListListActivity : AppCompatActivity() {
@Inject
internal lateinit var configRepository: LocalConfigRepository

@Inject
internal lateinit var userActionAppGlobalErrorListener: UserActionAppGlobalErrorListener


private val addUserId: User.Id? by lazy {
val addUserIdSt = intent.getStringExtra(EXTRA_ADD_USER_ID)
Expand All @@ -79,6 +83,10 @@ class ListListActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
applyTheme()

userActionAppGlobalErrorListener(
lifecycle = lifecycle,
fragmentManager = supportFragmentManager
)

mListListViewModel.setAddTargetUserId(addUserId)

Expand Down
34 changes: 34 additions & 0 deletions ...es/userlist/src/main/java/net/pantasystem/milktea/userlist/viewmodel/ListListViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.launch
import net.pantasystem.milktea.app_store.account.AccountStore
import net.pantasystem.milktea.app_store.handler.AppGlobalError
import net.pantasystem.milktea.app_store.handler.UserActionAppGlobalErrorStore
import net.pantasystem.milktea.common.*
import net.pantasystem.milktea.common_android.resource.StringSource
import net.pantasystem.milktea.model.account.AccountRepository
import net.pantasystem.milktea.model.list.UserList
import net.pantasystem.milktea.model.list.UserListRepository
Expand All @@ -27,6 +30,7 @@ class ListListViewModel @Inject constructor(
private val userRepository: UserRepository,
private val toggleAddToTabUseCase: UserListTabToggleAddToTabUseCase,
private val savedStateHandle: SavedStateHandle,
private val userActionAppGlobalErrorStore: UserActionAppGlobalErrorStore,
) : ViewModel() {

companion object {
Expand Down Expand Up @@ -122,6 +126,20 @@ class ListListViewModel @Inject constructor(
userListRepository.syncOne(userList.id)
}.onFailure {
logger.error("toggle user failed", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"ListListViewModel.toggle",
AppGlobalError.ErrorLevel.Error,
StringSource(
if (userList.userIds.contains(userId)) {
"Remove user from list failed"
} else {
"Add user to list failed"
}
),
it
),
)
}
}
}
Expand All @@ -131,6 +149,14 @@ class ListListViewModel @Inject constructor(
viewModelScope.launch {
toggleAddToTabUseCase(ul.id, savedStateHandle[EXTRA_ADD_TAB_TO_ACCOUNT_ID]).onFailure {
logger.error("タブtoggle処理失敗", e = it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"ListListViewModel.toggleTab",
AppGlobalError.ErrorLevel.Error,
StringSource("add/remove tab failed"),
it
)
)
}
}
}
Expand All @@ -146,6 +172,14 @@ class ListListViewModel @Inject constructor(
logger.debug("作成成功")
}.onFailure {
logger.error("作成失敗", it)
userActionAppGlobalErrorStore.dispatch(
AppGlobalError(
"ListListViewModel.createUserList",
AppGlobalError.ErrorLevel.Error,
StringSource("create user list failed"),
it
)
)
}
}

Expand Down

0 comments on commit 2bed164

Please sign in to comment.