use wifi info only for 2 funcs

react-native-device-info · Oct 16, 2017 · a2eefc1 · a2eefc1
1 parent 61cdeaa
commit a2eefc1
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java b/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
@@ -40,17 +40,21 @@ public RNDeviceModule(ReactApplicationContext reactContext) {
     super(reactContext);
 
     this.reactContext = reactContext;
-
-
-    WifiManager manager = (WifiManager) reactContext.getSystemService(Context.WIFI_SERVICE);
-    this.wifiInfo = manager.getConnectionInfo();
   }
 
   @Override
   public String getName() {
     return "RNDeviceInfo";
   }
 
+  private WifiInfo getWifiInfo() {
+    if ( this.wifiInfo == null ) {
+      WifiManager manager = (WifiManager) reactContext.getSystemService(Context.WIFI_SERVICE);
+      this.wifiInfo = manager.getConnectionInfo();
+    }
+    return this.wifiInfo;
+  }
+
   private String getCurrentLanguage() {
       Locale current = getReactApplicationContext().getResources().getConfiguration().locale;
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -95,13 +99,13 @@ public void isPinOrFingerprintSet(Callback callback) {
 
   @ReactMethod
   public void getIpAddress(Promise p) {
-    String ipAddress = Formatter.formatIpAddress(wifiInfo.getIpAddress());
+    String ipAddress = Formatter.formatIpAddress(getWifiInfo().getIpAddress());
     p.resolve(ipAddress);
   }
 
   @ReactMethod
   public void getMacAddress(Promise p) {
-    String macAddress = wifiInfo.getMacAddress();
+    String macAddress = getWifiInfo().getMacAddress();
     p.resolve(macAddress);
   }