diff --git a/app/src/main/java/ru/panorobot/fc/Photo.kt b/app/src/main/java/ru/panorobot/fc/Photo.kt index a4af369..e0a24c1 100644 --- a/app/src/main/java/ru/panorobot/fc/Photo.kt +++ b/app/src/main/java/ru/panorobot/fc/Photo.kt @@ -7,6 +7,7 @@ import android.graphics.BitmapFactory import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.os.Environment +import android.widget.Toast import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import kotlinx.android.synthetic.main.activity_photo.* @@ -24,10 +25,9 @@ class Photo : AppCompatActivity() { startActivity(intent) } - val user = intent.getStringExtra("USER") - val fileName = "/MeridianFC/" + user + ".jpg" - var f = File(Environment.getExternalStorageDirectory(), fileName) + + if (ContextCompat.checkSelfPermission( this@Photo, @@ -41,15 +41,36 @@ class Photo : AppCompatActivity() { ) // TODO: 26.06.2020 Добавить коллбэк } else { - try { - var fso = FileInputStream(f) - var b: Bitmap = BitmapFactory.decodeStream(fso) - im_photo.setImageBitmap(b) - getSupportActionBar()?.setTitle(user) - } catch (e: Exception) { - im_photo.setImageBitmap(null) - getSupportActionBar()?.setTitle("Не найден! " + user) - } + getPhoto() } } + + private fun getPhoto() { + val user = intent.getStringExtra("USER") + val fileName = "/MeridianFC/" + user + ".jpg" + var f = File(Environment.getExternalStorageDirectory(), fileName) + + try { + var fso = FileInputStream(f) + var b: Bitmap = BitmapFactory.decodeStream(fso) + im_photo.setImageBitmap(b) + getSupportActionBar()?.setTitle(user) + } catch (e: Exception) { + im_photo.setImageBitmap(null) + getSupportActionBar()?.setTitle("Не найден! " + user) + } + } + + override fun onRequestPermissionsResult( + requestCode: Int, + permissions: Array, + grantResults: IntArray + ) { + if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) + getPhoto() + else Toast.makeText(this, "Необходим доступ для показа фото", Toast.LENGTH_SHORT).show() + + +// super.onRequestPermissionsResult(requestCode, permissions, grantResults) + } } \ No newline at end of file