From 77490477382926fd1e704e0ee414e22e59560183 Mon Sep 17 00:00:00 2001
From: Emmanuel <emmanuelbendavid@gmail.com>
Date: Mon, 28 Aug 2017 18:17:39 -0300
Subject: [PATCH 1/3] Moved AppConfig to utils.application

---
 app/src/main/AndroidManifest.xml                               | 2 +-
 .../java/com/amaze/filemanager/activities/BasicActivity.java   | 2 +-
 .../main/java/com/amaze/filemanager/filesystem/FileUtil.java   | 2 +-
 .../java/com/amaze/filemanager/fragments/MainFragment.java     | 3 +--
 .../fragments/preference_fragments/FoldersPref.java            | 2 +-
 .../java/com/amaze/filemanager/services/ExtractService.java    | 2 +-
 .../com/amaze/filemanager/services/asynctasks/MoveFiles.java   | 2 +-
 app/src/main/java/com/amaze/filemanager/utils/DataUtils.java   | 1 +
 .../amaze/filemanager/utils/{ => application}/AppConfig.java   | 3 ++-
 .../main/java/com/amaze/filemanager/utils/files/CryptUtil.java | 3 ---
 .../com/amaze/filemanager/utils/files/GenericCopyUtil.java     | 3 +--
 .../java/com/amaze/filemanager/activities/MainActivity.java    | 2 +-
 12 files changed, 12 insertions(+), 15 deletions(-)
 rename app/src/main/java/com/amaze/filemanager/utils/{ => application}/AppConfig.java (98%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9145cfdbc..974e49f2c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,7 +45,7 @@
         android:required="false" />
 
     <application
-        android:name=".utils.AppConfig"
+        android:name=".utils.application.AppConfig"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         tools:replace="android:label"
diff --git a/app/src/main/java/com/amaze/filemanager/activities/BasicActivity.java b/app/src/main/java/com/amaze/filemanager/activities/BasicActivity.java
index 0a4da8c38..2fbefeae6 100644
--- a/app/src/main/java/com/amaze/filemanager/activities/BasicActivity.java
+++ b/app/src/main/java/com/amaze/filemanager/activities/BasicActivity.java
@@ -2,7 +2,7 @@ package com.amaze.filemanager.activities;
 
 import android.support.v7.app.AppCompatActivity;
 
-import com.amaze.filemanager.utils.AppConfig;
+import com.amaze.filemanager.utils.application.AppConfig;
 import com.amaze.filemanager.utils.color.ColorPreference;
 import com.amaze.filemanager.utils.files.Futils;
 import com.amaze.filemanager.utils.provider.UtilitiesProviderInterface;
diff --git a/app/src/main/java/com/amaze/filemanager/filesystem/FileUtil.java b/app/src/main/java/com/amaze/filemanager/filesystem/FileUtil.java
index c6a1947f8..054696d24 100644
--- a/app/src/main/java/com/amaze/filemanager/filesystem/FileUtil.java
+++ b/app/src/main/java/com/amaze/filemanager/filesystem/FileUtil.java
@@ -20,7 +20,7 @@ import com.amaze.filemanager.activities.MainActivity;
 import com.amaze.filemanager.database.CloudHandler;
 import com.amaze.filemanager.exceptions.RootNotPermittedException;
 import com.amaze.filemanager.ui.icons.MimeTypes;
-import com.amaze.filemanager.utils.AppConfig;
+import com.amaze.filemanager.utils.application.AppConfig;
 import com.amaze.filemanager.utils.DataUtils;
 import com.amaze.filemanager.utils.OTGUtil;
 import com.amaze.filemanager.utils.OpenMode;
diff --git a/app/src/main/java/com/amaze/filemanager/fragments/MainFragment.java b/app/src/main/java/com/amaze/filemanager/fragments/MainFragment.java
index 843f05024..d721ec448 100644
--- a/app/src/main/java/com/amaze/filemanager/fragments/MainFragment.java
+++ b/app/src/main/java/com/amaze/filemanager/fragments/MainFragment.java
@@ -24,7 +24,6 @@ package com.amaze.filemanager.fragments;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
-import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -91,7 +90,7 @@ import com.amaze.filemanager.ui.icons.MimeTypes;
 import com.amaze.filemanager.ui.views.DividerItemDecoration;
 import com.amaze.filemanager.ui.views.FastScroller;
 import com.amaze.filemanager.ui.views.RoundedImageView;
-import com.amaze.filemanager.utils.AppConfig;
+import com.amaze.filemanager.utils.application.AppConfig;
 import com.amaze.filemanager.utils.DataUtils;
 import com.amaze.filemanager.utils.GenericFileProvider;
 import com.amaze.filemanager.utils.MainActivityHelper;
diff --git a/app/src/main/java/com/amaze/filemanager/fragments/preference_fragments/FoldersPref.java b/app/src/main/java/com/amaze/filemanager/fragments/preference_fragments/FoldersPref.java
index 38d88f388..1540c74d9 100644
--- a/app/src/main/java/com/amaze/filemanager/fragments/preference_fragments/FoldersPref.java
+++ b/app/src/main/java/com/amaze/filemanager/fragments/preference_fragments/FoldersPref.java
@@ -18,7 +18,7 @@ import com.amaze.filemanager.R;
 import com.amaze.filemanager.activities.PreferencesActivity;
 import com.amaze.filemanager.database.UtilsHandler;
 import com.amaze.filemanager.ui.views.preference.PathSwitchPreference;
-import com.amaze.filemanager.utils.AppConfig;
+import com.amaze.filemanager.utils.application.AppConfig;
 import com.amaze.filemanager.utils.DataUtils;
 import com.amaze.filemanager.utils.SimpleTextWatcher;
 import com.amaze.filemanager.utils.color.ColorUsage;
diff --git a/app/src/main/java/com/amaze/filemanager/services/ExtractService.java b/app/src/main/java/com/amaze/filemanager/services/ExtractService.java
index e175a8970..42eb112b0 100644
--- a/app/src/main/java/com/amaze/filemanager/services/ExtractService.java
+++ b/app/src/main/java/com/amaze/filemanager/services/ExtractService.java
@@ -38,7 +38,7 @@ import android.util.Log;
 import com.amaze.filemanager.R;
 import com.amaze.filemanager.activities.MainActivity;
 import com.amaze.filemanager.filesystem.FileUtil;
-import com.amaze.filemanager.utils.AppConfig;
+import com.amaze.filemanager.utils.application.AppConfig;
 import com.amaze.filemanager.utils.DataPackage;
 import com.amaze.filemanager.utils.files.GenericCopyUtil;
 import com.amaze.filemanager.utils.ProgressHandler;
diff --git a/app/src/main/java/com/amaze/filemanager/services/asynctasks/MoveFiles.java b/app/src/main/java/com/amaze/filemanager/services/asynctasks/MoveFiles.java
index cdaf8b648..4c280d1d0 100644
--- a/app/src/main/java/com/amaze/filemanager/services/asynctasks/MoveFiles.java
+++ b/app/src/main/java/com/amaze/filemanager/services/asynctasks/MoveFiles.java
@@ -30,7 +30,7 @@ import com.amaze.filemanager.exceptions.RootNotPermittedException;
 import com.amaze.filemanager.filesystem.BaseFile;
 import com.amaze.filemanager.fragments.MainFragment;
 import com.amaze.filemanager.services.CopyService;
-import com.amaze.filemanager.utils.AppConfig;
+import com.amaze.filemanager.utils.application.AppConfig;
 import com.amaze.filemanager.utils.DataUtils;
 import com.amaze.filemanager.utils.cloud.CloudUtil;
 import com.amaze.filemanager.utils.files.CryptUtil;
diff --git a/app/src/main/java/com/amaze/filemanager/utils/DataUtils.java b/app/src/main/java/com/amaze/filemanager/utils/DataUtils.java
index f93de5056..2e7c346c4 100644
--- a/app/src/main/java/com/amaze/filemanager/utils/DataUtils.java
+++ b/app/src/main/java/com/amaze/filemanager/utils/DataUtils.java
@@ -1,6 +1,7 @@
 package com.amaze.filemanager.utils;
 
 import com.amaze.filemanager.ui.drawer.Item;
+import com.amaze.filemanager.utils.application.AppConfig;
 import com.cloudrail.si.interfaces.CloudStorage;
 import com.cloudrail.si.services.Box;
 import com.cloudrail.si.services.Dropbox;
diff --git a/app/src/main/java/com/amaze/filemanager/utils/AppConfig.java b/app/src/main/java/com/amaze/filemanager/utils/application/AppConfig.java
similarity index 98%
rename from app/src/main/java/com/amaze/filemanager/utils/AppConfig.java
rename to app/src/main/java/com/amaze/filemanager/utils/application/AppConfig.java
index d90528c6a..038920a51 100644
--- a/app/src/main/java/com/amaze/filemanager/utils/AppConfig.java
+++ b/app/src/main/java/com/amaze/filemanager/utils/application/AppConfig.java
@@ -1,4 +1,4 @@
-package com.amaze.filemanager.utils;
+package com.amaze.filemanager.utils.application;
 
 import android.app.Application;
 import android.content.Context;
@@ -9,6 +9,7 @@ import android.os.StrictMode;
 import android.text.TextUtils;
 import android.widget.Toast;
 
+import com.amaze.filemanager.utils.LruBitmapCache;
 import com.amaze.filemanager.utils.provider.UtilitiesProvider;
 import com.amaze.filemanager.utils.provider.UtilitiesProviderInterface;
 import com.android.volley.Request;
diff --git a/app/src/main/java/com/amaze/filemanager/utils/files/CryptUtil.java b/app/src/main/java/com/amaze/filemanager/utils/files/CryptUtil.java
index 32f8defa1..ac412a8b5 100644
--- a/app/src/main/java/com/amaze/filemanager/utils/files/CryptUtil.java
+++ b/app/src/main/java/com/amaze/filemanager/utils/files/CryptUtil.java
@@ -9,14 +9,11 @@ import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
 import android.support.annotation.RequiresApi;
 import android.util.Base64;
-import android.util.Log;
 
-import com.amaze.filemanager.activities.MainActivity;
 import com.amaze.filemanager.exceptions.CryptException;
 import com.amaze.filemanager.filesystem.BaseFile;
 import com.amaze.filemanager.filesystem.FileUtil;
 import com.amaze.filemanager.filesystem.HFile;
-import com.amaze.filemanager.utils.AppConfig;
 import com.amaze.filemanager.utils.OpenMode;
 import com.amaze.filemanager.utils.ProgressHandler;
 import com.amaze.filemanager.utils.ServiceWatcherUtil;
diff --git a/app/src/main/java/com/amaze/filemanager/utils/files/GenericCopyUtil.java b/app/src/main/java/com/amaze/filemanager/utils/files/GenericCopyUtil.java
index 0fd3feff3..00eb928ea 100644
--- a/app/src/main/java/com/amaze/filemanager/utils/files/GenericCopyUtil.java
+++ b/app/src/main/java/com/amaze/filemanager/utils/files/GenericCopyUtil.java
@@ -9,8 +9,7 @@ import com.amaze.filemanager.R;
 import com.amaze.filemanager.filesystem.BaseFile;
 import com.amaze.filemanager.filesystem.FileUtil;
 import com.amaze.filemanager.filesystem.HFile;
-import com.amaze.filemanager.filesystem.RootHelper;
-import com.amaze.filemanager.utils.AppConfig;
+import com.amaze.filemanager.utils.application.AppConfig;
 import com.amaze.filemanager.utils.DataUtils;
 import com.amaze.filemanager.utils.OTGUtil;
 import com.amaze.filemanager.utils.OpenMode;
diff --git a/app/src/play/java/com/amaze/filemanager/activities/MainActivity.java b/app/src/play/java/com/amaze/filemanager/activities/MainActivity.java
index db2e40b5c..30e6aa771 100644
--- a/app/src/play/java/com/amaze/filemanager/activities/MainActivity.java
+++ b/app/src/play/java/com/amaze/filemanager/activities/MainActivity.java
@@ -122,7 +122,7 @@ import com.amaze.filemanager.ui.views.RoundedImageView;
 import com.amaze.filemanager.ui.views.ScrimInsetsRelativeLayout;
 import com.amaze.filemanager.ui.views.appbar.AppBar;
 import com.amaze.filemanager.ui.views.appbar.SearchView;
-import com.amaze.filemanager.utils.AppConfig;
+import com.amaze.filemanager.utils.application.AppConfig;
 import com.amaze.filemanager.utils.BookSorter;
 import com.amaze.filemanager.utils.DataUtils;
 import com.amaze.filemanager.utils.DataUtils.DataChangeListener;

From 5aecd8354ec8a482d404a638a4625667f6e2a2c5 Mon Sep 17 00:00:00 2001
From: Emmanuel <emmanuelbendavid@gmail.com>
Date: Mon, 28 Aug 2017 18:18:48 -0300
Subject: [PATCH 2/3] Added LeakCanary to track memory leaks

---
 app/build.gradle                              |  4 +++
 .../utils/application/AppConfig.java          |  4 +--
 .../application/LeakCanaryApplication.java    | 25 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/amaze/filemanager/utils/application/LeakCanaryApplication.java

diff --git a/app/build.gradle b/app/build.gradle
index 4edad9d98..c4309bd03 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -68,6 +68,10 @@ dependencies {
     compile 'com.android.support:palette-v7:25.3.1'
     compile 'com.android.support:cardview-v7:25.3.1'
 
+    //Detect memory leaks
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+
     compile 'org.apache.commons:commons-compress:1.10'
 
     // Google Play Services
diff --git a/app/src/main/java/com/amaze/filemanager/utils/application/AppConfig.java b/app/src/main/java/com/amaze/filemanager/utils/application/AppConfig.java
index 038920a51..2976692f1 100644
--- a/app/src/main/java/com/amaze/filemanager/utils/application/AppConfig.java
+++ b/app/src/main/java/com/amaze/filemanager/utils/application/AppConfig.java
@@ -18,10 +18,10 @@ import com.android.volley.toolbox.ImageLoader;
 import com.android.volley.toolbox.Volley;
 
 /**
- * Created by vishal on 7/12/16.
+ * Created by vishal on 7/12/16 edited by Emmanuel Messulam<emmanuelbendavid@gmail.com>
  */
 
-public class AppConfig extends Application {
+public class AppConfig extends LeakCanaryApplication {
 
     public static final String TAG = AppConfig.class.getSimpleName();
 
diff --git a/app/src/main/java/com/amaze/filemanager/utils/application/LeakCanaryApplication.java b/app/src/main/java/com/amaze/filemanager/utils/application/LeakCanaryApplication.java
new file mode 100644
index 000000000..97034e69e
--- /dev/null
+++ b/app/src/main/java/com/amaze/filemanager/utils/application/LeakCanaryApplication.java
@@ -0,0 +1,25 @@
+package com.amaze.filemanager.utils.application;
+
+import android.app.Application;
+
+import com.squareup.leakcanary.LeakCanary;
+
+/**
+ * @author Emmanuel
+ *         on 28/8/2017, at 18:12.
+ */
+
+public class LeakCanaryApplication extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        LeakCanary.install(this);
+    }
+
+}
\ No newline at end of file

From 5d4b5788b805631fe5d63868a6417863187de753 Mon Sep 17 00:00:00 2001
From: Emmanuel <emmanuelbendavid@gmail.com>
Date: Mon, 28 Aug 2017 23:00:24 -0300
Subject: [PATCH 3/3] Travis jumbo crash solution

---
 app/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index c4309bd03..130372414 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,10 @@ android {
     compileSdkVersion 25
     buildToolsVersion '25.0.3'
 
+    dexOptions {
+        jumboMode = true
+    }
+
     packagingOptions {
         exclude 'proguard-project.txt'
         exclude 'project.properties'