Rename user defaults to be more sane. Register a set of sensible user defaults on launch.ios4

3 files changed, 21 insertions, 12 deletions

diff --git a/Source/Classes/MUApplicationDelegate.m b/Source/Classes/MUApplicationDelegate.m
index 7763a7d..57dc859 100644
--- a/Source/Classes/MUApplicationDelegate.m
+++ b/Source/Classes/MUApplicationDelegate.m
@@ -58,6 +58,15 @@
 
 	[window makeKeyAndVisible];
 
+    // Register default settings
+    [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
+                                                                // Audio
+                                                                [NSNumber numberWithFloat:1.0f],   @"AudioOutputVolume",
+                                                                @"vad",                            @"AudioTransmitMethod",
+                                                                // Network
+                                                                [NSNumber numberWithBool:NO],      @"NetworkForceTCP",
+                                                             nil]];
+    
 	[self reloadPreferences];
 	[MUDatabase initializeDatabase];
 
@@ -122,11 +131,11 @@
 	// Set up a good set of default audio settings.
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	MKAudioSettings settings;
-    if ([[defaults stringForKey:@"xmit"] isEqualToString:@"vad"])
+    if ([[defaults stringForKey:@"AudioTransmitMethod"] isEqualToString:@"vad"])
         settings.transmitType = MKTransmitTypeVAD;
-    else if ([[defaults stringForKey:@"xmit"] isEqualToString:@"continuous"])
+    else if ([[defaults stringForKey:@"AudioTransmitMethod"] isEqualToString:@"continuous"])
         settings.transmitType = MKTransmitTypeContinuous;
-    else if ([[defaults stringForKey:@"xmit"] isEqualToString:@"ptt"])
+    else if ([[defaults stringForKey:@"AudioTransmitMethod"] isEqualToString:@"ptt"])
         settings.transmitType = MKTransmitTypeToggle;
     else
         settings.transmitType = MKTransmitTypeVAD;
diff --git a/Source/Classes/MUAudioTransmissionPreferencesViewController.m b/Source/Classes/MUAudioTransmissionPreferencesViewController.m
index f232a0c..8668ec1 100644
--- a/Source/Classes/MUAudioTransmissionPreferencesViewController.m
+++ b/Source/Classes/MUAudioTransmissionPreferencesViewController.m
@@ -88,7 +88,7 @@
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
     }
     
-    NSString *current = [[NSUserDefaults standardUserDefaults] stringForKey:@"xmit"];
+    NSString *current = [[NSUserDefaults standardUserDefaults] stringForKey:@"AudioTransmitMethod"];
     cell.accessoryType = UITableViewCellAccessoryNone;
     if (indexPath.section == 0) {
         if (indexPath.row == 0) {
@@ -130,11 +130,11 @@
         }
         [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
         if (indexPath.row == 0) {
-            [[NSUserDefaults standardUserDefaults] setObject:@"vad" forKey:@"xmit"];
+            [[NSUserDefaults standardUserDefaults] setObject:@"vad" forKey:@"AudioTransmitMethod"];
         } else if (indexPath.row == 1) {
-            [[NSUserDefaults standardUserDefaults] setObject:@"ptt" forKey:@"xmit"];
+            [[NSUserDefaults standardUserDefaults] setObject:@"ptt" forKey:@"AudioTransmitMethod"];
         } else if (indexPath.row == 2) {
-            [[NSUserDefaults standardUserDefaults] setObject:@"continuous" forKey:@"xmit"];
+            [[NSUserDefaults standardUserDefaults] setObject:@"continuous" forKey:@"AudioTransmitMethod"];
         }
         cell = [self.tableView cellForRowAtIndexPath:indexPath];
         cell.accessoryType = UITableViewCellAccessoryCheckmark;
diff --git a/Source/Classes/MUPreferencesViewController.m b/Source/Classes/MUPreferencesViewController.m
index c0ec194..57fcf99 100644
--- a/Source/Classes/MUPreferencesViewController.m
+++ b/Source/Classes/MUPreferencesViewController.m
@@ -115,11 +115,11 @@
 		}
         // Transmit method
         if ([indexPath row] == 1) {
-            UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"AudioXmitCell"];
+            UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"AudioTransmitCell"];
             if (cell == nil)
-                cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@"AudioXmitCell"] autorelease];
+                cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@"AudioTransmitCell"] autorelease];
             cell.textLabel.text = @"Transmission";
-            NSString *xmit = [[NSUserDefaults standardUserDefaults] stringForKey:@"xmit"];
+            NSString *xmit = [[NSUserDefaults standardUserDefaults] stringForKey:@"AudioTransmitMethod"];
             if ([xmit isEqualToString:@"vad"]) {
                 cell.detailTextLabel.text = @"Voice Activated";
             } else if ([xmit isEqualToString:@"ptt"]) {
@@ -135,7 +135,7 @@
 	} else if ([indexPath section] == 1) {
 		if ([indexPath row] == 0) {
 			UISwitch *tcpSwitch = [[UISwitch alloc] init];
-			[tcpSwitch setOn:[[NSUserDefaults standardUserDefaults] boolForKey:@"ForceTCP"]];
+			[tcpSwitch setOn:[[NSUserDefaults standardUserDefaults] boolForKey:@"NetworkForceTCP"]];
 			[[cell textLabel] setText:@"Force TCP"];
 			[cell setAccessoryView:tcpSwitch];
 			[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
@@ -210,7 +210,7 @@
 }
 
 - (void) forceTCPChanged:(UISwitch *)tcpSwitch {
-	[[NSUserDefaults standardUserDefaults] setBool:[tcpSwitch isOn] forKey:@"ForceTCP"];
+	[[NSUserDefaults standardUserDefaults] setBool:[tcpSwitch isOn] forKey:@"NetworkForceTCP"];
 }
 
 @end