ricky/location_ringer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the null pointer reported in #76

Browse Source 
closes #76

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
Ricky Barrette
2012-05-25 21:48:01 -04:00
parent 453aa185e1
commit 97699298a9
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/RingtoneFragment.java
View File

@@ -84,19 +84,13 @@ public class RingtoneFragment extends Fragment implements OnClickListener, OnSee
* @param uri of current tone * @param uri of current tone
* @author ricky barrette * @author ricky barrette
*/ */
private void getRingtoneURI(int ringtoneCode, String uri){ private void getRingtoneURI(final int ringtoneCode, final Uri uri){
final Intent intent = new Intent( RingtoneManager.ACTION_RINGTONE_PICKER); final Intent intent = new Intent( RingtoneManager.ACTION_RINGTONE_PICKER);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, ringtoneCode); intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, ringtoneCode);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, R.string.select_tone); intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, R.string.select_tone);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true); intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, false); intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, false);
if( uri == null) intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, uri);
try {
uri = RingtoneManager.getActualDefaultRingtoneUri(this.getActivity(), ringtoneCode).toString();
} catch (NullPointerException e) {
e.printStackTrace();
}
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, uri == null ? null : Uri.parse(uri));
startActivityForResult( intent, ringtoneCode); startActivityForResult( intent, ringtoneCode);
} }
@@ -155,7 +149,7 @@ public class RingtoneFragment extends Fragment implements OnClickListener, OnSee
*/ */
@Override @Override
public void onClick(View v) { public void onClick(View v) {
getRingtoneURI(this.mType, mRingtoneURI.toString()); getRingtoneURI(this.mType, mRingtoneURI);
} }
@Override @Override