diff --git a/app/build.gradle b/app/build.gradle index 7a6ec12..eaa3060 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,15 +2,15 @@ apply plugin: 'com.android.application' apply plugin: 'com.github.axet.dxplugin' android { - compileSdkVersion 25 + compileSdkVersion 29 buildToolsVersion '28.0.3' defaultConfig { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 29 - versionCode 349 - versionName "3.3.24" + versionCode 350 + versionName "3.4.0" } signingConfigs { release { @@ -54,6 +54,6 @@ android { dependencies { testImplementation 'junit:junit:4.12' implementation 'com.github.axet:android-audio-library:1.0.178' // implementation project(':android-audio-library') - implementation ('com.github.axet:wget:1.6.1') { exclude group: 'org.json', module: 'json' } + implementation ('com.github.axet:wget:1.7.0') { exclude group: 'org.json', module: 'json' } assets('com.google.android.exoplayer:exoplayer:2.7.3') { exclude group: 'com.android.support' } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8bb58f8..bd59451 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,11 +19,13 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/RecThemeLight"> + = 16 && icon.notification.bigContentView != null) { + a = new RemoteViews(getPackageName(), icon.notification.bigContentView.getLayoutId()); a.setTextViewText(R.id.title, title); - RemoteViewsCompat.mergeRemoteViews(icon.notification.contentView, a); - if (Build.VERSION.SDK_INT >= 16 && icon.notification.bigContentView != null) { - a = new RemoteViews(getPackageName(), icon.notification.bigContentView.getLayoutId()); - a.setTextViewText(R.id.title, title); - RemoteViewsCompat.mergeRemoteViews(icon.notification.bigContentView, a); - } - return icon.notification; - } catch (RuntimeException e) { - Log.d(TAG, "merge failed", e); + RemoteViewsCompat.mergeRemoteViews(icon.notification.bigContentView, a); } + return icon.notification; + } catch (RuntimeException e) { + Log.d(TAG, "merge failed", e); } } - text = ".../" + targetFile; - builder = new RemoteNotificationCompat.Builder(context, R.layout.notifictaion); - builder.setViewVisibility(R.id.notification_record, View.GONE); - builder.setViewVisibility(R.id.notification_pause, View.VISIBLE); - main = PendingIntent.getService(context, 0, new Intent(context, RecordingService.class) - .setAction(SHOW_ACTIVITY) - .putExtra("targetFile", targetFile) - .putExtra("recording", recording), PendingIntent.FLAG_UPDATE_CURRENT); } + text = ".../" + targetFile; + builder = new RemoteNotificationCompat.Builder(context, R.layout.notifictaion); + builder.setViewVisibility(R.id.notification_record, View.GONE); + builder.setViewVisibility(R.id.notification_pause, View.VISIBLE); + main = PendingIntent.getService(context, 0, new Intent(context, RecordingService.class) + .setAction(SHOW_ACTIVITY) + .putExtra("targetFile", targetFile) + .putExtra("recording", recording), PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent pe = PendingIntent.getService(context, 0, new Intent(context, RecordingService.class).setAction(PAUSE_BUTTON), diff --git a/build.gradle b/build.gradle index 8e6ffc2..9696088 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.0.2' classpath 'com.github.axet:gradle-android-dx:0.0.4' } }