From e3db48a1c43d21f3eb73ef91ab5b64a4524fa968 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 25 Apr 2018 12:25:13 +0300 Subject: [PATCH 1/6] req call perms --- .../activities/SettingsActivity.java | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) 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 1129e9a..a970b8a 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 @@ -22,6 +22,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceFragmentCompat; import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; +import android.support.v7.preference.SwitchPreferenceCompat; import android.view.MenuItem; import android.widget.ProgressBar; import android.widget.SeekBar; @@ -60,9 +61,12 @@ import java.util.List; public class SettingsActivity extends AppCompatSettingsThemeActivity implements PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback { public static final int RESULT_STORAGE = 1; + public static final int RESULT_CALL = 2; Handler handler = new Handler(); + public static String[] PREMS = new String[]{Manifest.permission.READ_PHONE_STATE}; + public static T[] removeElement(Class c, T[] aa, int i) { List ll = Arrays.asList(aa); ll = new ArrayList<>(ll); @@ -273,6 +277,19 @@ public class SettingsActivity extends AppCompatSettingsThemeActivity implements bluetooth.setVisible(false); } bindPreferenceSummaryToValue(bluetooth); + + Preference p = pm.findPreference(MainApplication.PREFERENCE_CALL); + p.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + boolean b = (boolean) newValue; + if (b) { + if (!Storage.permitted(GeneralPreferenceFragment.this, PREMS, RESULT_CALL)) + return false; + } + return true; + } + }); } @Override @@ -295,22 +312,25 @@ public class SettingsActivity extends AppCompatSettingsThemeActivity implements @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); - StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) findPreference(MainApplication.PREFERENCE_STORAGE); - switch (requestCode) { case RESULT_STORAGE: s.onRequestPermissionsResult(permissions, grantResults); break; + case RESULT_CALL: + SwitchPreferenceCompat p = (SwitchPreferenceCompat) findPreference(MainApplication.PREFERENCE_CALL); + if (!Storage.permitted(getContext(), PREMS)) + p.setChecked(false); + else + p.setChecked(true); + break; } } @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) findPreference(MainApplication.PREFERENCE_STORAGE); - switch (requestCode) { case RESULT_STORAGE: s.onActivityResult(resultCode, data); From 72f041b872faea62dc1a3ffa0b5094ba26e6fe4f Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sun, 29 Apr 2018 20:26:49 +0300 Subject: [PATCH 2/6] update gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ee6e1ca..2f3eb7f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.1' + classpath 'com.android.tools.build:gradle:3.1.2' } } From 3815d5d8e923a2e53e9bafb7aa0ac5253bc52622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20V=C3=A1gner?= Date: Wed, 9 May 2018 09:26:47 +0200 Subject: [PATCH 3/6] Updated slovak language file --- app/src/main/res/values-sk/strings.xml | 28 ++++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index f8278f7..8cd5fe2 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -12,13 +12,13 @@ - Mic + Mikrofón Bluetooth - Theme Svetlá - Theme Tmavá + Svetlý vzhľad + Tmavý vzhľad @@ -37,7 +37,9 @@ Pozastavené... Nahrávanie Otvoriť priečinok s nahrávkami - Zoznam nahrávok je prázdny\n\nZačnite klepnutím na tlačidlo Nahrávať + Zoznam nahrávok je prázdny\n + \n + Začnite klepnutím na tlačidlo Nahrávať Nahrávať Odstrihnúť Zastaviť @@ -57,13 +59,13 @@ Prepnúť zariadenie do tichého režimu počas nahrávania Tlačidlá na uzamikacej obrazovke Zobraziť ovládacie prvky na zamikacej obrazovke - Téma - Farebná téma aplikácie (svetlá / tmavá) - Application - Recordings - Encoding on Fly - Encoding on fly disable editing, and crash recovery - pause (bluetooth disconnected) - Search - Save as WAV + Vzhľad + Farebný vzhľad aplikácie (svetlý / tmavý) + Aplikácia + Nahrávky + Kódovať v reálnom čase + Neumožňuje úpravy a obnovenie nahrávky po páde + Pozastavené (odpojené bluetooth) + Hľadať + Uložiť vo formáte WAV From e4fa50e9fd56d62767844823c35f4b025a0ed93b Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 14 May 2018 16:59:06 +0300 Subject: [PATCH 4/6] cleanups --- app/build.gradle | 13 ++++++++----- build.gradle | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8a5b592..314dba6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,12 +42,15 @@ android { output.outputFileName = org.apache.commons.io.FilenameUtils.getExtension(android.defaultConfig.applicationId) + "-" + abi + "-" + android.defaultConfig.versionName + "-" + variant.buildType.name + ".apk" } } - splits { + bundle { + language { + enableSplit = false + } + density { + enableSplit = true + } abi { - enable true - reset() - include "x86", "x86_64", "armeabi-v7a", "arm64-v8a", "mips", "mips64" - universalApk true + enableSplit = true } } } diff --git a/build.gradle b/build.gradle index 2f3eb7f..36c67b3 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.0-alpha14' } } From 9301da617f7166f44bb8c4546a5e2829ec6e51e4 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 16 May 2018 09:45:07 +0300 Subject: [PATCH 5/6] fix external crash --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 314dba6..626775e 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.99' // implementation project(':android-audio-library') + implementation 'com.github.axet:android-audio-library:1.0.102' // implementation project(':android-audio-library') } From fe6306961436f6e489ab00d2abbc320516429d3f Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 16 May 2018 09:45:15 +0300 Subject: [PATCH 6/6] Bump version audiorecorder-3.2.5 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 626775e..98c921e 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 261 - versionName "3.2.4" + versionCode 262 + versionName "3.2.5" } signingConfigs { release {