diff --git a/app/build.gradle b/app/build.gradle index 1d5b807..ec273fc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 26 - versionCode 293 - versionName "3.2.35" + versionCode 294 + versionName "3.2.36" } signingConfigs { release { @@ -57,5 +57,5 @@ android { dependencies { testImplementation 'junit:junit:4.12' - implementation 'com.github.axet:android-audio-library:1.0.136' // implementation project(':android-audio-library') + implementation 'com.github.axet:android-audio-library:1.0.138' // implementation project(':android-audio-library') } 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 54fcead..38ff02f 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 @@ -24,6 +24,7 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; +import com.github.axet.androidlibrary.app.SuperUser; import com.github.axet.androidlibrary.services.StorageProvider; import com.github.axet.androidlibrary.widgets.AboutPreferenceCompat; import com.github.axet.androidlibrary.widgets.AppCompatThemeActivity; @@ -298,14 +299,7 @@ public class MainActivity extends AppCompatThemeActivity { } public void Error(Throwable e) { - String msg = e.getMessage(); - if (msg == null || msg.isEmpty()) { - Throwable t = e; - while (t.getCause() != null) - t = t.getCause(); - msg = t.getClass().getSimpleName(); - } - Error(msg); + Error(SuperUser.toMessage(e)); } public void Error(String msg) { diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java index 093796f..eaf3c7e 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java @@ -29,6 +29,7 @@ import android.widget.TextView; import android.widget.Toast; import com.github.axet.androidlibrary.animations.MarginBottomAnimation; +import com.github.axet.androidlibrary.app.SuperUser; import com.github.axet.androidlibrary.sound.AudioTrack; import com.github.axet.androidlibrary.widgets.AppCompatThemeActivity; import com.github.axet.androidlibrary.widgets.OpenFileDialog; @@ -202,23 +203,15 @@ public class RecordingActivity extends AppCompatThemeActivity { } public String toMessage(Throwable e) { - String msg = e.getMessage(); - if (msg == null || msg.isEmpty()) { - Throwable t; - if (encoder == null) { + Throwable t; + if (encoder == null) { + t = e; + } else { + t = encoder.getException(); + if (t == null) t = e; - } else { - t = encoder.getException(); - if (t == null) - t = e; - } - while (t.getCause() != null) - t = t.getCause(); - msg = t.getMessage(); - if (msg == null || msg.isEmpty()) - msg = t.getClass().getSimpleName(); } - return msg; + return SuperUser.toMessage(t); } public void Error(Throwable e) { diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java index c5c766e..6bcdbf0 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java @@ -14,10 +14,10 @@ import android.os.Bundle; import android.os.IBinder; import android.preference.PreferenceManager; import android.support.annotation.Nullable; -import android.support.v4.app.NotificationManagerCompat; import android.util.Log; import android.view.View; +import com.github.axet.androidlibrary.app.NotificationManagerCompat; import com.github.axet.androidlibrary.widgets.OptimizationPreferenceCompat; import com.github.axet.androidlibrary.widgets.ProximityShader; import com.github.axet.androidlibrary.widgets.RemoteNotificationCompat;