sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-17 03:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'version/4.1.5' of https://github.com/HabitRPG/habitica-android into version/4.1.5

Browse source
This commit is contained in:
Phillip Thelen 2023-02-03 16:23:36 +01:00
commit b0b56cbb9e
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
View file

@ -11,6 +11,7 @@ import com.habitrpg.android.habitica.helpers.AmplitudeManager
import com.habitrpg.android.habitica.helpers.launchCatching
import com.habitrpg.android.habitica.models.user.User
import kotlinx.coroutines.MainScope
import java.io.IOException
class PushNotificationManager(
var apiClient: ApiClient,
@ -56,8 +57,10 @@ class PushNotificationManager(
try {
refreshedToken = it.result
addRefreshToken()
} catch (_: Exception) {
// catchy catch
} catch (_: IOException) {
// catchy catch-catch
} catch (_: Exception){
// catchy catch-catch-cat, I'm out of breath.
}
}
} catch (_: Exception) {

31
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
View file

@ -43,7 +43,6 @@ import com.habitrpg.android.habitica.databinding.ActivityTaskFormBinding
import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
import com.habitrpg.android.habitica.extensions.addCancelButton
import com.habitrpg.android.habitica.helpers.TaskAlarmManager
import com.habitrpg.android.habitica.helpers.launchCatching
import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
import com.habitrpg.android.habitica.models.Tag
import com.habitrpg.android.habitica.models.members.Member
@ -216,7 +215,7 @@ class TaskFormActivity : BaseActivity() {
taskType = TaskType.from(bundle.getString(TASK_TYPE_KEY)) ?: TaskType.HABIT
preselectedTags = bundle.getStringArrayList(SELECTED_TAGS_KEY)
lifecycleScope.launchCatching {
lifecycleScope.launch(Dispatchers.Main) {
tagRepository.getTags()
.map { tagRepository.getUnmanagedCopy(it) }
.collect {
@ -266,7 +265,7 @@ class TaskFormActivity : BaseActivity() {
},
{
taskCompletedMap.remove(it)
lifecycleScope.launchCatching {
lifecycleScope.launch(Dispatchers.Main) {
task?.let { it1 -> taskRepository.markTaskNeedsWork(it1, it) }
}
},
@ -275,7 +274,7 @@ class TaskFormActivity : BaseActivity() {
}
}
lifecycleScope.launchCatching {
lifecycleScope.launch(Dispatchers.Main) {
socialRepository.getGroupMembers(groupID ?: "").collect {
groupMembers = it
}
@ -300,9 +299,8 @@ class TaskFormActivity : BaseActivity() {
initialTaskInstance = task
fillForm(task)
task.challengeID?.let { challengeID ->
lifecycleScope.launchCatching {
val challenge = challengeRepository.retrieveChallenge(challengeID)
?: return@launchCatching
lifecycleScope.launch(Dispatchers.Main) {
val challenge = challengeRepository.retrieveChallenge(challengeID) ?: return@launch
this@TaskFormActivity.challenge = challenge
binding.challengeNameView.text =
getString(R.string.challenge_task_name, challenge.name)
@ -770,7 +768,7 @@ class TaskFormActivity : BaseActivity() {
alert.addButton(R.string.delete_task, true) { _, _ ->
if (task?.isValid != true) return@addButton
task?.id?.let {
lifecycleScope.launchCatching {
lifecycleScope.launch(Dispatchers.Main) {
taskRepository.deleteTask(it)
}
}
@ -796,9 +794,9 @@ class TaskFormActivity : BaseActivity() {
}
private fun showChallengeDeleteTask() {
lifecycleScope.launchCatching {
lifecycleScope.launch(Dispatchers.Main) {
val tasks = taskRepository.getTasksForChallenge(task?.challengeID).firstOrNull()
?: return@launchCatching
?: return@launch
val taskCount = tasks.size
val alert = HabiticaAlertDialog(this@TaskFormActivity)
alert.setTitle(getString(R.string.delete_challenge_task_title))
@ -815,7 +813,7 @@ class TaskFormActivity : BaseActivity() {
isDestructive = true
) { _, _ ->
challenge?.let {
lifecycleScope.launchCatching {
lifecycleScope.launch(Dispatchers.Main) {
challengeRepository.leaveChallenge(it, "keep-all")
taskRepository.deleteTask(task?.id ?: "")
userRepository.retrieveUser(true, true)
@ -828,7 +826,7 @@ class TaskFormActivity : BaseActivity() {
isDestructive = true
) { _, _ ->
challenge?.let {
lifecycleScope.launchCatching {
lifecycleScope.launch(Dispatchers.Main) {
challengeRepository.leaveChallenge(it, "remove-all")
userRepository.retrieveUser(true, true)
}
@ -844,9 +842,9 @@ class TaskFormActivity : BaseActivity() {
if (!task.isValid) {
return
}
lifecycleScope.launchCatching {
lifecycleScope.launch(Dispatchers.Main) {
val tasks = taskRepository.getTasksForChallenge(task.challengeID).firstOrNull()
?: return@launchCatching
?: return@launch
val taskCount = tasks.size
val dialog = HabiticaAlertDialog(this@TaskFormActivity)
dialog.setTitle(R.string.broken_challenge)
@ -860,7 +858,7 @@ class TaskFormActivity : BaseActivity() {
getString(R.string.keep_x_tasks, taskCount),
true
) { _, _ ->
lifecycleScope.launchCatching {
lifecycleScope.launch(Dispatchers.Main) {
taskRepository.unlinkAllTasks(task.challengeID, "keep-all")
userRepository.retrieveUser(true, true)
}
@ -870,8 +868,7 @@ class TaskFormActivity : BaseActivity() {
false,
true
) { _, _ ->
lifecycleScope.launchCatching {
lifecycleScope.launch(Dispatchers.Main) {
taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
userRepository.retrieveUser(true, true)
}