From 236b18e718cb0a3eb7c0de4990a752aae1d17163 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 10 Jul 2018 18:27:59 +0300
Subject: restart on storage permission granted

---
 org.fox.ttcomics/build.gradle                            |  1 +
 org.fox.ttcomics/org.fox.ttcomics.iml                    | 16 ++++++++++++++++
 .../src/main/java/org/fox/ttcomics2/MainActivity.java    |  9 ++++-----
 3 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'org.fox.ttcomics')

diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle
index 859c49e..6e2aa47 100755
--- a/org.fox.ttcomics/build.gradle
+++ b/org.fox.ttcomics/build.gradle
@@ -56,4 +56,5 @@ dependencies {
     compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'
     compile 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
     compile files('libs/nineoldandroids-2.4.0.jar')
+
 }
diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index c1d4932..42cd1d9 100755
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -84,18 +84,34 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
index a6bd9a3..778e161 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
@@ -82,7 +82,7 @@ public class MainActivity extends CommonActivity implements SharedPreferences.On
 
 		m_progressDialog = new ProgressDialog(this);
 
-		FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+		FloatingActionButton fab = findViewById(R.id.fab);
 
 		if (m_prefs.getBoolean("enable_fab", true)) {
 			fab.setOnClickListener(new View.OnClickListener() {
@@ -97,7 +97,7 @@ public class MainActivity extends CommonActivity implements SharedPreferences.On
 
 		m_adapter = new ComicsPagerAdapter(getSupportFragmentManager());
 
-		m_pager = (ViewPager) findViewById(R.id.comics_pager);
+		m_pager = findViewById(R.id.comics_pager);
 		m_pager.setAdapter(m_adapter);
 		m_pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 			@Override
@@ -217,11 +217,10 @@ public class MainActivity extends CommonActivity implements SharedPreferences.On
 					}
 
 					if (needRestart) {
-						android.os.Process.killProcess(android.os.Process.myPid());
+						finish();
+						startActivity(getIntent());
 					}
 				}
-
-				return;
 		}
 	}
 
-- 
cgit v1.2.3