Merge branch '2.0.0' of github.com:cats-oss/android-gpuimage into 2.0.0

Author: wasabeef

sample/src/main/java/jp/co/cyberagent/android/gpuimage/sample/activity/MainActivity.kt

@@ -36,12 +36,10 @@ class MainActivity : AppCompatActivity() {
             startActivity(Intent(this, GalleryActivity::class.java))
         }
         findViewById<View>(R.id.button_camera).setOnClickListener {
-            if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
-                == PackageManager.PERMISSION_DENIED
-            ) {
+            if (!hasCameraPermission() || !hasStoragePermission()) {
                 ActivityCompat.requestPermissions(
                     this,
-                    arrayOf(Manifest.permission.CAMERA),
+                    arrayOf(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE),
                     REQUEST_CAMERA
                 )
             } else {
@@ -55,13 +53,30 @@ class MainActivity : AppCompatActivity() {
         permissions: Array<String>,
         grantResults: IntArray
     ) {
-        if (requestCode == REQUEST_CAMERA && grantResults.size != 1 || grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+        if (requestCode == REQUEST_CAMERA && grantResults.size == 2
+            && grantResults[0] == PackageManager.PERMISSION_GRANTED
+            && grantResults[1] == PackageManager.PERMISSION_GRANTED
+        ) {
             startActivity(Intent(this, CameraActivity::class.java))
         } else {
             super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         }
     }
 
+    private fun hasCameraPermission(): Boolean {
+        return ContextCompat.checkSelfPermission(
+            this,
+            Manifest.permission.CAMERA
+        ) == PackageManager.PERMISSION_GRANTED
+    }
+
+    private fun hasStoragePermission(): Boolean {
+        return ContextCompat.checkSelfPermission(
+            this,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE
+        ) == PackageManager.PERMISSION_GRANTED
+    }
+
     companion object {
         private const val REQUEST_CAMERA = 1
     }