Fix/remove permission request

app/build.gradle

@@ -4,6 +4,8 @@ apply plugin: 'kotlin-android'
 
 apply plugin: 'kotlin-android-extensions'
 
+apply from: "$rootDir/versions.gradle"
+
 android {
     compileSdkVersion 28
     defaultConfig {
@@ -12,7 +14,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -39,19 +41,17 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.1'
-    implementation "com.google.android.gms:play-services-auth:16.0.1"
-    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation "com.google.android.material:material:$versions.material"
+    implementation "androidx.constraintlayout:constraintlayout:$versions.constraint_layout"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
+    implementation "com.google.android.gms:play-services-auth:$versions.auth"
 
     implementation project(':core')
-//    implementation 'com.github.LiveTyping.activity-binder:core:0.1.3'
+
     implementation project(':social:logincore')
     implementation project(':social:vk')
     implementation project(':social:facebook')
-    implementation project(':social:instagram')
     implementation project(':social:google')
 
     implementation project(':permission')

app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.USE_SIP" />
-    <uses-permission android:name="android.permission.BODY_SENSORS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.SEND_SMS" />
@@ -46,15 +46,6 @@
             android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_app_id" />
 
-        <!--Instagram-->
-        <meta-data
-            android:name="com.nikola.jakshic.instagramauth.ClientId"
-            android:value="99cc4be19d2449e6897c00089b1b0304" />
-
-        <meta-data
-            android:name="com.nikola.jakshic.instagramauth.RedirectUri"
-            android:value="https://livetyping.ru/" />
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.livetyping.activity_binder.provider"
@@ -65,7 +56,6 @@
                 android:resource="@xml/file_path" />
         </provider>
 
-
     </application>
 
 </manifest>

app/src/main/kotlin/com/livetyping/activitybinder/BinderExampleApplication.kt

@@ -2,33 +2,33 @@ package com.livetyping.activitybinder
 
 import android.app.Application
 import com.livetyping.facebook.FacebookInitializer
+import com.livetyping.google.GoogleInitializer
 import com.livetyping.images.ImagesBinder
-import com.livetyping.instagram.InstagramInitializer
 import com.livetyping.logincore.SocialLoginBinder
 import com.livetyping.permission.PermissionBinder
 import com.livetyping.vk.VkInitializer
 
 class BinderExampleApplication : Application() {
 
-    val socialLoginBinder: SocialLoginBinder by lazy {
+    val socialLoginBinder by lazy {
         SocialLoginBinder()
     }
 
-    val permissionBinder: PermissionBinder by lazy {
+    val permissionBinder by lazy {
         PermissionBinder()
     }
 
-    val testImagesBinder: ImagesBinder by lazy {
+    val testImagesBinder by lazy {
         ImagesBinder(applicationContext.packageName + ".provider", R.xml.file_path)
     }
 
     override fun onCreate() {
         super.onCreate()
-        socialLoginBinder.initializeNetworks(this,
-                listOf(
-                        VkInitializer(),
-                        FacebookInitializer(),
-                        InstagramInitializer()
-                ))
+        val socialsInitializers = listOf(
+            VkInitializer(),
+            FacebookInitializer(),
+            GoogleInitializer()
+        )
+        socialLoginBinder.initializeNetworks(this, socialsInitializers)
     }
 }

app/src/main/kotlin/com/livetyping/activitybinder/ImageBinderActivity.kt

@@ -47,7 +47,10 @@ class ImageBinderActivity : AppCompatActivity() {
         }
 
         default_photo.setOnClickListener {
-            permissionBinder.activePermission(Manifest.permission.CAMERA, getString(R.string.need_camera_permission)) {
+            permissionBinder.activePermission(
+                Manifest.permission.CAMERA,
+                getString(R.string.need_camera_permission)
+            ) {
                 if (it) {
                     val request = PhotoRequestDefaultPath()
                     requestAndBindImage(request)
@@ -56,17 +59,24 @@ class ImageBinderActivity : AppCompatActivity() {
         }
 
         cahche_path_photo.setOnClickListener {
-            permissionBinder.activePermission(Manifest.permission.CAMERA, getString(R.string.need_camera_permission)) {
+            permissionBinder.activePermission(
+                Manifest.permission.CAMERA,
+                getString(R.string.need_camera_permission)
+            ) {
                 if (it) {
-                    val request = PhotoRequestCachePath("cache_files")
+                    val request = PhotoRequestCachePath("cache_files", maxFileSize = 1000000)
                     requestAndBindImage(request)
                 }
             }
         }
 
         external_cahce_path_photo.setOnClickListener {
-            val permissions = listOf(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-            permissionBinder.activePermission(permissions, getString(R.string.need_camera_and_external_storage_permission)) {
+            val permissions =
+                listOf(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+            permissionBinder.activePermission(
+                permissions,
+                getString(R.string.need_camera_and_external_storage_permission)
+            ) {
                 if (it.all { it.value }) {
                     val request = PhotoRequestExternalCachePath("external_app_cache_path")
                     requestAndBindImage(request)
@@ -75,8 +85,12 @@ class ImageBinderActivity : AppCompatActivity() {
         }
 
         external_files_path_photo.setOnClickListener {
-            val permissions = listOf(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-            permissionBinder.activePermission(permissions, getString(R.string.need_camera_and_external_storage_permission)) {
+            val permissions =
+                listOf(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+            permissionBinder.activePermission(
+                permissions,
+                getString(R.string.need_camera_and_external_storage_permission)
+            ) {
                 if (it.all { it.value }) {
                     val request = PhotoRequestExternalFilesPath("external_app_files_path")
                     requestAndBindImage(request)
@@ -85,8 +99,12 @@ class ImageBinderActivity : AppCompatActivity() {
         }
 
         external_path_photo.setOnClickListener {
-            val permissions = listOf(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-            permissionBinder.activePermission(permissions, getString(R.string.need_camera_and_external_storage_permission)) {
+            val permissions =
+                listOf(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+            permissionBinder.activePermission(
+                permissions,
+                getString(R.string.need_camera_and_external_storage_permission)
+            ) {
                 if (it.all { it.value }) {
                     val request = PhotoRequestExternalPath("external_files")
                     requestAndBindImage(request)
@@ -95,8 +113,12 @@ class ImageBinderActivity : AppCompatActivity() {
         }
 
         files_path_photo.setOnClickListener {
-            val permissions = listOf(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-            permissionBinder.activePermission(permissions, getString(R.string.need_camera_and_external_storage_permission)) {
+            val permissions =
+                listOf(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+            permissionBinder.activePermission(
+                permissions,
+                getString(R.string.need_camera_and_external_storage_permission)
+            ) {
                 if (it.all { it.value }) {
                     val request = PhotoRequestFilesPath("images")
                     requestAndBindImage(request)
@@ -120,13 +142,17 @@ class ImageBinderActivity : AppCompatActivity() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         imagesBinder.onActivityResult(requestCode, resultCode, data, this)
-        permissionBinder.onActivityResult(requestCode, data, this)
+        permissionBinder.onActivityResult(requestCode, this)
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         imagesBinder.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        permissionBinder.onRequestPermissionResult(requestCode, grantResults)
+        permissionBinder.onRequestPermissionResult(requestCode)
     }
 
     private fun requestAndBindImage(request: ImageRequest<out File>) {