@ -1,12 +1,9 @@
package net.pokeranalytics.android.ui.activity
import android.Manifest
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Bundle
import android.os.PersistableBundle
import androidx.core.app.ActivityCompat
import io.realm.Realm
import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
@ -15,8 +12,10 @@ import timber.log.Timber
class ImportActivity : PokerAnalyticsActivity ( ) {
private lateinit var fileURI : Uri
enum class IntentKey ( val keyName : String ) {
FILE _PATH ( " filepath " )
URI ( " uri " )
}
companion object {
@ -24,25 +23,24 @@ class ImportActivity : PokerAnalyticsActivity() {
/ * *
* Create a new instance for result
* /
fun newInstance ( context : Context , filePath : String ) {
context . startActivity ( getIntent ( context , filePath ) )
fun newInstance ( context : Context , uri : Uri ) {
context . startActivity ( getIntent ( context , uri ) )
}
private fun getIntent ( context : Context , filePath : String ) : Intent {
private fun getIntent ( context : Context , uri : Uri ) : Intent {
val intent = Intent ( context , ImportActivity :: class . java )
intent . putExtra ( ImportActivity . IntentKey . FILE _PATH . keyName , filePath )
intent . putExtra ( ImportActivity . IntentKey . URI . keyName , uri )
return intent
}
}
override fun onCreate ( savedInstanceState : Bundle ? ) {
super . onCreate ( savedInstanceState )
override fun onCreate ( savedInstanceState : Bundle ? , persistentState : PersistableBundle ? ) {
super . onCreate ( savedInstanceState , persistentState )
this . fileURI = intent . getParcelableExtra ( ImportActivity . IntentKey . URI . keyName )
setContentView ( R . layout . activity _import )
initUI ( )
}
override fun onStop ( ) {
@ -59,32 +57,27 @@ class ImportActivity : PokerAnalyticsActivity() {
val fragmentTransaction = supportFragmentManager . beginTransaction ( )
val fragment = ImportFragment ( )
val filePath = intent . getStringExtra ( ImportActivity . IntentKey . FILE _PATH . keyName )
fragment . setData ( filePath )
val fis = contentResolver . openInputStream ( fileURI )
Timber . d ( " Load fragment data with: $fis " )
fis ?. let {
fragment . setData ( it )
}
fragmentTransaction . add ( R . id . container , fragment )
fragmentTransaction . commit ( )
}
private fun requestPermission ( ) {
if ( ActivityCompat . checkSelfPermission ( this , Manifest . permission . READ _EXTERNAL _STORAGE ) == PackageManager . PERMISSION _DENIED ) {
ActivityCompat . requestPermissions (
this , arrayOf ( Manifest . permission . READ _EXTERNAL _STORAGE ) , PERMISSION _REQUEST _ACCESS _FINE _LOCATION
)
}
}
override fun onNewIntent ( intent : Intent ? ) {
super . onNewIntent ( intent )
val f = intent ?. data
val uri = f . toString ( )
Timber . d ( " !!!Intent!!! uri = $uri " )
}
override fun onRequestPermissionsResult ( requestCode : Int , permissions : Array < out String > , grantResults : IntArray ) {
super . onRequestPermissionsResult ( requestCode , permissions , grantResults )
}
// private fun requestPermission() {
// if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
// ActivityCompat.requestPermissions(
// this, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), PERMISSION_REQUEST_ACCESS_FINE_LOCATION
// )
// }
// }
//
// override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
// super.onRequestPermissionsResult(requestCode, permissions, grantResults)
// }
}
Aurelien Hubert
7 years ago