From c9d30fa2870e48d095fc76fb3f162a9ffee65d1b Mon Sep 17 00:00:00 2001
From: Erik Eelde <erik.eelde@gmail.com>
Date: Wed, 15 Nov 2017 16:32:24 +0100
Subject: [PATCH 1/4] Remove permisio permission requesting

---
 .../app/PermisoPermissionActivity.java        | 49 -------------------
 .../app/PermissionRequestingActivity.java     |  2 -
 .../layout/activity_permission_requesting.xml | 16 +-----
 3 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 app/src/main/java/se/eelde/granter/app/PermisoPermissionActivity.java

diff --git a/app/src/main/java/se/eelde/granter/app/PermisoPermissionActivity.java b/app/src/main/java/se/eelde/granter/app/PermisoPermissionActivity.java
deleted file mode 100644
index e460166..0000000
--- a/app/src/main/java/se/eelde/granter/app/PermisoPermissionActivity.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package se.eelde.granter.app;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.Intent;
-import android.databinding.DataBindingUtil;
-import android.os.Bundle;
-
-import com.greysonparrelli.permiso.Permiso;
-import com.greysonparrelli.permiso.PermisoActivity;
-
-import se.eelde.granter.app.databinding.ActivityPermisoPermissionBinding;
-
-public class PermisoPermissionActivity extends PermisoActivity {
-
-    private ActivityPermisoPermissionBinding binding;
-
-    public static void start(Context context) {
-        context.startActivity(new Intent(context, PermisoPermissionActivity.class));
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_regular_permission);
-        binding = DataBindingUtil.setContentView(this, R.layout.activity_permiso_permission);
-
-        Permiso.getInstance().setActivity(this);
-
-        binding.permisoPermission.setOnClickListener(view -> Permiso.getInstance().requestPermissions(new Permiso.IOnPermissionResult() {
-            @Override
-            public void onPermissionResult(Permiso.ResultSet resultSet) {
-                moveToNextStep();
-            }
-
-            @Override
-            public void onRationaleRequested(Permiso.IOnRationaleProvided callback, String... permissions) {
-                Permiso.getInstance().showRationaleInDialog("Title", "Message", null, callback);
-            }
-        }, Manifest.permission.ACCESS_FINE_LOCATION));
-    }
-
-    private void moveToNextStep() {
-        getSupportFragmentManager()
-                .beginTransaction()
-                .replace(binding.fragmentContainer.getId(), DummyFragment.newInstance())
-                .commit();
-    }
-}
diff --git a/app/src/main/java/se/eelde/granter/app/PermissionRequestingActivity.java b/app/src/main/java/se/eelde/granter/app/PermissionRequestingActivity.java
index 1212fa2..09208c0 100644
--- a/app/src/main/java/se/eelde/granter/app/PermissionRequestingActivity.java
+++ b/app/src/main/java/se/eelde/granter/app/PermissionRequestingActivity.java
@@ -29,8 +29,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         binding.regularPermission.setOnClickListener(view -> RegularPermissionActivity.start(this));
 
-        binding.buttonPermisoPermission.setOnClickListener(view -> PermisoPermissionActivity.start(this));
-
         binding.permission1Button.setOnClickListener(view -> new Granter.Builder(this)
                 .requestCode(RC_CAMERA)
                 .addPermission(Manifest.permission.CAMERA)
diff --git a/app/src/main/res/layout/activity_permission_requesting.xml b/app/src/main/res/layout/activity_permission_requesting.xml
index 5480229..bdb32e1 100644
--- a/app/src/main/res/layout/activity_permission_requesting.xml
+++ b/app/src/main/res/layout/activity_permission_requesting.xml
@@ -29,8 +29,7 @@
             android:text="@string/permission_1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/button_permiso_permission" />
-
+            app:layout_constraintTop_toBottomOf="@+id/regular_permission" />
 
         <Button
             android:id="@+id/permission_2_button"
@@ -67,18 +66,5 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/permission_multiple_button" />
 
-        <Button
-            android:id="@+id/button_permiso_permission"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:text="Permiso permission"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/regular_permission" />
-
-
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

From c5ab50a7ef10ca461a311608372dc588255865ac Mon Sep 17 00:00:00 2001
From: Erik Eelde <erik.eelde@gmail.com>
Date: Wed, 15 Nov 2017 16:32:47 +0100
Subject: [PATCH 2/4] Bump dependencies

---
 app/build.gradle     | 11 +++++------
 build.gradle         |  2 +-
 granter/build.gradle | 10 +++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dc00fe6..5bde107 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.1'
+    compileSdkVersion 27
+    buildToolsVersion '26.0.2'
     dataBinding {
         enabled = true
     }
     defaultConfig {
         applicationId "se.eelde.granter.app"
         minSdkVersion 17
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -27,9 +27,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:26.0.2'
+    implementation 'com.android.support:appcompat-v7:27.0.1'
+    implementation 'com.android.support:support-v4:27.0.1'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation project(path: ':granter')
-
-    compile 'com.greysonparrelli.permiso:permiso:0.3.0'
 }
diff --git a/build.gradle b/build.gradle
index 03ae81c..020eae2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta5'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/granter/build.gradle b/granter/build.gradle
index a8035b0..e9997a7 100644
--- a/granter/build.gradle
+++ b/granter/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    compileSdkVersion 27
+    buildToolsVersion "26.0.2"
 
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
 
@@ -23,7 +23,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:26.0.2'
+    implementation 'com.android.support:appcompat-v7:27.0.1'
 
-    api 'pub.devrel:easypermissions:1.0.0'
+    api 'pub.devrel:easypermissions:1.0.1'
 }

