mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

Switch to RESULT_SKIP from setupcompat library

Browse source 
* We need to import setupcompat library for theming reasons
  so change this as well to be consistent with SetupWizard code

Change-Id: I9ca64295a2a68ae6c691d877b7156c1c51235003
This commit is contained in:
Michael Bestas 2022-01-12 20:28:29 +02:00 • committed by Chirayu Desai
parent 49fd7513a7
commit 4a1077f056
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
View file

@ -1,6 +1,5 @@
package com.stevesoltys.seedvault.restore package com.stevesoltys.seedvault.restore
import android.app.Activity.RESULT_FIRST_USER
import android.app.Activity.RESULT_OK import android.app.Activity.RESULT_OK
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -10,6 +9,7 @@ import android.view.ViewStub
import android.widget.Button import android.widget.Button
import android.widget.TextView import android.widget.TextView
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP
import com.stevesoltys.seedvault.R import com.stevesoltys.seedvault.R
import org.calyxos.backup.storage.api.SnapshotItem import org.calyxos.backup.storage.api.SnapshotItem
import org.calyxos.backup.storage.ui.restore.SnapshotFragment import org.calyxos.backup.storage.ui.restore.SnapshotFragment
@ -35,9 +35,8 @@ internal class RestoreFilesFragment : SnapshotFragment() {
val skipView: TextView = footer.findViewById(R.id.skipView) val skipView: TextView = footer.findViewById(R.id.skipView)
skipView.setOnClickListener { skipView.setOnClickListener {
requireActivity().apply { requireActivity().apply {
// Equivalent to com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP
// SetupWizard handles this // SetupWizard handles this
setResult(RESULT_FIRST_USER) setResult(RESULT_SKIP)
finishAfterTransition() finishAfterTransition()
} }
} }

5
app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageOptionsFragment.kt
View file

@ -2,7 +2,6 @@ package com.stevesoltys.seedvault.ui.storage
import android.Manifest.permission.MANAGE_DOCUMENTS import android.Manifest.permission.MANAGE_DOCUMENTS
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Activity.RESULT_FIRST_USER
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION import android.content.Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
@ -22,6 +21,7 @@ import androidx.activity.result.contract.ActivityResultContracts.OpenDocumentTre
import androidx.annotation.RequiresPermission import androidx.annotation.RequiresPermission
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP
import com.stevesoltys.seedvault.R import com.stevesoltys.seedvault.R
import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE
import com.stevesoltys.seedvault.ui.storage.StorageOption.SafOption import com.stevesoltys.seedvault.ui.storage.StorageOption.SafOption
@ -82,9 +82,8 @@ internal class StorageOptionsFragment : Fragment(), StorageOptionClickedListener
titleView.text = getString(R.string.storage_fragment_restore_title) titleView.text = getString(R.string.storage_fragment_restore_title)
skipView.visibility = VISIBLE skipView.visibility = VISIBLE
skipView.setOnClickListener { skipView.setOnClickListener {
// Equivalent to com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP
// SetupWizard handles this // SetupWizard handles this
requireActivity().setResult(RESULT_FIRST_USER) requireActivity().setResult(RESULT_SKIP)
requireActivity().finishAfterTransition() requireActivity().finishAfterTransition()
} }
} else { } else {