bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'audiorecorder-3.2.37'

Browse source
This commit is contained in:
Alexey Kuznetsov 2018-12-07 14:59:57 +03:00
commit 9c38916d32
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -10,8 +10,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 26
versionCode 294
versionName "3.2.36"
versionCode 295
versionName "3.2.37"
}
signingConfigs {
release {
@ -57,5 +57,5 @@ android {
dependencies {
testImplementation 'junit:junit:4.12'
implementation 'com.github.axet:android-audio-library:1.0.138' // implementation project(':android-audio-library')
implementation 'com.github.axet:android-audio-library:1.0.139' // implementation project(':android-audio-library')
}

2
app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java
View file

@ -14,11 +14,11 @@ import android.os.Build;
import android.os.Handler;
import android.os.PowerManager;
import android.os.Process;
import android.support.v4.app.NotificationManagerCompat;
import android.support.v7.preference.PreferenceManager;
import android.util.Log;
import android.view.View;
import com.github.axet.androidlibrary.app.NotificationManagerCompat;
import com.github.axet.androidlibrary.widgets.NotificationChannelCompat;
import com.github.axet.androidlibrary.widgets.RemoteNotificationCompat;
import com.github.axet.audiolibrary.app.RawSamples;

6
app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java
View file

@ -10,8 +10,8 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.IBinder;
import android.os.TransactionTooLargeException;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.util.Log;
@ -21,7 +21,6 @@ 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;
import com.github.axet.audiolibrary.app.MainApplication;
import com.github.axet.audiolibrary.app.Storage;
import com.github.axet.audiorecorder.R;
import com.github.axet.audiorecorder.activities.MainActivity;
@ -240,8 +239,9 @@ public class RecordingService extends Service {
Notification n = build(intent);
if (notification == null) {
startForeground(NOTIFICATION_RECORDING_ICON, n);
} else
} else {
nm.notify(NOTIFICATION_RECORDING_ICON, n);
}
notification = n;
notificationIntent = intent;
}