[royale-asjs] branch develop updated: Fix OSUtils. MacOs was appearing in iOS devices since the litteral "Mac" appars in OSX and iOS too. Also add Android and iOS to the list of recognized OS

[carlosrovira]

This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new e57df2c  Fix OSUtils. MacOs was appearing in iOS devices since the 
litteral "Mac" appars in OSX and iOS too. Also add Android and iOS to the list 
of recognized OS
e57df2c is described below

commit e57df2c59b3bcf49e0fbdaa93aaad8ea35b26c68
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Fri Feb 8 15:40:39 2019 +0100

    Fix OSUtils. MacOs was appearing in iOS devices since the litteral "Mac" 
appars in OSX and iOS too. Also add Android and iOS to the list of recognized OS
---
 .../src/main/royale/org/apache/royale/utils/OSUtils.as     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/OSUtils.as 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/OSUtils.as
index 6392dc1..5be1b5c 100644
--- 
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/OSUtils.as
+++ 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/OSUtils.as
@@ -44,6 +44,8 @@ package org.apache.royale.utils
         public static const WIN_OS:String = "Windows";
         public static const LINUX_OS:String = "Linux";
         public static const UNIX_OS:String = "UNIX";
+        public static const ANDROID_OS:String = "Android";
+        public static const IOS_OS:String = "iOS";
         public static const UNKNOWN_OS:String = "Unknown OS";
 
         /**
@@ -71,12 +73,14 @@ package org.apache.royale.utils
             {
                 if(!_osName)
                 {
-                    _osName = "Unknown OS";
+                    _osName = UNKNOWN_OS;
                     var appVersion:String = navigator.appVersion;
-                    if (appVersion.indexOf("Win") != -1) _osName="Windows";
-                    if (appVersion.indexOf("Mac") != -1) _osName="MacOS";
-                    if (appVersion.indexOf("X11") != -1) _osName="UNIX";
-                    if (appVersion.indexOf("Linux") != -1) _osName="Linux";
+                    if (appVersion.indexOf("Win") != -1) _osName = WIN_OS;
+                    if (appVersion.indexOf("Macintosh") != -1) _osName = 
MAC_OS;
+                    if (appVersion.indexOf("X11") != -1) _osName = UNIX_OS;
+                    if (appVersion.indexOf("Linux") != -1) _osName = LINUX_OS;
+                    if (appVersion.indexOf("iPad") != -1 || 
appVersion.indexOf("iPhone") != -1 || appVersion.indexOf("iPod") != -1) _osName 
= IOS_OS;
+                    if (appVersion.indexOf("Android") != -1) _osName = 
ANDROID_OS;
                 }
                 return _osName;
             }