From 71de6872d5b77e387aad0e4f818371b83bed1381 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 15 Mar 2017 14:11:16 +0300 Subject: [PATCH 1/3] fix permissons --- app/build.gradle | 9 ++---- .../activities/MainActivity.java | 29 ++----------------- .../activities/SettingsActivity.java | 25 ++-------------- 3 files changed, 8 insertions(+), 55 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2d77c70..b0e8f10 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,11 +43,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.github.axet:android-audio-library:0.0.10' // compile project(':android-audio-library') - debugCompile 'com.github.axet:libogg:1.3.2-2:debug@aar' - debugCompile 'com.github.axet:libvorbis:1.3.5-2:debug@aar' - debugCompile 'com.github.axet:vorbis:1.0.0-2:debug@aar' - releaseCompile 'com.github.axet:libogg:1.3.2-2:release@aar' - releaseCompile 'com.github.axet:libvorbis:1.3.5-2:release@aar' - releaseCompile 'com.github.axet:vorbis:1.0.0-2:release@aar' + //compile 'com.github.axet:android-audio-library:0.0.11' + 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 450b18e..650deeb 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 @@ -99,7 +99,7 @@ public class MainActivity extends AppCompatActivity { list.setAdapter(recordings); list.setEmptyView(findViewById(R.id.empty_list)); - if (permitted()) { + if (Storage.permitted(MainActivity.this, PERMISSIONS, 1)) { storage.migrateLocalStorage(); } } @@ -158,7 +158,7 @@ public class MainActivity extends AppCompatActivity { return; } - if (permitted(PERMISSIONS)) + if (Storage.permitted(this, PERMISSIONS)) recordings.load(); else recordings.load(); @@ -208,7 +208,7 @@ public class MainActivity extends AppCompatActivity { super.onRequestPermissionsResult(requestCode, permissions, grantResults); switch (requestCode) { case 1: - if (permitted(permissions)) { + if (Storage.permitted(MainActivity.this, permissions)) { storage.migrateLocalStorage(); recordings.load(); checkPending(); @@ -222,29 +222,6 @@ public class MainActivity extends AppCompatActivity { public static final String[] PERMISSIONS = new String[]{READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}; - boolean permitted(String[] ss) { - if (Build.VERSION.SDK_INT < 16) - return true; - for (String s : ss) { - if (ContextCompat.checkSelfPermission(this, s) != PackageManager.PERMISSION_GRANTED) { - return false; - } - } - return true; - } - - boolean permitted() { - if (Build.VERSION.SDK_INT < 16) - return true; - for (String s : PERMISSIONS) { - if (ContextCompat.checkSelfPermission(this, s) != PackageManager.PERMISSION_GRANTED) { - ActivityCompat.requestPermissions(this, PERMISSIONS, 1); - return false; - } - } - return true; - } - @Override public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); 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 00af027..7bb735c 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 @@ -94,12 +94,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha } else { // For all other preferences, set the summary to the value's // simple string representation. - if (key.equals(MainApplication.PREFERENCE_STORAGE)) { // if storage is disabled, show local path - Storage storage = new Storage(preference.getContext()); - preference.setSummary(storage.getStoragePath().toString()); - } else { - preference.setSummary(stringValue); - } + preference.setSummary(stringValue); } return true; } @@ -146,7 +141,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha if (Build.VERSION.SDK_INT < 11) { addPreferencesFromResource(R.xml.pref_general); - bindPreferenceSummaryToValue(findPreference(MainApplication.PREFERENCE_STORAGE)); ListPreference enc = (ListPreference) findPreference(MainApplication.PREFERENCE_ENCODING); String v = enc.getValue(); @@ -229,7 +223,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha super.onRequestPermissionsResult(requestCode, permissions, grantResults); switch (requestCode) { case 1: - if (permitted(this, permissions)) + if (Storage.permitted(this, permissions)) ; else Toast.makeText(this, R.string.not_permitted, Toast.LENGTH_SHORT).show(); @@ -238,17 +232,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha public static final String[] PERMISSIONS = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}; - public static boolean permitted(Context context, String[] ss) { - if (Build.VERSION.SDK_INT < 16) - return true; - for (String s : ss) { - if (ContextCompat.checkSelfPermission(context, s) != PackageManager.PERMISSION_GRANTED) { - return false; - } - } - return true; - } - @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { if (key.equals(MainApplication.PREFERENCE_THEME)) { @@ -286,11 +269,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha addPreferencesFromResource(R.xml.pref_general); setHasOptionsMenu(true); - if (!permitted(getActivity(), PERMISSIONS)) { + if (!Storage.permitted(getActivity(), PERMISSIONS)) { Preference p = findPreference(MainApplication.PREFERENCE_STORAGE); getPreferenceScreen().removePreference(p); - } else { - bindPreferenceSummaryToValue(findPreference(MainApplication.PREFERENCE_STORAGE)); } ListPreference enc = (ListPreference) findPreference(MainApplication.PREFERENCE_ENCODING); From 3d34559dc9172128329be68270ba5dce85e923ee Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 15 Mar 2017 14:23:47 +0300 Subject: [PATCH 2/3] update storage permissions --- app/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b0e8f10..9006e44 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,6 +43,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - //compile 'com.github.axet:android-audio-library:0.0.11' - compile project(':android-audio-library') + compile 'com.github.axet:android-audio-library:0.0.13' // compile project(':android-audio-library') } From f0d8ca159d8648c34e1c52463cd2580cac0c416d Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 15 Mar 2017 14:24:10 +0300 Subject: [PATCH 3/3] Bump version audiorecorder-1.4.11 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9006e44..4f243d0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 23 - versionCode 112 - versionName "1.4.10" + versionCode 113 + versionName "1.4.11" } signingConfigs { release {