From 50da14022f7b686d1636e53e4af4a8d9f278345e Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sun, 9 Oct 2016 11:47:30 -0400
Subject: [PATCH] Fix bug that prevented ringtone from being saved

---
 .../uhabits/activities/BaseActivity.java      |  4 +--
 .../isoron/uhabits/utils/RingtoneUtils.java   | 26 ++++++++-----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java b/app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java
index 65b2f8682..2a92a0ff0 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/BaseActivity.java
@@ -133,8 +133,8 @@ abstract public class BaseActivity extends AppCompatActivity
     @Override
     protected void onActivityResult(int request, int result, Intent data)
     {
-        if (screen == null) return;
-        screen.onResult(request, result, data);
+        if (screen == null) super.onActivityResult(request, result, data);
+        else screen.onResult(request, result, data);
     }
 
     @Override
diff --git a/app/src/main/java/org/isoron/uhabits/utils/RingtoneUtils.java b/app/src/main/java/org/isoron/uhabits/utils/RingtoneUtils.java
index 96f8bce38..c6a3b4a30 100644
--- a/app/src/main/java/org/isoron/uhabits/utils/RingtoneUtils.java
+++ b/app/src/main/java/org/isoron/uhabits/utils/RingtoneUtils.java
@@ -29,6 +29,8 @@ import android.support.v4.app.*;
 
 import org.isoron.uhabits.*;
 
+import static android.media.RingtoneManager.*;
+
 public abstract class RingtoneUtils
 {
     @Nullable
@@ -42,8 +44,7 @@ public abstract class RingtoneUtils
 
             if (ringtoneUri != null)
             {
-                Ringtone ringtone =
-                    RingtoneManager.getRingtone(context, ringtoneUri);
+                Ringtone ringtone = getRingtone(context, ringtoneUri);
                 if (ringtone != null)
                 {
                     ringtoneName = ringtone.getTitle(context);
@@ -80,8 +81,7 @@ public abstract class RingtoneUtils
     {
         if (data == null) return;
 
-        Uri ringtoneUri =
-            data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
+        Uri ringtoneUri = data.getParcelableExtra(EXTRA_RINGTONE_PICKED_URI);
 
         if (ringtoneUri != null)
         {
@@ -104,19 +104,15 @@ public abstract class RingtoneUtils
     public static void startRingtonePickerActivity(Fragment fragment,
                                                    int requestCode)
     {
-        Uri existingRingtoneUri =
-            getRingtoneUri(fragment.getContext());
+        Uri existingRingtoneUri = getRingtoneUri(fragment.getContext());
         Uri defaultRingtoneUri = Settings.System.DEFAULT_NOTIFICATION_URI;
 
-        Intent intent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER);
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE,
-            RingtoneManager.TYPE_NOTIFICATION);
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true);
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true);
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI,
-            defaultRingtoneUri);
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI,
-            existingRingtoneUri);
+        Intent intent = new Intent(ACTION_RINGTONE_PICKER);
+        intent.putExtra(EXTRA_RINGTONE_TYPE, TYPE_NOTIFICATION);
+        intent.putExtra(EXTRA_RINGTONE_SHOW_DEFAULT, true);
+        intent.putExtra(EXTRA_RINGTONE_SHOW_SILENT, true);
+        intent.putExtra(EXTRA_RINGTONE_DEFAULT_URI, defaultRingtoneUri);
+        intent.putExtra(EXTRA_RINGTONE_EXISTING_URI, existingRingtoneUri);
         fragment.startActivityForResult(intent, requestCode);
     }
 }