bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanups

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-12-15 13:53:49 +03:00
commit e251fbaa8b
5 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -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.70' // compile project(':android-audio-library')
compile 'com.github.axet:android-audio-library:1.0.71' // compile project(':android-audio-library')
}

2
app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
View file

@ -37,8 +37,6 @@ import com.github.axet.audiorecorder.services.RecordingService;
public class MainActivity extends AppCompatActivity {
public final static String TAG = MainActivity.class.getSimpleName();
public static final String[] PERMISSIONS = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
FloatingActionButton fab;
Handler handler = new Handler();

2
app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
View file

@ -964,7 +964,7 @@ public class RecordingActivity extends AppCompatActivity {
finish();
}
});
builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();

10
app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java
View file

@ -26,6 +26,7 @@ import android.widget.ProgressBar;
import android.widget.Toast;
import com.github.axet.androidlibrary.widgets.NameFormatPreferenceCompat;
import com.github.axet.androidlibrary.widgets.OpenFileDialog;
import com.github.axet.androidlibrary.widgets.SilencePreferenceCompat;
import com.github.axet.androidlibrary.widgets.StoragePathPreferenceCompat;
import com.github.axet.androidlibrary.widgets.ThemeUtils;
@ -53,8 +54,6 @@ import java.util.List;
*/
public class SettingsActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener, PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback {
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();
@ -178,11 +177,6 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
|| GeneralPreferenceFragment.class.getName().equals(fragmentName);
}
@Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if (key.equals(MainApplication.PREFERENCE_THEME)) {
@ -261,7 +255,7 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) pm.findPreference(MainApplication.PREFERENCE_STORAGE);
s.setStorage(new Storage(getContext()));
s.setPermissionsDialog(this, PERMISSIONS, RESULT_STORAGE);
s.setPermissionsDialog(this, OpenFileDialog.PERMISSIONS_RW, RESULT_STORAGE);
if (Build.VERSION.SDK_INT >= 21)
s.setStorageAccessFramework(this, RESULT_STORAGE);
}

8
app/src/main/java/com/github/axet/audiorecorder/app/Storage.java
View file

@ -12,10 +12,6 @@ import java.util.Date;
public class Storage extends com.github.axet.audiolibrary.app.Storage {
public Storage(Context context) {
super(context);
}
public static String getFormatted(String format, Date date) {
format = format.replaceAll("%s", SIMPLE.format(date));
format = format.replaceAll("%I", ISO8601.format(date));
@ -23,6 +19,10 @@ public class Storage extends com.github.axet.audiolibrary.app.Storage {
return format;
}
public Storage(Context context) {
super(context);
}
public Uri getNewFile() {
SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(context);
String ext = shared.getString(MainApplication.PREFERENCE_ENCODING, "");