From a27441e41296d52254bf876d492e0ea22131d431 Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Mon, 4 Jun 2012 11:11:33 -0400 Subject: [PATCH] Removed KEY_RINGTONE_IS_SILENT and KEY_NOTIFICATION_IS_SILENT From Database closes #98 Signed-off-by: Ricky Barrette --- .../LocationRinger/db/RingerDatabase.java | 10 +- .../services/RingerProcessingService.java | 145 +++++------------- .../ui/fragments/FeatureListFragment.java | 8 +- .../ui/fragments/RingtoneFragment.java | 4 - 4 files changed, 46 insertions(+), 121 deletions(-) diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/db/RingerDatabase.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/db/RingerDatabase.java index 564cebc..bd95cb2 100644 --- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/db/RingerDatabase.java +++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/db/RingerDatabase.java @@ -86,13 +86,15 @@ public class RingerDatabase { public final static String KEY_RINGTONE = "home_ringtone"; @Deprecated public final static String KEY_NOTIFICATION_RINGTONE = "notification_ringtone"; - + @Deprecated + public final static String KEY_RINGTONE_IS_SILENT = "ringtone_is_silent"; + @Deprecated + public final static String KEY_NOTIFICATION_IS_SILENT = "notification_is_silent"; + + public final static String KEY_IS_ENABLED = "is_enabled"; public final static String KEY_RADIUS = "radius"; public final static String KEY_RINGER_NAME = "ringer_name"; public final static String KEY_LOCATION = "location"; - public final static String KEY_RINGTONE_IS_SILENT = "ringtone_is_silent"; - public final static String KEY_NOTIFICATION_IS_SILENT = "notification_is_silent"; - public final static String KEY_IS_ENABLED = "is_enabled"; public final static String KEY_RINGTONE_URI = "ringtone_uri"; public final static String KEY_NOTIFICATION_RINGTONE_URI = "away_notification_uri"; public final static String KEY_RINGTONE_VOLUME = "ringtone_volume"; diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/RingerProcessingService.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/RingerProcessingService.java index d69f206..c97e920 100644 --- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/RingerProcessingService.java +++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/RingerProcessingService.java @@ -71,35 +71,21 @@ public class RingerProcessingService extends Service { if(this.getSharedPreferences(SettingsActivity.SETTINGS, Debug.SHARED_PREFS_MODE).getBoolean(SettingsActivity.TOASTY, false)) Toast.makeText(this.getApplicationContext(), "Applying "+ name, Toast.LENGTH_SHORT).show(); - /* - * We need to null check all the value except ring/notification tone uri's and boolean values. - */ - /* * ringtone & volume - * if the ringtone is set to silent we want to set the volume to 0 */ - if(values.containsKey(RingerDatabase.KEY_RINGTONE_IS_SILENT)){ - Log.d(TAG, "Ringtone: "+ applyRingtone(RingtoneManager.TYPE_RINGTONE, RingerDatabase.parseBoolean(values.getAsString(RingerDatabase.KEY_RINGTONE_IS_SILENT)), values.getAsString(RingerDatabase.KEY_RINGTONE_URI))); - if(RingerDatabase.parseBoolean(values.getAsString(RingerDatabase.KEY_RINGTONE_IS_SILENT))) - setStreamVolume(0, AudioManager.STREAM_RING); - else - if(values.get(RingerDatabase.KEY_RINGTONE_VOLUME) != null) - setStreamVolume(values.getAsInteger(RingerDatabase.KEY_RINGTONE_VOLUME), AudioManager.STREAM_RING); - } + if(values.containsKey(RingerDatabase.KEY_RINGTONE_URI)) + Log.d(TAG, "Ringtone: "+ applyRingtone(RingtoneManager.TYPE_RINGTONE, values.getAsString(RingerDatabase.KEY_RINGTONE_URI))); + if(values.containsKey(RingerDatabase.KEY_RINGTONE_VOLUME)) + setStreamVolume(values.getAsInteger(RingerDatabase.KEY_RINGTONE_VOLUME), AudioManager.STREAM_RING); /* * notification ringtone & volume - * if the notification ringtone is silent, we want to set the volume to 0 */ - if(values.containsKey(RingerDatabase.KEY_NOTIFICATION_IS_SILENT)){ - Log.d(TAG, "Notification Ringtone: "+ applyRingtone(RingtoneManager.TYPE_NOTIFICATION, RingerDatabase.parseBoolean(values.getAsString(RingerDatabase.KEY_NOTIFICATION_IS_SILENT)), values.getAsString(RingerDatabase.KEY_NOTIFICATION_RINGTONE_URI))); - if(RingerDatabase.parseBoolean(values.getAsString(RingerDatabase.KEY_NOTIFICATION_IS_SILENT))) - setStreamVolume(0, AudioManager.STREAM_NOTIFICATION); - else - if(values.get(RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME) != null) - setStreamVolume(values.getAsInteger(RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME), AudioManager.STREAM_NOTIFICATION); - } + if(values.containsKey(RingerDatabase.KEY_NOTIFICATION_RINGTONE_URI)) + Log.d(TAG, "Notification Ringtone: "+ applyRingtone(RingtoneManager.TYPE_NOTIFICATION, values.getAsString(RingerDatabase.KEY_NOTIFICATION_RINGTONE_URI))); + if(values.containsKey(RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME)) + setStreamVolume(values.getAsInteger(RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME), AudioManager.STREAM_NOTIFICATION); if(Debug.DEBUG){ Log.d(TAG, "Music "+ (mAudioManager.isMusicActive() ? "is playing " : "is not playing")); @@ -118,13 +104,10 @@ public class RingerProcessingService extends Service { /* * alarm volume - * we will set the alarm volume only if music is not playing, and there is no wired head set */ if(values.containsKey(RingerDatabase.KEY_ALARM_VOLUME)) if(values.get(RingerDatabase.KEY_ALARM_VOLUME) != null) - if(! mAudioManager.isMusicActive()) - if(! mAudioManager.isWiredHeadsetOn()) - setStreamVolume(values.getAsInteger(RingerDatabase.KEY_ALARM_VOLUME), AudioManager.STREAM_ALARM); + setStreamVolume(values.getAsInteger(RingerDatabase.KEY_ALARM_VOLUME), AudioManager.STREAM_ALARM); /* * wifi & bluetooth @@ -172,55 +155,35 @@ public class RingerProcessingService extends Service { * @return string uri of applied ringtone, null if silent was applied * @author ricky barrette */ - private String applyRingtone(int type, boolean isSilent, String uri) { - String ringtoneURI = null; - if(isSilent){ - if(Debug.DEBUG) - Log.d(TAG, "Ringtone was set to silent "); - } else - ringtoneURI = uri; - RingtoneManager.setActualDefaultRingtoneUri(this, type, ringtoneURI == null ? null : Uri.parse(ringtoneURI)); + private String applyRingtone(int type, String uri) { + RingtoneManager.setActualDefaultRingtoneUri(this, type, uri == null ? null : Uri.parse(uri)); return uri; } -// /** -// * Backs up the current settings into the database to be re applied as default -// * @author ricky barrette -// */ -// private void backup() { -// -// if(Debug.DEBUG) -// Log.d(TAG, "backup()"); -// -// ContentValues ringer = new ContentValues(); -// ContentValues info = new ContentValues(); -// -// /* -// * package the ringer table information -// */ -// ringer.put(RingerDatabase.KEY_RINGER_NAME, DEFAULT_RINGER); -// -// /* -// * package the ringer_info table information -// */ -// info.put(RingerDatabase.KEY_RINGTONE_IS_SILENT, mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT ? true : false); -// info.put(RingerDatabase.KEY_RINGTONE_URI, RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_RINGTONE).toString()); -// info.put(RingerDatabase.KEY_NOTIFICATION_IS_SILENT, mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT ? true : false); -// info.put(RingerDatabase.KEY_NOTIFICATION_RINGTONE_URI, RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_NOTIFICATION).toString()); -// info.put(RingerDatabase.KEY_RINGTONE_VOLUME, mAudioManager.getStreamVolume(AudioManager.STREAM_RING)); -// info.put(RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME, mAudioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION)); -// info.put(RingerDatabase.KEY_MUSIC_VOLUME, mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC)); -// info.put(RingerDatabase.KEY_ALARM_VOLUME, mAudioManager.getStreamVolume(AudioManager.STREAM_ALARM)); -// info.put(RingerDatabase.KEY_UPDATE_INTERVAL, this.mSettings.getString(SettingsActivity.SETTINGS, "10")); -// -// if(this.mBluetoothAdapter != null) -// info.put(RingerDatabase.KEY_BT, this.mBluetoothAdapter.isEnabled()); -// -// if(this.mWifiManager != null) -// info.put(RingerDatabase.KEY_WIFI, this.mWifiManager.isWifiEnabled()); -// -// this.mDb.updateRinger(1, ringer, info); -// } + /** + * appends the new ringer's information in content values + * @param id + * @return + */ + private ContentValues getRinger(ContentValues values, long id) { + String name = this.mDb.getRingerName(id); + values.put(RingerDatabase.KEY_RINGER_NAME, name); + + /* + * get the ringer's info, and parse it into content values + */ + values.putAll(this.mDb.getRingerInfo(name)); + return values; + } + + /** + * returns all the ringers information as content values + * @param id + * @return + */ + private ContentValues getRinger(long id) { + return getRinger(new ContentValues(), id); + } /* (non-Javadoc) * @see android.app.Service#onBind(android.content.Intent) @@ -283,17 +246,6 @@ public class RingerProcessingService extends Service { e.printStackTrace(); } -// //if this is the first time the service ever starts, then back up the current settings to create a back up -// if(this.mSettings.getBoolean(SettingsActivity.IS_FIRST_RINGER_PROCESSING, true)){ -// backup(); -// this.mSettings.edit().putBoolean(SettingsActivity.IS_FIRST_RINGER_PROCESSING, false).commit(); -// } -// -// //if the default ringer is the currently applied ringer back up the current settings -// if(this.mSettings.getBoolean(SettingsActivity.IS_DEFAULT, false)){ -// backup(); -// } - if(intent.getParcelableExtra(LocationLibraryConstants.INTENT_EXTRA_LOCATION_CHANGED) != null){ this.mLocation = intent.getParcelableExtra(LocationLibraryConstants.INTENT_EXTRA_LOCATION_CHANGED); processRingers(); @@ -301,7 +253,7 @@ public class RingerProcessingService extends Service { Log.d(TAG, "Location was null"); return super.onStartCommand(intent, flags, startId); } - + /** * Processes the ringer database for applicable ringers * @author ricky barrette @@ -362,31 +314,6 @@ public class RingerProcessingService extends Service { this.stopSelf(mStartId); } - /** - * appends the new ringer's information in content values - * @param id - * @return - */ - private ContentValues getRinger(ContentValues values, long id) { - String name = this.mDb.getRingerName(id); - values.put(RingerDatabase.KEY_RINGER_NAME, name); - - /* - * get the ringer's info, and parse it into content values - */ - values.putAll(this.mDb.getRingerInfo(name)); - return values; - } - - /** - * returns all the ringers information as content values - * @param id - * @return - */ - private ContentValues getRinger(long id) { - return getRinger(new ContentValues(), id); - } - /** * set the volume of a particular stream * @param volume diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/FeatureListFragment.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/FeatureListFragment.java index c0a51e4..fc9202b 100644 --- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/FeatureListFragment.java +++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/FeatureListFragment.java @@ -124,11 +124,11 @@ public class FeatureListFragment extends BaseFragmentListFragment implements OnC private ArrayList initList() { ArrayList what = new ArrayList(); - if(this.mInfo.containsKey(RingerDatabase.KEY_RINGTONE_IS_SILENT) || this.mInfo.containsKey(RingerDatabase.KEY_RINGTONE_VOLUME)){ + if(this.mInfo.containsKey(RingerDatabase.KEY_RINGTONE_VOLUME)){ what.add(initFeatureFragment(KEY_ADDED_RINGTONE)); } - if(this.mInfo.containsKey(RingerDatabase.KEY_NOTIFICATION_IS_SILENT) || this.mInfo.containsKey(RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME)){ + if(this.mInfo.containsKey(RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME)){ what.add(initFeatureFragment(KEY_ADDED_NOTIFICATIONTONE)); } @@ -256,10 +256,10 @@ public class FeatureListFragment extends BaseFragmentListFragment implements OnC */ switch(id){ case KEY_ADDED_RINGTONE: - this.mListener.onInfoContentRemoved(RingerDatabase.KEY_RINGTONE_URI, RingerDatabase.KEY_RINGTONE_IS_SILENT, RingerDatabase.KEY_RINGTONE_VOLUME); + this.mListener.onInfoContentRemoved(RingerDatabase.KEY_RINGTONE_URI, RingerDatabase.KEY_RINGTONE_VOLUME); break; case KEY_ADDED_NOTIFICATIONTONE: - this.mListener.onInfoContentRemoved(RingerDatabase.KEY_NOTIFICATION_RINGTONE_URI, RingerDatabase.KEY_NOTIFICATION_IS_SILENT, RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME); + this.mListener.onInfoContentRemoved(RingerDatabase.KEY_NOTIFICATION_RINGTONE_URI, RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME); break; case KEY_ADDED_ALARM_VOLUME: this.mListener.onInfoContentRemoved(RingerDatabase.KEY_ALARM_VOLUME); diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/RingtoneFragment.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/RingtoneFragment.java index ec4c38b..6d1c376 100644 --- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/RingtoneFragment.java +++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/RingtoneFragment.java @@ -45,7 +45,6 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList private final int mStream; private final int mType; private final OnContentChangedListener mChangedListener; - private final String mKeyEnabled; private final String mKeyUri; private final String mKeyVolume; private final ContentValues mInfo; @@ -68,7 +67,6 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList switch(stream){ case AudioManager.STREAM_NOTIFICATION: - mKeyEnabled = RingerDatabase.KEY_NOTIFICATION_IS_SILENT; mKeyUri = RingerDatabase.KEY_NOTIFICATION_RINGTONE_URI; mKeyVolume = RingerDatabase.KEY_NOTIFICATION_RINGTONE_VOLUME; mLabel = R.string.notification_ringtone; @@ -77,7 +75,6 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList case AudioManager.STREAM_RING: default: - mKeyEnabled = RingerDatabase.KEY_RINGTONE_IS_SILENT; mKeyUri = RingerDatabase.KEY_RINGTONE_URI; mKeyVolume = RingerDatabase.KEY_RINGTONE_VOLUME; mLabel = R.string.ringtone; @@ -111,7 +108,6 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList if(this.mChangedListener != null){ ContentValues info = new ContentValues(); info.put(this.mKeyUri, tone != null ? tone.toString() : null); - info.put(mKeyEnabled, tone == null); this.mChangedListener.onInfoContentChanged(info); } }