Add if statment for m_WLANMAC #52 (#55)

Author: kylemathias

app/src/main/java/pbell/offline/ole/org/pbell/FullscreenActivity.java

@@ -1769,7 +1769,14 @@ public boolean updateActivityOpenedResources(String resource_name, String resour
             manager = new Manager(androidContext, Manager.DEFAULT_OPTIONS);
             activityLog = manager.getDatabase("activitylog");
             WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-            String m_WLANMAC = wm.getConnectionInfo().getMacAddress();
+
+            //This is for setting the MAC address if it is being run in a android emulator.
+            String m_WLANMAC;
+            m_WLANMAC = wm.getConnectionInfo().getMacAddress();
+            if(m_WLANMAC == null) {
+                m_WLANMAC = "mymac";
+            }
+
             Document retrievedDocument = activityLog.getDocument(m_WLANMAC);
             Map<String, Object> properties = retrievedDocument.getProperties();
             if ((ArrayList<String>) properties.get("female_opened") != null) {

app/src/main/java/pbell/offline/ole/org/pbell/FullscreenLogin.java

@@ -612,7 +612,14 @@ public boolean updateActivityLog() {
             manager = new Manager(androidContext, Manager.DEFAULT_OPTIONS);
             activityLog = manager.getDatabase("activitylog");
             WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-            String m_WLANMAC = wm.getConnectionInfo().getMacAddress();
+
+            //This is for setting the MAC address if it is being run in a android emulator.
+            String m_WLANMAC;
+            m_WLANMAC = wm.getConnectionInfo().getMacAddress();
+            if(m_WLANMAC == null) {
+                m_WLANMAC = "mymac";
+            }
+
             Document retrievedDocument = activityLog.getDocument(m_WLANMAC);
             if (retrievedDocument != null) {
                 if (retrievedDocument.getProperties() != null) {