From 4647fe5dfa05094588de225179a75347799facee Mon Sep 17 00:00:00 2001
From: skysamara <skysamara@gmail.com>
Date: Fri, 26 Jun 2020 12:38:57 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BB=D0=BB=D0=B1=D1=8D=D0=BA=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=20=D0=B4=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D1=83=D0=BF=D0=B0=20=D0=BA=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B9=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/ru/panorobot/fc/Photo.kt | 45 ++++++++++++++++------
 1 file changed, 33 insertions(+), 12 deletions(-)

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<out String>,
+        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