Merge branch 'master' into master

README.md

@@ -143,13 +143,14 @@ include ':app'
 
 (Thanks to @josephan for writing the instructions)
 
-## Device Name
+## Permissions
 
-If you want to get the device name in Android add this to your `AndroidManifest.xml` (optional):
+Add the appropriate, optional permissions to your `AndroidManifest.xml`:
 
 ```xml
 ...
-<uses-permission android:name="android.permission.BLUETOOTH"/>
+<uses-permission android:name="android.permission.BLUETOOTH"/>         <!-- for Device Name -->
+<uses-permission android:name="android.permission.READ_PHONE_STATE"/>  <!-- for Phone Number -->
 ```
 
 ## Release Notes
@@ -184,9 +185,13 @@ var DeviceInfo = require('react-native-device-info');
 | App Instance ID            | `getInstanceID()`                  |                                                                                               | ANDROID ONLY - see https://developers.google.com/instance-id/                                                    |
 | App is running in emulator | `isEmulator()`                     | true                                                                                          | if app is running in emulator return true                                                                        |
 | App is running on a tablet | `isTablet()`                       | true                                                                                          | if app is running on a tablet return true                                                                        |
-| PIN or fingerprint set     | `isPinOrFingerprintSet()(callback)`|                                                                                               | Only supported in Android and iOS 9.0 and above                                                                  |
+| PIN or fingerprint set     | `isPinOrFingerprintSet()(callback)`|                                                                                               | Only supported in Android and iOS 9.0 and above
+| Phone Number               | `getPhoneNumber()`                 | "2348675309" or "" or null                                                                    | Only supported in Android
+| First Install Time         | `getFirstInstallTime()`            | 1505607068808                                                                                 | Only supported in Android                                                                                          |
+| Last Install Time          | `getLastUpdateTime()`              | 1505607068808                                                                                 | Only supported in Android                                                                                          |
 | App Name                   | `getApplicationName()`             | Learnium Mobile                                                                               |                                                                                                                  |
 
