From 579f4ed4a67bf930a1855953dff95a065180135e Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <axet@me.com>
Date: Tue, 30 Apr 2019 09:00:57 +0300
Subject: [PATCH] add exoloader

---
 .gitignore                                                | 1 +
 app/build.gradle                                          | 2 +-
 .../axet/audiorecorder/activities/MainActivity.java       | 8 +++++++-
 .../github/axet/audiorecorder/app/AudioApplication.java   | 4 ++--
 build.gradle                                              | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3489ea..add5c38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /build
 /captures
 android-library
+app/src/main/assets/*.dex
diff --git a/app/build.gradle b/app/build.gradle
index e90595c..811fa5b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,6 +53,6 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    implementation 'com.github.axet:android-audio-library:1.0.150' // implementation project(':android-audio-library')
+    implementation 'com.github.axet:android-audio-library:1.0.151' // implementation project(':android-audio-library')
     assets('com.google.android.exoplayer:exoplayer:2.7.3') { exclude group: 'com.android.support' }
 }
diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
index c6fd13f..96798b6 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
@@ -118,6 +118,12 @@ public class MainActivity extends AppCompatThemeActivity {
         receiver.registerReceiver(this);
 
         RecordingService.startIfPending(this);
+
+        try {
+            new Recordings.ExoLoader(this, false);
+        } catch (Exception e) {
+            Log.e(TAG, "error", e);
+        }
     }
 
     void checkPending() {
@@ -204,7 +210,7 @@ public class MainActivity extends AppCompatThemeActivity {
 
         try {
             storage.migrateLocalStorage();
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             ErrorDialog.Error(this, e);
         }
 
diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java b/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java
index 7d7ac6d..e0b9d5d 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java
@@ -29,9 +29,9 @@ import com.github.axet.audiolibrary.encoders.FormatFLAC;
 import com.github.axet.audiolibrary.encoders.FormatM4A;
 import com.github.axet.audiolibrary.encoders.FormatOGG;
 import com.github.axet.audiolibrary.encoders.OnFlyEncoding;
+import com.github.axet.audiorecorder.BuildConfig;
 import com.github.axet.audiorecorder.R;
 import com.github.axet.audiorecorder.activities.MainActivity;
-import com.github.axet.audiorecorder.services.RecordingService;
 
 import java.io.File;
 import java.nio.ShortBuffer;
@@ -192,7 +192,7 @@ public class AudioApplication extends com.github.axet.audiolibrary.app.MainAppli
                     }
 
                     PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-                    PowerManager.WakeLock wlcpu = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, RecordingService.class.getCanonicalName() + "_cpulock");
+                    PowerManager.WakeLock wlcpu = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":recordinglock");
                     wlcpu.acquire();
 
                     android.os.Process.setThreadPriority(Process.THREAD_PRIORITY_AUDIO);
diff --git a/build.gradle b/build.gradle
index 3251deb..6345f44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'com.github.axet:gradle-android-dx:0.0.4'
     }
 }