diff --git a/app/build.gradle b/app/build.gradle index a51c119..acd43e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 23 // 24+ file:// unable to open - versionCode 221 - versionName "3.0.55" + versionCode 222 + versionName "3.0.56" } 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.62' // compile project(':android-audio-library') + compile 'com.github.axet:android-audio-library:1.0.65' // 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..44136d6 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 @@ -54,6 +54,8 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere public static final String[] PERMISSIONS = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}; + public static final int RESULT_STORAGE = 1; + Handler handler = new Handler(); public static T[] removeElement(Class c, T[] aa, int i) { @@ -244,11 +246,12 @@ 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); + s.setPermissionsDialog(this, PERMISSIONS, RESULT_STORAGE); if (Build.VERSION.SDK_INT >= 21) - s.setStorageAccessFramework(this, 2); + s.setStorageAccessFramework(this, RESULT_STORAGE); } @Override @@ -275,12 +278,8 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) findPreference(MainApplication.PREFERENCE_STORAGE); switch (requestCode) { - case 1: - if (Storage.permitted(getContext(), permissions)) - ; - else - Toast.makeText(getContext(), R.string.not_permitted, Toast.LENGTH_SHORT).show(); - s.onRequestPermissionsResult(); + case RESULT_STORAGE: + s.onRequestPermissionsResult(permissions, grantResults); break; } } @@ -292,7 +291,7 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) findPreference(MainApplication.PREFERENCE_STORAGE); switch (requestCode) { - case 2: + case RESULT_STORAGE: s.onActivityResult(resultCode, data); break; } diff --git a/app/src/main/res/raw-fr/about.html b/app/src/main/res/raw-fr/about.html index e3e5e85..cc00be7 100644 --- a/app/src/main/res/raw-fr/about.html +++ b/app/src/main/res/raw-fr/about.html @@ -15,7 +15,7 @@

Enregistreur Audio avec dossier d'enregistrement personnalisé, Indicateur de volume d'enregistrement agréable, notification d'enregistrement et avec écran vérouillé.

-
Lincense:
+
License:
GPLv3
Code Source:
https://gitlab.com/axet/android-audio-recorder diff --git a/app/src/main/res/raw/about.html b/app/src/main/res/raw/about.html index a414bbc..ceeb5fc 100644 --- a/app/src/main/res/raw/about.html +++ b/app/src/main/res/raw/about.html @@ -15,11 +15,10 @@

Audio Recorder with custom recording folder, nice recording volume indicator, recording notification, recording lock screen activity.

-
Lincense:
+
License:
GPLv3
Source Code:
-
https://gitlab.com/axet/android-audio-recorder -
+
https://gitlab.com/axet/android-audio-recorder
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7173490..692fa47 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 @@ -54,5 +53,5 @@ Steuerelemente im Sperrbildschirm Zeige Steuerelemente im Sperrbildschirm an App-Theme - Wähle App-Theme (dunkel / hell) + Wähle App-Theme (dunkel / hell) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9368a33..f5aa603 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 @@ -54,5 +53,5 @@ Contrôles écran éteint Montrez les contrôles quand le téléphone est vérrouillé Application du Theme - Appliquer le théme (Sombre | Blanc) + Appliquer le théme (Sombre | Blanc) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 190c429..19fac03 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 @@ -54,5 +53,5 @@ Controlli su schermo bloccato Mostra i controlli quando il cellulare è bloccato Tema applicazione - Imposta il tema dell'applicazione (scuro / chiaro) + Imposta il tema dell'applicazione (scuro / chiaro) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6af902f..124ea13 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -21,7 +21,6 @@ ステレオ - 許可されていません フォルダーを表示するアプリケーションがインストールされていません 一時停止 (着信により保留) 録音中 @@ -54,5 +53,5 @@ ロック画面コントロール 電話がロックされた時にコントロールを表示します アプリケーションのテーマ - アプリケーションのテーマを設定します (ダーク / ライト) + アプリケーションのテーマを設定します (ダーク / ライト) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8690b5d..f5da8b3 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 @@ -54,5 +53,5 @@ Controle da tela bloqueada Mostrar controles quando a tela estiver bloqueada Tema do app - Definir o tema (claro ou escuro) + Definir o tema (claro ou escuro) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7eedbc0..2c8ccd4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -21,7 +21,6 @@ Стерео - Доступ запрещен Программа для просмотра папок не установлена пауза (звонок) запись @@ -54,5 +53,5 @@ Панель управления Показывать панель управления когда телефон заблокирован Тема приложения - Установить тему приложения (темная / светлая) + Установить тему приложения (темная / светлая) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 2496504..cb41313 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 @@ -54,5 +53,5 @@ Tlačidlá na uzamikacej obrazovke Zobraziť ovládacie prvky na zamikacej obrazovke Téma - Farebná téma aplikácie (svetlá / tmavá) + Farebná téma aplikácie (svetlá / tmavá) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 23b0c4c..9455cdd 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 @@ -86,5 +85,5 @@ Lockscreen Controls Show controls when phone is locked Application Theme - Set application theme (dark / light) + Set application theme (dark / light) diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index b75b83d..c986730 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -71,7 +71,7 @@ android:key="theme" android:negativeButtonText="@null" android:positiveButtonText="@null" - android:summary="@string/pref_theme.summary" + android:summary="@string/pref_theme_summary" android:title="@string/pref_theme_title" /> 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' } } diff --git a/docs/HOWTO-Translate.md b/docs/HOWTO-Translate.md index fa187d2..c19a5d6 100644 --- a/docs/HOWTO-Translate.md +++ b/docs/HOWTO-Translate.md @@ -13,7 +13,7 @@ Additional file from 'android-audio-library' Also, add Google Play translation for: * Title (50 symbols max) - * Short Description (80 symbols max) + * Short description (80 symbols max) * Full description (4000 symbols max) -Then add those files to the repository using "New Issue" or "Merge Request" (GitLab's name for "Pull Request" if you come from GitHub) against the `dev` branch. +Then add those files to the repository using "New Issue" or "Merge Request" against the `dev` branch.