From f12fc6121183c0024939296ef6d7711c496c75de Mon Sep 17 00:00:00 2001
From: Justin Willis <jgw9617@gmail.com>
Date: Thu, 2 Feb 2017 15:19:34 -0600
Subject: [PATCH] fix(platform): detect iPad Pro correctly (#10292)

* fix(platform): iPad pro is detected as an iPad

* chore(platform): ipad should be last
---
 src/platform/platform.ts           | 10 ++++++++++
 src/platform/test/platform.spec.ts | 31 ++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/src/platform/platform.ts b/src/platform/platform.ts
index 64e813d8b9..2fd0c33d04 100644
--- a/src/platform/platform.ts
+++ b/src/platform/platform.ts
@@ -986,6 +986,16 @@ export class Platform {
       while (platformNode) {
         platformNode.initialize(this);
 
+        // extra check for ipad pro issue
+        // https://forums.developer.apple.com/thread/25948
+        if (platformNode.name === 'iphone' && this.navigatorPlatform() === 'iPad') {
+          // this is an ipad pro so push ipad and tablet to platforms
+          // and then return as we are done
+          this._platforms.push('tablet');
+          this._platforms.push('ipad');
+          return;
+        }
+
         // set the array of active platforms with
         // the last one in the array the most important
         this._platforms.push(platformNode.name);
diff --git a/src/platform/test/platform.spec.ts b/src/platform/test/platform.spec.ts
index a1b10def8f..596298efc7 100644
--- a/src/platform/test/platform.spec.ts
+++ b/src/platform/test/platform.spec.ts
@@ -363,6 +363,37 @@ describe('Platform', () => {
     expect(plt.is('tablet')).toEqual(true);
   });
 
+  // for https://forums.developer.apple.com/thread/25948
+  it('should set ipad when user agent is iphone but navigator.platform is iPad', () => {
+    plt.setQueryParams('');
+    plt.setUserAgent(IPHONE_UA);
+    plt.setNavigatorPlatform('iPad');
+    plt.init();
+
+    expect(plt.is('core')).toEqual(false);
+    expect(plt.is('mobile')).toEqual(true);
+    expect(plt.is('windows')).toEqual(false);
+    expect(plt.is('android')).toEqual(false);
+    expect(plt.is('ios')).toEqual(true);
+    expect(plt.is('ipad')).toEqual(true);
+    expect(plt.is('iphone')).toEqual(false);
+    expect(plt.is('tablet')).toEqual(true);
+
+    plt.setQueryParams('');
+    plt.setUserAgent(IPHONE_10_2_UA);
+    plt.setNavigatorPlatform('iPad');
+    plt.init();
+
+    expect(plt.is('core')).toEqual(false);
+    expect(plt.is('mobile')).toEqual(true);
+    expect(plt.is('windows')).toEqual(false);
+    expect(plt.is('android')).toEqual(false);
+    expect(plt.is('ios')).toEqual(true);
+    expect(plt.is('ipad')).toEqual(true);
+    expect(plt.is('iphone')).toEqual(false);
+    expect(plt.is('tablet')).toEqual(true);
+  });
+
   it('should set core platform for osx desktop firefox', () => {
     plt.setQueryParams('');
     plt.setDefault('core');