diff options
4 files changed, 16 insertions, 7 deletions
diff --git a/app/build.gradle b/app/build.gradle index a87ba2b1..22bb95fa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { defaultConfig { applicationId "github.daneren2005.dsub" - minSdkVersion 14 + minSdkVersion 15 targetSdkVersion 26 versionCode 202 versionName '5.4.4' diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/MainFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/MainFragment.java index e7c7f1fb..0d7e8af1 100644 --- a/app/src/main/java/github/daneren2005/dsub/fragments/MainFragment.java +++ b/app/src/main/java/github/daneren2005/dsub/fragments/MainFragment.java @@ -380,11 +380,18 @@ public class MainFragment extends SelectRecyclerFragment<Integer> { footer += "\nLogs: " + logcat; footer += "\nBuild Number: " + packageInfo.versionCode; - Intent email = new Intent(Intent.ACTION_SENDTO, - Uri.fromParts("mailto", "dsub.android@gmail.com", null)); - email.putExtra(Intent.EXTRA_SUBJECT, "DSub " + packageInfo.versionName + " Error Logs"); - email.putExtra(Intent.EXTRA_TEXT, "Describe the problem here\n\n\n" + footer); - startActivity(email); + + Intent selectorIntent = new Intent(Intent.ACTION_SENDTO); + selectorIntent.setData(Uri.parse("mailto:")); + + final Intent emailIntent = new Intent(Intent.ACTION_SEND); + emailIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{"dsub.android@gmail.com"}); + emailIntent.putExtra(Intent.EXTRA_SUBJECT, "DSub " + packageInfo.versionName + " Error Logs"); + emailIntent.putExtra(Intent.EXTRA_TEXT, "Describe the problem here\n\n\n" + footer); + emailIntent.setSelector( selectorIntent ); + + startActivity(Intent.createChooser(emailIntent, "Send log...")); + } }.execute(); } catch(Exception e) {} diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectYearFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectYearFragment.java index 14237d22..ce1e5548 100644 --- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectYearFragment.java +++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectYearFragment.java @@ -21,6 +21,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import java.util.ArrayList; +import java.util.Calendar; import java.util.List; import github.daneren2005.dsub.R; @@ -53,7 +54,7 @@ public class SelectYearFragment extends SelectRecyclerFragment<String> { @Override public List<String> getObjects(MusicService musicService, boolean refresh, ProgressListener listener) throws Exception { List<String> decades = new ArrayList<>(); - for(int i = 2010; i >= 1800; i -= 10) { + for(int i = (int)(Math.ceil(Calendar.getInstance().get(Calendar.YEAR) / 10) * 10); i >= 1800; i -= 10) { decades.add(String.valueOf(i)); } diff --git a/app/src/main/java/github/daneren2005/dsub/util/Util.java b/app/src/main/java/github/daneren2005/dsub/util/Util.java index 791fea91..c1581a26 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/Util.java +++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java @@ -1340,6 +1340,7 @@ public final class Util { audioFocusRequest = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN) .setAudioAttributes(playbackAttributes) .setOnAudioFocusChangeListener(getAudioFocusChangeListener(context, audioManager)) + .setWillPauseWhenDucked(true) .build(); audioManager.requestAudioFocus(audioFocusRequest); } |