Skip to content

Commit

Permalink
Merge pull request #484 from gini/PP-197_migrate_from_startActivityFo…
Browse files Browse the repository at this point in the history 
…rResult_to_registerForResult

Pp 197 migrate from start activity for result to register for result
  • Loading branch information
@GeraltRiv
GeraltRiv authored Jul 5, 2024
2 parents aad16c1 + 019d3b2 commit 6f572e8
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 90 deletions.
62 changes: 30 additions & 32 deletions bank-sdk/example-app/src/main/java/net/gini/android/bank/sdk/exampleapp/ui/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import android.widget.Toast
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.IntentCompat
Expand Down Expand Up @@ -43,12 +45,14 @@ class MainActivity : AppCompatActivity() {
private var cancellationToken: CancellationToken? =
null // should be kept across configuration changes
private val permissionHandler = PermissionHandler(this)
private var configurationActivityLauncher: ActivityResultLauncher<Intent>? = null

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
addInputHandlers()
setupActivityResultLauncher()
showVersions()
if (savedInstanceState == null) {
if (isIntentActionViewOrSend(intent)) {
Expand Down Expand Up @@ -89,6 +93,29 @@ class MainActivity : AppCompatActivity() {

}

private fun setupActivityResultLauncher() {
configurationActivityLauncher =
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
when (result.resultCode) {
RESULT_CANCELED -> {}
RESULT_OK -> {
val configurationResult: Configuration? = result.data?.getParcelableExtra(
CONFIGURATION_BUNDLE
)
if (configurationResult != null) {
configurationViewModel.setConfiguration(configurationResult)
}

configurationViewModel.disableCameraPermission(
result.data?.getBooleanExtra(
CAMERA_PERMISSION_BUNDLE, false
) ?: false
)
}
}
}
}

private fun addInputHandlers() {
binding.buttonStartScanner.setOnClickListener {
checkIfAppShouldAskForCameraPermission(EntryPoint.BUTTON)
Expand All @@ -105,22 +132,18 @@ class MainActivity : AppCompatActivity() {
}

binding.textGiniBankVersion.setOnClickListener {
startActivityForResult(
Intent(
this, ConfigurationActivity::class.java
)
configurationActivityLauncher?.launch(
Intent(this, ConfigurationActivity::class.java)
.putExtra(
CONFIGURATION_BUNDLE,
configurationViewModel.configurationFlow.value
)
.putExtra(
CAMERA_PERMISSION_BUNDLE,
configurationViewModel.disableCameraPermissionFlow.value
),
REQUEST_CONFIGURATION
)
)
}

}

private fun checkIfAppShouldAskForCameraPermission(entryPoint: EntryPoint) {
Expand Down Expand Up @@ -226,31 +249,6 @@ class MainActivity : AppCompatActivity() {
)
}

override fun onActivityResult(
requestCode: Int, resultCode: Int, data: Intent?
) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == REQUEST_CONFIGURATION) {
when (resultCode) {
RESULT_CANCELED -> {}
RESULT_OK -> {
var configurationResult: Configuration? = data?.getParcelableExtra(
CONFIGURATION_BUNDLE
)
if (configurationResult != null) {
configurationViewModel.setConfiguration(configurationResult)
}

configurationViewModel.disableCameraPermission(
data?.getBooleanExtra(
CAMERA_PERMISSION_BUNDLE, false
) ?: false
)
}
}
}
}


companion object {
const val CONFIGURATION_BUNDLE = "CONFIGURATION_BUNDLE"
Expand Down
104 changes: 46 additions & 58 deletions ...sdk/sdk/src/main/java/net/gini/android/capture/internal/fileimport/FileChooserFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import android.app.Activity.RESULT_OK
import android.app.Dialog
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.content.pm.ResolveInfo
import android.os.Build
import android.os.Bundle
Expand All @@ -15,6 +14,8 @@ import android.provider.MediaStore
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.fragment.app.setFragmentResult
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.GridLayoutManager
Expand Down Expand Up @@ -43,14 +44,14 @@ import net.gini.android.capture.internal.util.getLayoutInflaterWithGiniCaptureTh
private const val ARG_DOCUMENT_IMPORT_FILE_TYPES = "GC_EXTRA_IN_DOCUMENT_IMPORT_FILE_TYPES"
private const val GRID_SPAN_COUNT_PHONE = 3
private const val GRID_SPAN_COUNT_TABLET = 6
private const val REQ_CODE_CHOOSE_FILE = 1

/**
* Internal use only.
*/
class FileChooserFragment : BottomSheetDialogFragment() {
private var docImportEnabledFileTypes: DocumentImportEnabledFileTypes? = null
private var binding: GcFragmentFileChooserBinding by autoCleared()
private var chooseFileLauncher: ActivityResultLauncher<Intent>? = null

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand All @@ -61,6 +62,7 @@ class FileChooserFragment : BottomSheetDialogFragment() {
it.getSerializable(ARG_DOCUMENT_IMPORT_FILE_TYPES) as? DocumentImportEnabledFileTypes
}
}
setupFileChooserListener()
}

override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
Expand Down Expand Up @@ -98,6 +100,47 @@ class FileChooserFragment : BottomSheetDialogFragment() {
binding.gcFileProviders.layoutManager = GridLayoutManager(requireContext(), getGridSpanCount())
}

private fun setupFileChooserListener() {
chooseFileLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
findNavController().popBackStack()
when (result.resultCode) {
RESULT_OK -> {
result.data?.let { data ->
setFragmentResult(REQUEST_KEY, Bundle().apply {
putParcelable(RESULT_KEY, FileChooserResult.FilesSelected(data))
})
} ?: run {
setFragmentResult(REQUEST_KEY, Bundle().apply {
putParcelable(
RESULT_KEY, FileChooserResult.Error(
GiniCaptureError(
GiniCaptureError.ErrorCode.DOCUMENT_IMPORT,
"Activity result data was null."
)
)
)
})
}
}

RESULT_CANCELED -> setFragmentResult(REQUEST_KEY, Bundle().apply {
putParcelable(RESULT_KEY, FileChooserResult.Cancelled)
})

else -> setFragmentResult(REQUEST_KEY, Bundle().apply {
putParcelable(
RESULT_KEY, FileChooserResult.Error(
GiniCaptureError(
GiniCaptureError.ErrorCode.DOCUMENT_IMPORT,
"Unexpected result code for activity result."
)
)
)
})
}
}
}

