diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt index d546c71ea..321fdedd3 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt @@ -8,6 +8,8 @@ import android.widget.Button import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope import androidx.wear.widget.WearableLinearLayoutManager +import com.google.android.gms.auth.api.signin.GoogleSignIn +import com.google.android.gms.auth.api.signin.GoogleSignInOptions import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.ActivitySettingsBinding import com.habitrpg.wearos.habitica.ui.adapters.SettingsAdapter @@ -43,6 +45,14 @@ class SettingsActivity: BaseActivity private fun logout() { viewModel.logout() + try { + val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN) + .build() + val client = GoogleSignIn.getClient(this, gso) + client.signOut() + } catch (e: Exception) { + + } val intent = Intent(this, LoginActivity::class.java) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt index a3594761d..7fa56107a 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt @@ -3,6 +3,8 @@ package com.habitrpg.wearos.habitica.ui.viewmodels import android.content.SharedPreferences import androidx.core.content.edit import androidx.lifecycle.viewModelScope +import com.google.android.gms.auth.api.signin.GoogleSignIn +import com.google.android.gms.auth.api.signin.GoogleSignInOptions import com.habitrpg.wearos.habitica.data.ApiClient import com.habitrpg.wearos.habitica.data.repositories.TaskRepository import com.habitrpg.wearos.habitica.data.repositories.UserRepository