Fix mac input (#32)

* Fixes mac address bug when adding device and input has colons What a random bug, this solution is not the appropriate tho * Update versions for release
wachunei · Mar 15, 2017 · 0eaf165 · 0eaf165
1 parent 685552e
commit 0eaf165
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         applicationId "com.internetuc"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 5
-        versionName "1.1.1"
+        versionCode 6
+        versionName "1.1.2"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.internetuc"
-    android:versionCode="5"
-    android:versionName="1.1.1">
+    android:versionCode="6"
+    android:versionName="1.1.2">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

diff --git a/ios/InternetUC/Info.plist b/ios/InternetUC/Info.plist
@@ -17,11 +17,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.1.1</string>
+    <string>1.1.2</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>4</string>
+    <string>5</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
     <key>LSRequiresIPhoneOS</key>
@@ -71,4 +71,4 @@
     <key>UIViewControllerBasedStatusBarAppearance</key>
     <false/>
   </dict>
-</plist>
+</plist>
diff --git a/src/utils/index.js b/src/utils/index.js
@@ -15,6 +15,6 @@ export const macFormat = mac => mac.match(new RegExp('[0-9a-fA-F]{2}', 'g'))
 
 export const matchesMac = mac => /^([0-9a-fA-F]{2}[:-]?){5}([0-9a-fA-F]{2})$/.test(mac);
 
-export const cleanMac = mac => mac.replace(new RegExp(MAC_SEPARATOR, 'g'), '').toLowerCase();
+export const cleanMac = mac => mac.replace(new RegExp(`${MAC_SEPARATOR}|:`, 'g'), '').toLowerCase();
 
 export const capitalize = string => string.toLowerCase().replace(/\b\w/g, l => l.toUpperCase());