diff --git a/app/build.gradle b/app/build.gradle index a51c119..28e30b0 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.62' // compile project(':android-audio-library') + compile 'com.github.axet:android-audio-library:1.0.63' // compile 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 e56100d..7af6ae2 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 @@ -223,8 +223,8 @@ public class MainActivity extends AppCompatActivity { int getLastRecording(String last) { final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this); for (int i = 0; i < recordings.getCount(); i++) { - Uri f = recordings.getItem(i); - if (Storage.getDocumentName(f).equals(last)) { + Storage.RecordingUri f = recordings.getItem(i); + if (f.name.equals(last)) { SharedPreferences.Editor edit = shared.edit(); edit.putString(MainApplication.PREFERENCE_LAST, ""); edit.commit(); diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java index c2aa307..e00911f 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java @@ -244,6 +244,7 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere bindPreferenceSummaryToValue(pm.findPreference(MainApplication.PREFERENCE_THEME)); bindPreferenceSummaryToValue(pm.findPreference(MainApplication.PREFERENCE_CHANNELS)); bindPreferenceSummaryToValue(pm.findPreference(MainApplication.PREFERENCE_FORMAT)); + StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) pm.findPreference(MainApplication.PREFERENCE_STORAGE); s.setStorage(new Storage(getContext())); s.setPermissionsDialog(this, PERMISSIONS, 1); @@ -276,11 +277,7 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere switch (requestCode) { case 1: - if (Storage.permitted(getContext(), permissions)) - ; - else - Toast.makeText(getContext(), R.string.not_permitted, Toast.LENGTH_SHORT).show(); - s.onRequestPermissionsResult(); + s.onRequestPermissionsResult(permissions, grantResults); break; } } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7173490..20b7f0b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -21,7 +21,6 @@ Stereo - Nicht erlaubt Keine App zur Anzeige von Ordnern installiert pausieren (bei Anruf) aufnehmen diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9368a33..c974c24 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -21,7 +21,6 @@ Stéréo - Non autorisé Aucune application installé pour visionner le dossier pause (hold by call) enregistrement diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 190c429..a1dcce1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -21,7 +21,6 @@ Stereo - Non permesso Nessuna app per la visione delle cartelle risulta installa pausa (per chiamata) registrando diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6af902f..d90212d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -21,7 +21,6 @@ ステレオ - 許可されていません フォルダーを表示するアプリケーションがインストールされていません 一時停止 (着信により保留) 録音中 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8690b5d..c68cc8f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -21,7 +21,6 @@ Estéreo - Não permitido Não foi encontrado um aplicativo para explorar arquivos pausado (chamada atendida) gravando diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7eedbc0..006c733 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -21,7 +21,6 @@ Стерео - Доступ запрещен Программа для просмотра папок не установлена пауза (звонок) запись diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 2496504..40fd579 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -21,7 +21,6 @@ Stereo - Nepovolené Nie je nainštalovaná žiadna aplikácia na zobrazenie obsahu priečinka pozastavené (automaticky počas hovoru) nahrávanie diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 23b0c4c..5813def 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -53,7 +53,6 @@ %I - Not permitted No folder view application installed pause (hold by call) recording diff --git a/build.gradle b/build.gradle index d04ccba..b7b69e8 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.0.1' } }