private fun getGridSpanCount(): Int =
if (ContextHelper.isTablet(requireContext())) GRID_SPAN_COUNT_TABLET else GRID_SPAN_COUNT_PHONE

Expand Down Expand Up @@ -137,62 +180,7 @@ class FileChooserFragment : BottomSheetDialogFragment() {
item.resolveInfo.activityInfo.packageName,
item.resolveInfo.activityInfo.name
)
startActivityForResult(item.intent, REQ_CODE_CHOOSE_FILE)
}

override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)

findNavController().popBackStack()

if (requestCode == REQ_CODE_CHOOSE_FILE) {
when (resultCode) {
RESULT_OK -> {
if (data != null) {
setFragmentResult(REQUEST_KEY, Bundle().apply {
putParcelable(RESULT_KEY, FileChooserResult.FilesSelected(data))
})
} else {
setFragmentResult(REQUEST_KEY, Bundle().apply {
putParcelable(
RESULT_KEY, FileChooserResult.Error(
GiniCaptureError(
GiniCaptureError.ErrorCode.DOCUMENT_IMPORT,
"Activity result data was null."
)
)
)
})
}
}

RESULT_CANCELED -> setFragmentResult(REQUEST_KEY, Bundle().apply {
putParcelable(RESULT_KEY, FileChooserResult.Cancelled)
})

else -> setFragmentResult(REQUEST_KEY, Bundle().apply {
putParcelable(
RESULT_KEY, FileChooserResult.Error(
GiniCaptureError(
GiniCaptureError.ErrorCode.DOCUMENT_IMPORT,
"Unexpected result code for activity result."
)
)
)
})
}
} else {
setFragmentResult(REQUEST_KEY, Bundle().apply {
putParcelable(
RESULT_KEY, FileChooserResult.Error(
GiniCaptureError(
GiniCaptureError.ErrorCode.DOCUMENT_IMPORT,
"Unexpected request code for activity result."
)
)
)
})
}
chooseFileLauncher?.launch(item.intent)
}

private fun getImageProviderItems(
Expand Down

0 comments on commit 6f572e8

Please sign in to comment.