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

Merge branch 'audiorecorder-3.0.50'

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-11-06 09:20:36 +03:00
commit d4d39e3093
3 changed files with 9 additions and 19 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 24 // 25+ file:// unable to open
versionCode 215
versionName "3.0.49"
versionCode 216
versionName "3.0.50"
}
signingConfigs {
release {
@ -55,5 +55,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.github.axet:android-audio-library:1.0.51' // compile project(':android-audio-library')
compile 'com.github.axet:android-audio-library:1.0.52' // compile project(':android-audio-library')
}

2
app/src/main/AndroidManifest.xml
View file

@ -66,7 +66,7 @@
</receiver>
<provider
android:name="com.github.axet.audiolibrary.services.RecordingContentProvider"
android:name="com.github.axet.androidlibrary.services.StorageProvider"
android:authorities="com.github.axet.audiorecorder"
android:exported="false"
android:grantUriPermissions="true"></provider>

20
app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
View file

@ -3,7 +3,6 @@ package com.github.axet.audiorecorder.activities;
import android.Manifest;
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@ -11,18 +10,12 @@ import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.ParcelFileDescriptor;
import android.preference.PreferenceManager;
import android.provider.DocumentsContract;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.system.ErrnoException;
import android.system.Os;
import android.system.StructStatVfs;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@ -33,19 +26,14 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import com.github.axet.androidlibrary.services.StorageProvider;
import com.github.axet.androidlibrary.widgets.AboutPreferenceCompat;
import com.github.axet.androidlibrary.widgets.OptimizationPreferenceCompat;
import com.github.axet.audiolibrary.app.Recordings;
import com.github.axet.audiolibrary.app.Storage;
import com.github.axet.audiolibrary.services.RecordingContentProvider;
import com.github.axet.audiorecorder.R;
import com.github.axet.audiorecorder.app.MainApplication;
import com.github.axet.audiorecorder.services.RecordingService;
import java.io.File;
import java.io.FileNotFoundException;
import java.util.Collections;
public class MainActivity extends AppCompatActivity {
public final static String TAG = MainActivity.class.getSimpleName();
@ -147,9 +135,9 @@ public class MainActivity extends AppCompatActivity {
getMenuInflater().inflate(R.menu.menu_main, menu);
MenuItem item = menu.findItem(R.id.action_show_folder);
Intent intent = Storage.openFolderIntent(this, storage.getStoragePath(), null);
Intent intent = StorageProvider.openFolderIntent(this, storage.getStoragePath());
item.setIntent(intent);
if (!Storage.isFolderCallable(this, intent, RecordingContentProvider.getAuthority())) {
if (!StorageProvider.isFolderCallable(this, intent, StorageProvider.getAuthority())) {
item.setVisible(false);
}
@ -194,6 +182,8 @@ public class MainActivity extends AppCompatActivity {
return;
}
invalidateOptionsMenu(); // update storage folder intent
try {
storage.migrateLocalStorage();
} catch (RuntimeException e) {