commit 3374bf41d40283afc8ac90885b87a26fbc3dae41
author Andrew Grieve <agrieve@chromium.org> Tue Jan 27 11:35:03 2015 -0500
committer Andrew Grieve <agrieve@chromium.org> Tue Jan 27 11:35:03 2015 -0500
tree ba616cc772bb5f5836e44635f29bf63d55685cf3
parent 0f187eb4335de45004a9036fe2650152d1e376d4

ios: Use inline copies of deprecated CDV_IsIpad and CDV_IsIphone5

src/ios/CDVCapture.m

diff --git a/src/ios/CDVCapture.m b/src/ios/CDVCapture.m
index 48dd65f..5bffcea 100644
--- a/src/ios/CDVCapture.m
+++ b/src/ios/CDVCapture.m
@@ -575,7 +575,7 @@
     // if user wants iPhone only app to run on iPad they must remove *~ipad.* images from CDVCapture.bundle
     if (isLessThaniOS4) {
         NSString* iPadResource = [NSString stringWithFormat:@"%@~ipad.png", resource];
-        if (CDV_IsIPad() && [UIImage imageNamed:iPadResource]) {
+        if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad && [UIImage imageNamed:iPadResource]) {
             return iPadResource;
         } else {
             return [NSString stringWithFormat:@"%@.png", resource];
@@ -614,7 +614,8 @@
     // make backgrounds
     NSString* microphoneResource = @"CDVCapture.bundle/microphone";
 
-    if (CDV_IsIPhone5()) {
+    BOOL isIphone5 = ([[UIScreen mainScreen] bounds].size.width == 568 && [[UIScreen mainScreen] bounds].size.height == 320) || ([[UIScreen mainScreen] bounds].size.height == 568 && [[UIScreen mainScreen] bounds].size.width == 320);
+    if (isIphone5) {
         microphoneResource = @"CDVCapture.bundle/microphone-568h";
     }