diff --git a/app/build.gradle b/app/build.gradle
index ceaed27..44e396d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 26
- versionCode 324
- versionName "3.2.66"
+ versionCode 325
+ versionName "3.3.0"
}
signingConfigs {
release {
@@ -53,6 +53,6 @@ android {
dependencies {
testImplementation 'junit:junit:4.12'
- implementation 'com.github.axet:android-audio-library:1.0.159' // implementation project(':android-audio-library')
+ implementation 'com.github.axet:android-audio-library:1.0.162' // implementation project(':android-audio-library')
assets('com.google.android.exoplayer:exoplayer:2.7.3') { exclude group: 'com.android.support' }
}
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 71bcb99..060080b 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
@@ -178,27 +178,27 @@ public class MainActivity extends AppCompatThemeActivity {
}
});
+ recordings.onCreateOptionsMenu(menu);
+
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
- int id = item.getItemId();
-
- if (id == R.id.action_settings) {
- startActivity(new Intent(this, SettingsActivity.class));
+ if (recordings.onOptionsItemSelected(this, item))
return true;
- }
- if (id == R.id.action_about) {
- AboutPreferenceCompat.showDialog(this, R.raw.about);
- return true;
- }
-
- if (id == R.id.action_show_folder) {
- Intent intent = item.getIntent();
- startActivity(intent);
- return true;
+ switch (item.getItemId()) {
+ case R.id.action_settings:
+ startActivity(new Intent(this, SettingsActivity.class));
+ return true;
+ case R.id.action_about:
+ AboutPreferenceCompat.showDialog(this, R.raw.about);
+ return true;
+ case R.id.action_show_folder:
+ Intent intent = item.getIntent();
+ startActivity(intent);
+ return true;
}
return super.onOptionsItemSelected(item);
diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
index c738a76..c93debd 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
@@ -506,9 +506,8 @@ public class RecordingActivity extends AppCompatThemeActivity {
start = false;
stopRecording(getString(R.string.recording_status_pause));
}
- if (a != null && a.equals(ERROR)) {
+ if (a != null && a.equals(ERROR))
muted = new ErrorDialog(this, intent.getStringExtra("msg")).setTitle(intent.getStringExtra("title")).show();
- }
}
@Override
diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java b/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java
index 12bd475..8475715 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java
@@ -399,7 +399,7 @@ public class AudioApplication extends com.github.axet.audiolibrary.app.MainAppli
else
edit.putString(AudioApplication.PREFERENCE_ENCODING, FormatFLAC.EXT);
}
- edit.putInt(PREFERENCE_VERSION, 3);
+ edit.putInt(PREFERENCE_VERSION, 4);
edit.commit();
break;
case 0:
@@ -412,6 +412,9 @@ public class AudioApplication extends com.github.axet.audiolibrary.app.MainAppli
case 2:
version_2_to_3();
break;
+ case 3:
+ version_3_to_4();
+ break;
}
}
@@ -468,4 +471,13 @@ public class AudioApplication extends com.github.axet.audiolibrary.app.MainAppli
edit.putInt(PREFERENCE_VERSION, 3);
edit.commit();
}
+
+ @SuppressLint("RestrictedApi")
+ void version_3_to_4() {
+ SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
+ SharedPreferences.Editor edit = shared.edit();
+ edit.remove(PREFERENCE_SORT);
+ edit.putInt(PREFERENCE_VERSION, 4);
+ edit.commit();
+ }
}
diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/Recordings.java b/app/src/main/java/com/github/axet/audiorecorder/app/Recordings.java
index 53ebb15..a4b54c4 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/app/Recordings.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/app/Recordings.java
@@ -5,14 +5,11 @@ import android.net.Uri;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
-import android.widget.ListView;
import android.widget.TextView;
import com.github.axet.androidlibrary.widgets.ErrorDialog;
import com.github.axet.audiorecorder.R;
-import java.util.ArrayList;
-
public class Recordings extends com.github.axet.audiolibrary.app.Recordings {
public View progressEmpty;
public TextView progressText;
diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/TileService.java b/app/src/main/java/com/github/axet/audiorecorder/services/TileService.java
index 37bc4c0..f6fc58b 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/services/TileService.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/services/TileService.java
@@ -38,6 +38,8 @@ public class TileService extends android.service.quicksettings.TileService {
void updateTile() {
Tile tile = getQsTile();
+ if (tile == null)
+ return; // some broken devices has tile == null within onStartListening()
if (AudioApplication.from(this).recording != null) {
tile.setIcon(Icon.createWithResource(this, R.drawable.ic_stop_black_24dp));
tile.setLabel(getString(R.string.tile_stop_recording));
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 2fe9746..d43d689 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -5,22 +5,44 @@
-
+
+