From a9a2d29cfaf63ef825e52373f31ac0395b95b41a Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <axet@me.com>
Date: Sun, 5 Nov 2017 19:26:20 +0300
Subject: [PATCH] add file providers

---
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              |  2 +-
 .../activities/MainActivity.java              | 20 +++++--------------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 505dc38..9da5ba2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bb5985c..89fcfdc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -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>
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 4647d31..e56100d 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
@@ -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) {