From 4a1077f05649eb92b545130a293104d93d4031eb Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Wed, 12 Jan 2022 20:28:29 +0200
Subject: [PATCH] Switch to RESULT_SKIP from setupcompat library

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

Change-Id: I9ca64295a2a68ae6c691d877b7156c1c51235003
---
 .../stevesoltys/seedvault/restore/RestoreFilesFragment.kt    | 5 ++---
 .../seedvault/ui/storage/StorageOptionsFragment.kt           | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
index a61585da..7aaaf057 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
@@ -1,6 +1,5 @@
 package com.stevesoltys.seedvault.restore
 
-import android.app.Activity.RESULT_FIRST_USER
 import android.app.Activity.RESULT_OK
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,6 +9,7 @@ import android.view.ViewStub
 import android.widget.Button
 import android.widget.TextView
 import androidx.fragment.app.Fragment
+import com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP
 import com.stevesoltys.seedvault.R
 import org.calyxos.backup.storage.api.SnapshotItem
 import org.calyxos.backup.storage.ui.restore.SnapshotFragment
@@ -35,9 +35,8 @@ internal class RestoreFilesFragment : SnapshotFragment() {
         val skipView: TextView = footer.findViewById(R.id.skipView)
         skipView.setOnClickListener {
             requireActivity().apply {
-                // Equivalent to com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP
                 // SetupWizard handles this
-                setResult(RESULT_FIRST_USER)
+                setResult(RESULT_SKIP)
                 finishAfterTransition()
             }
         }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageOptionsFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageOptionsFragment.kt
index a1e3eb69..56695cf4 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageOptionsFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageOptionsFragment.kt
@@ -2,7 +2,6 @@ package com.stevesoltys.seedvault.ui.storage
 
 import android.Manifest.permission.MANAGE_DOCUMENTS
 import android.annotation.SuppressLint
-import android.app.Activity.RESULT_FIRST_USER
 import android.content.Context
 import android.content.Intent
 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.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE
 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)
             skipView.visibility = VISIBLE
             skipView.setOnClickListener {
-                // Equivalent to com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP
                 // SetupWizard handles this
-                requireActivity().setResult(RESULT_FIRST_USER)
+                requireActivity().setResult(RESULT_SKIP)
                 requireActivity().finishAfterTransition()
             }
         } else {