[iphone] ScanTest was not displaying results on my device

[zxing.git] / iphone / Classes / ZXingAppDelegate.m

diff --git a/iphone/Classes/ZXingAppDelegate.m b/iphone/Classes/ZXingAppDelegate.m
index 6ee99e3..df3cb5f 100644 (file)
--- a/iphone/Classes/ZXingAppDelegate.m
+++ b/iphone/Classes/ZXingAppDelegate.m
@@ -5,7 +5,7 @@
 //  Created by Christian Brunschen on 23/04/2008.
 //
 /*
- * Copyright 2008 Google Inc.
+ * Copyright 2008 ZXing authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 
 #import "ZXingAppDelegate.h"
 #import "DecoderViewController.h"
-#import "RotatingNavigationController.h"
 
 @implementation ZXingAppDelegate
 
@@ -35,11 +34,11 @@
   /* create the view controller */
   DecoderViewController *vc = 
     [[DecoderViewController alloc] initWithNibName:@"DecoderView" 
-                                         bundle:[NSBundle mainBundle]];
+                                            bundle:[NSBundle mainBundle]];
   self.viewController = vc;
   [vc release];
   
-  navigationController = [[RotatingNavigationController alloc] 
+  navigationController = [[UINavigationController alloc] 
                           initWithRootViewController:viewController];
   
   // hook up the view controller's view to be in the window
@@ -48,22 +47,18 @@
   // show the window
   [window makeKeyAndVisible];
   
-  if ([[NSUserDefaults standardUserDefaults] boolForKey:@"autoChoosePicture"]) {    
-    // pick and decode using the first available source type in priority order
-#define N_SOURCE_TYPES 3
-    UIImagePickerControllerSourceType sourceTypes[N_SOURCE_TYPES] = {
-      UIImagePickerControllerSourceTypeCamera,
-      UIImagePickerControllerSourceTypeSavedPhotosAlbum,
-      UIImagePickerControllerSourceTypePhotoLibrary
-    };
+  // pick and decode using the first available source type in priority order
+  UIImagePickerControllerSourceType sourceTypes[] = {
+    UIImagePickerControllerSourceTypeCamera,
+    UIImagePickerControllerSourceTypeSavedPhotosAlbum,
+    UIImagePickerControllerSourceTypePhotoLibrary
+  };
 
-    for (int i = 0; i < N_SOURCE_TYPES; i++) {
-      if ([UIImagePickerController isSourceTypeAvailable:sourceTypes[i]]) {
-        [viewController pickAndDecodeFromSource:sourceTypes[i]];
-        break;
-      }
+  for (int i = 0; i < sizeof(sourceTypes) / sizeof(*sourceTypes); i++) {
+    if ([UIImagePickerController isSourceTypeAvailable:sourceTypes[i]]) {
+      [viewController pickAndDecodeFromSource:sourceTypes[i]];
+      break;
     }
-#undef N_SOURCE_TYPES
   }
 }