diff --git a/app/build.gradle b/app/build.gradle
index bf2a535..8f1cc97 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,5 +57,5 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    implementation 'com.github.axet:android-audio-library:1.0.131' // implementation project(':android-audio-library')
+    implementation 'com.github.axet:android-audio-library:1.0.132' // 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 fe3c7d1..2f3a36c 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
@@ -135,9 +135,9 @@ public class MainActivity extends AppCompatThemeActivity {
             menu.findItem(R.id.action_settings).setVisible(false);
 
         MenuItem item = menu.findItem(R.id.action_show_folder);
-        Intent intent = StorageProvider.getProvider().openFolderIntent(storage.getStoragePath());
+        Intent intent = StorageProvider.openFolderIntent(this, storage.getStoragePath());
         item.setIntent(intent);
-        if (!StorageProvider.isFolderCallable(this, intent, StorageProvider.getProvider().getAuthority()))
+        if (!StorageProvider.isCallable(this, intent, StorageProvider.getProvider().getAuthority()))
             item.setVisible(false);
 
         MenuItem search = menu.findItem(R.id.action_search);
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 1e2e12b..3d86efd 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
@@ -296,8 +296,6 @@ public class RecordingActivity extends AppCompatThemeActivity {
         receiver.filter.addAction(ACTION_FINISH_RECORDING);
         receiver.registerReceiver(this);
 
-        edit(false, false);
-
         final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
         AudioApplication app = AudioApplication.from(this);
 
@@ -315,6 +313,8 @@ public class RecordingActivity extends AppCompatThemeActivity {
             return;
         }
 
+        edit(false, false);
+
         title.setText(Storage.getDocumentName(recording.targetUri));
 
         if (shared.getBoolean(AudioApplication.PREFERENCE_CALL, false)) {
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 9e66fae..81d96af 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
@@ -18,6 +18,7 @@ import android.support.v4.app.NotificationManagerCompat;
 import android.util.Log;
 import android.view.View;
 
+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;
@@ -76,11 +77,11 @@ public class RecordingService extends Service {
     }
 
     public static void start(Context context) {
-        MainApplication.startService(context, new Intent(context, RecordingService.class));
+        OptimizationPreferenceCompat.startService(context, new Intent(context, RecordingService.class));
     }
 
     public static void startService(Context context, String targetFile, boolean recording, boolean encoding, String duration) {
-        MainApplication.startService(context, new Intent(context, RecordingService.class)
+        OptimizationPreferenceCompat.startService(context, new Intent(context, RecordingService.class)
                 .putExtra("targetFile", targetFile)
                 .putExtra("recording", recording)
                 .putExtra("encoding", encoding)