isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 17:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug that prevented ringtone from being saved

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-10-09 11:47:30 -04:00
parent 84a02fe541
commit 50da14022f
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java
View File

@@ -133,8 +133,8 @@ abstract public class BaseActivity extends AppCompatActivity
@Override @Override
protected void onActivityResult(int request, int result, Intent data) protected void onActivityResult(int request, int result, Intent data)
{ {
if (screen == null) return; if (screen == null) super.onActivityResult(request, result, data);
screen.onResult(request, result, data); else screen.onResult(request, result, data);
} }
@Override @Override

26
app/src/main/java/org/isoron/uhabits/utils/RingtoneUtils.java
View File

@@ -29,6 +29,8 @@ import android.support.v4.app.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import static android.media.RingtoneManager.*;
public abstract class RingtoneUtils public abstract class RingtoneUtils
{ {
@Nullable @Nullable
@@ -42,8 +44,7 @@ public abstract class RingtoneUtils
if (ringtoneUri != null) if (ringtoneUri != null)
{ {
Ringtone ringtone = Ringtone ringtone = getRingtone(context, ringtoneUri);
RingtoneManager.getRingtone(context, ringtoneUri);
if (ringtone != null) if (ringtone != null)
{ {
ringtoneName = ringtone.getTitle(context); ringtoneName = ringtone.getTitle(context);
@@ -80,8 +81,7 @@ public abstract class RingtoneUtils
{ {
if (data == null) return; if (data == null) return;
Uri ringtoneUri = Uri ringtoneUri = data.getParcelableExtra(EXTRA_RINGTONE_PICKED_URI);
data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
if (ringtoneUri != null) if (ringtoneUri != null)
{ {
@@ -104,19 +104,15 @@ public abstract class RingtoneUtils
public static void startRingtonePickerActivity(Fragment fragment, public static void startRingtonePickerActivity(Fragment fragment,
int requestCode) int requestCode)
{ {
Uri existingRingtoneUri = Uri existingRingtoneUri = getRingtoneUri(fragment.getContext());
getRingtoneUri(fragment.getContext());
Uri defaultRingtoneUri = Settings.System.DEFAULT_NOTIFICATION_URI; Uri defaultRingtoneUri = Settings.System.DEFAULT_NOTIFICATION_URI;
Intent intent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER); Intent intent = new Intent(ACTION_RINGTONE_PICKER);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, intent.putExtra(EXTRA_RINGTONE_TYPE, TYPE_NOTIFICATION);
RingtoneManager.TYPE_NOTIFICATION); intent.putExtra(EXTRA_RINGTONE_SHOW_DEFAULT, true);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true); intent.putExtra(EXTRA_RINGTONE_SHOW_SILENT, true);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true); intent.putExtra(EXTRA_RINGTONE_DEFAULT_URI, defaultRingtoneUri);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI, intent.putExtra(EXTRA_RINGTONE_EXISTING_URI, existingRingtoneUri);
defaultRingtoneUri);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI,
existingRingtoneUri);
fragment.startActivityForResult(intent, requestCode); fragment.startActivityForResult(intent, requestCode);
} }
} }