+
 Since the device setting for PIN/Fingerprint can be modified while the app is still open, this is available via callback instead of as a constant.  To use, pass a callback function to the returned bridge function in your javascript:
 
 ```js

RNDeviceInfo.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		76E65CA41D4CA143009B7AF1 /* DeviceUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 76E65CA31D4CA143009B7AF1 /* DeviceUID.m */; };
+		BF770A3D1F6A3EEE007E5F09 /* DeviceUID.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 76E65CA21D4CA143009B7AF1 /* DeviceUID.h */; };
 		DA5891DC1BA9A9FC002B4DB2 /* RNDeviceInfo.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DA5891DB1BA9A9FC002B4DB2 /* RNDeviceInfo.h */; };
 		DA5891DE1BA9A9FC002B4DB2 /* RNDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5891DD1BA9A9FC002B4DB2 /* RNDeviceInfo.m */; };
 /* End PBXBuildFile section */
@@ -19,6 +20,7 @@
 			dstPath = "include/$(PRODUCT_NAME)";
 			dstSubfolderSpec = 16;
 			files = (
+				BF770A3D1F6A3EEE007E5F09 /* DeviceUID.h in CopyFiles */,
 				DA5891DC1BA9A9FC002B4DB2 /* RNDeviceInfo.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -222,7 +224,7 @@
 					"$(SRCROOT)/../../React/**",
 					"$(SRCROOT)/node_modules/react-native/React/**",
 					"$(SRCROOT)/../react-native/React/**",
-					"$(SRCROOT)/../../../node_modules/react-native/React/**"
+					"$(SRCROOT)/../../../node_modules/react-native/React/**",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = "-ObjC";
@@ -240,7 +242,7 @@
 					"$(SRCROOT)/../../React/**",
 					"$(SRCROOT)/node_modules/react-native/React/**",
 					"$(SRCROOT)/../react-native/React/**",
-					"$(SRCROOT)/../../../node_modules/react-native/React/**"
+					"$(SRCROOT)/../../../node_modules/react-native/React/**",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = "-ObjC";

RNDeviceInfo/RNDeviceInfo.h

@@ -9,10 +9,10 @@
 #import <UIKit/UIKit.h>
 #import <sys/utsname.h>
 
-#if __has_include("RCTBridgeModule.h")
-    #import "RCTBridgeModule.h"
+#if __has_include(<React/RCTAssert.h>)
+#import <React/RCTBridgeModule.h>
 #else
-    #import <React/RCTBridgeModule.h>
+#import "RCTBridgeModule.h"
 #endif
 
 @interface RNDeviceInfo : NSObject <RCTBridgeModule>

android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceInfo.java

 package com.learnium.RNDeviceInfo;
 
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.bridge.JavaScriptModule;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class RNDeviceInfo implements ReactPackage {
 

android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java

@@ -9,6 +9,8 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.provider.Settings.Secure;
+import android.webkit.WebSettings;
+import android.telephony.TelephonyManager;
 
 import com.google.android.gms.iid.InstanceID;
 
@@ -84,6 +86,7 @@ public class RNDeviceModule extends ReactContextBaseJavaModule {
   public @Nullable Map<String, Object> getConstants() {
     HashMap<String, Object> constants = new HashMap<String, Object>();
 
+    TelephonyManager telMgr = (TelephonyManager) this.reactContext.getSystemService(Context.TELEPHONY_SERVICE);
     PackageManager packageManager = this.reactContext.getPackageManager();
     String packageName = this.reactContext.getPackageName();
     String applicationName = this.reactContext.getApplicationInfo().loadLabel(this.reactContext.getPackageManager()).toString();
@@ -95,9 +98,11 @@ public class RNDeviceModule extends ReactContextBaseJavaModule {
 
     try {
       PackageInfo packageInfo = packageManager.getPackageInfo(packageName, 0);
-      ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName, 0);
-      constants.put("appVersion", packageInfo.versionName);
-      constants.put("buildNumber", packageInfo.versionCode);
+      PackageInfo info = packageManager.getPackageInfo(packageName, 0);
+      constants.put("appVersion", info.versionName);
+      constants.put("buildNumber", info.versionCode);
+      constants.put("firstInstallTime", info.firstInstallTime);
+      constants.put("lastUpdateTime", info.lastUpdateTime);
       constants.put("appName", packageManager.getApplicationLabel(applicationInfo).toString());
     } catch (PackageManager.NameNotFoundException e) {
       e.printStackTrace();
@@ -126,10 +131,11 @@ public class RNDeviceModule extends ReactContextBaseJavaModule {
     constants.put("uniqueId", Secure.getString(this.reactContext.getContentResolver(), Secure.ANDROID_ID));
     constants.put("systemManufacturer", Build.MANUFACTURER);
     constants.put("bundleId", packageName);
-    constants.put("userAgent", System.getProperty("http.agent"));
+    constants.put("userAgent", WebSettings.getDefaultUserAgent(this.reactContext));
     constants.put("timezone", TimeZone.getDefault().getID());
     constants.put("isEmulator", this.isEmulator());
     constants.put("isTablet", this.isTablet());
+    constants.put("phoneNumber", telMgr.getLine1Number());
     return constants;
   }
 }

deviceinfo.d.ts

 // should be imported this way: 
-// import DeviceInfo from 'react-native-device-info';
+// import * as DeviceInfo from 'react-native-device-info';
 
-declare class DeviceInfo {
-  public static getUniqueID(): string;
-  public static getManufacturer(): string;
-  public static getBrand(): string;
-  public static getModel(): string;
-  public static getDeviceId(): string;
-  public static getSystemName(): string;
-  public static getSystemVersion(): string;
-  public static getBundleId(): string;
-  public static getApplicationName(): string;
-  public static getBuildNumber(): string;
-  public static getVersion(): string;
-  public static getReadableVersion(): string;
-  public static getDeviceName(): string;
-  public static getUserAgent(): string;
-  public static getDeviceLocale(): string;
-  public static getDeviceCountry(): string;
-  public static getTimezone(): string;
-  public static getInstanceID(): string;
-  public static isEmulator(): boolean;
-  public static isTablet(): boolean;
-  public static isPinOrFingerprintSet(): (cb: (isPinOrFingerprintSet: boolean) => void) => void;
-}
+export function getUniqueID(): string;
+export function getManufacturer(): string;
+export function getBrand(): string;
+export function getModel(): string;
+export function getDeviceId(): string;
+export function getSystemName(): string;
+export function getSystemVersion(): string;
+export function getBundleId(): string;
+export function getApplicationName(): string;
+export function getBuildNumber(): string;
+export function getVersion(): string;
+export function getReadableVersion(): string;
+export function getDeviceName(): string;
+export function getUserAgent(): string;
+export function getDeviceLocale(): string;
+export function getDeviceCountry(): string;
+export function getTimezone(): string;
+export function getInstanceID(): string;
+export function isEmulator(): boolean;
+export function isTablet(): boolean;
+export function isPinOrFingerprintSet(): (cb: (isPinOrFingerprintSet: boolean) => void) => void;
+export function getFirstInstallTime(): number;
+export function getLastUpdateTime(): number;
 
-export default DeviceInfo;

deviceinfo.js

@@ -68,4 +68,11 @@ module.exports = {
   isPinOrFingerprintSet: function () {
     return RNDeviceInfo.isPinOrFingerprintSet;
   },
+  getFirstInstallTime: function () {
+    return RNDeviceInfo.firstInstallTime;
+  },
+  getLastUpdateTime: function () {
+    return RNDeviceInfo.lastUpdateTime;
+  },
+  getPhoneNumber: _ => RNDeviceInfo.phoneNumber
 };