From 50db9ce95abe8ef95a9e922144c2e8727ed418c4 Mon Sep 17 00:00:00 2001
From: Erik Eelde <erik.eelde@gmail.com>
Date: Wed, 15 Nov 2017 16:33:44 +0100
Subject: [PATCH 3/4] Fix bug where rotation created multiple rationale dialogs

---
 granter/src/main/java/se/eelde/granter/Granter.java    |  2 +-
 .../main/java/se/eelde/granter/GranterFragment.java    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/granter/src/main/java/se/eelde/granter/Granter.java b/granter/src/main/java/se/eelde/granter/Granter.java
index bc14546..c1f8ef9 100644
--- a/granter/src/main/java/se/eelde/granter/Granter.java
+++ b/granter/src/main/java/se/eelde/granter/Granter.java
@@ -35,7 +35,7 @@ public static class Builder {
         private final FragmentManager fragmentManager;
         private final ArrayList<String> permissions = new ArrayList<>();
         private final Resources resources;
-        private int requestCode;
+        private int requestCode = 7896;
         private String rationale = null;
         private String systemSettingRationale = null;
 
diff --git a/granter/src/main/java/se/eelde/granter/GranterFragment.java b/granter/src/main/java/se/eelde/granter/GranterFragment.java
index 1320d8d..e466edc 100644
--- a/granter/src/main/java/se/eelde/granter/GranterFragment.java
+++ b/granter/src/main/java/se/eelde/granter/GranterFragment.java
@@ -58,10 +58,12 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         shouldHaveShownRationale = Stolen.shouldShowRationale(this, requestedPermissions);
 
         if (!EasyPermissions.hasPermissions(getContext(), requestedPermissions)) {
-            EasyPermissions.requestPermissions(this,
-                    rationale,
-                    RC_PERMISSIONS,
-                    requestedPermissions);
+            if (savedInstanceState == null) {
+                EasyPermissions.requestPermissions(this,
+                        rationale,
+                        RC_PERMISSIONS,
+                        requestedPermissions);
+            }
         } else {
             int[] ints = new int[requestedPermissions.length];
             Arrays.fill(ints, PackageManager.PERMISSION_GRANTED);

From 810cc776cc73f94c7d2d4b5e70277bba7ecd1382 Mon Sep 17 00:00:00 2001
From: Erik Eelde <erik.eelde@gmail.com>
Date: Wed, 15 Nov 2017 16:52:04 +0100
Subject: [PATCH 4/4] Add travis build configuration

Accept android licence agreement

Accept android licence agreement

Accept android licence agreement
---
 .travis.yml          | 28 ++++++++++++++++++++++++++++
 app/build.gradle     |  2 +-
 granter/build.gradle |  4 +---
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..4aaa807
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,28 @@
+language: android
+jdk: oraclejdk8
+
+android:
+  components:
+    - tools
+    - platform-tools
+
+before_install:
+  # Install SDK license so Android Gradle plugin can install deps.
+  - mkdir "$ANDROID_HOME/licenses" || true
+  - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - yes | sdkmanager tools
+
+
+script:
+  - ./gradlew check test
+
+sudo: false
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5bde107..49de559 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '26.0.2'
+
     dataBinding {
         enabled = true
     }
diff --git a/granter/build.gradle b/granter/build.gradle
index e9997a7..bcc3bdc 100644
--- a/granter/build.gradle
+++ b/granter/build.gradle
@@ -2,9 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "26.0.2"
-
-
+    
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27