From c5bcc912118d574584a7470f0b8f6d558010554b Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Thu, 10 Aug 2017 16:49:11 +0300 Subject: [PATCH 1/2] get tree --- .../activities/MainActivity.java | 2 +- .../services/OnBootReceiver.java | 2 +- .../services/OnExternalReceiver.java | 2 +- .../services/OnUpgradeReceiver.java | 2 +- .../services/RecordingService.java | 22 ++++++++++++++----- 5 files changed, 21 insertions(+), 9 deletions(-) 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 db8ad44..08e997d 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 @@ -123,7 +123,7 @@ public class MainActivity extends AppCompatActivity { list.setEmptyView(findViewById(R.id.empty_list)); recordings.setToolbar((ViewGroup) findViewById(R.id.recording_toolbar)); - RecordingService.startIfEnabled(this); + RecordingService.startIfPending(this); IntentFilter ff = new IntentFilter(); ff.addAction(Intent.ACTION_SCREEN_OFF); diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/OnBootReceiver.java b/app/src/main/java/com/github/axet/audiorecorder/services/OnBootReceiver.java index e07c680..c0496bd 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/OnBootReceiver.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/OnBootReceiver.java @@ -11,6 +11,6 @@ public class OnBootReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent i) { Log.d(TAG, "onReceive"); - RecordingService.startIfEnabledPending(context); + RecordingService.startIfPending(context); } } diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/OnExternalReceiver.java b/app/src/main/java/com/github/axet/audiorecorder/services/OnExternalReceiver.java index 47a77de..64910ff 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/OnExternalReceiver.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/OnExternalReceiver.java @@ -29,6 +29,6 @@ public class OnExternalReceiver extends BroadcastReceiver { if (!isExternal(context)) return; - RecordingService.startIfEnabledPending(context); + RecordingService.startIfPending(context); } } diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/OnUpgradeReceiver.java b/app/src/main/java/com/github/axet/audiorecorder/services/OnUpgradeReceiver.java index a92f189..83bd360 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/OnUpgradeReceiver.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/OnUpgradeReceiver.java @@ -14,6 +14,6 @@ public class OnUpgradeReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { Log.d(TAG, "onReceive"); - RecordingService.startIfEnabledPending(context); + RecordingService.startIfPending(context); } } 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 58aec36..56307bf 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 @@ -5,6 +5,7 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; import android.content.BroadcastReceiver; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -54,13 +55,24 @@ public class RecordingService extends Service { start(context); } - public static void startIfEnabledPending(Context context) { - Storage s = new Storage(context); - if (s.recordingPending()) { + public static void startIfPending(Context context) { + Storage st = new Storage(context); + if (st.recordingPending()) { final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(context); String f = shared.getString(MainApplication.PREFERENCE_TARGET, ""); - File file = new File(f); - startService(context, file.getName(), false, false); + String d; + Uri u = Uri.parse(f); + String s = u.getScheme(); + if (s.equals(ContentResolver.SCHEME_CONTENT)) { + d = Storage.getDocumentName(u); + } else if (s.equals(ContentResolver.SCHEME_FILE)) { + File file = new File(u.getPath()); + d = file.getName(); + } else { + File file = new File(f); + d = file.getName(); + } + startService(context, d, false, false); return; } startIfEnabled(context); From 79d3676ea7009d87491fbc6023f2158bcecb5297 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Thu, 10 Aug 2017 16:49:19 +0300 Subject: [PATCH 2/2] Bump version audiorecorder-3.0.34 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dc2a4b8..a603652 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 23 - versionCode 198 - versionName "3.0.33" + versionCode 199 + versionName "3.0.34" } signingConfigs { release {