From b309658475d2643d245449a2f64f353977648d0e Mon Sep 17 00:00:00 2001
From: Marta <martagarciaferreiro@gmail.com>
Date: Fri, 24 Jan 2020 15:30:47 -0500
Subject: [PATCH] bug fix in menu tab and unique deviceIDs

---
 .../pennapps/labs/pennmobile/DiningInfoFragment.java |  1 +
 .../com/pennapps/labs/pennmobile/HomeFragment.kt     | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInfoFragment.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInfoFragment.java
index aa4da54ae..b932bf7a6 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInfoFragment.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInfoFragment.java
@@ -193,6 +193,7 @@ public void onResume() {
 
     @Override
     public void onDestroyView() {
+        setHasOptionsMenu(false);
         super.onDestroyView();
         unbinder.unbind();
     }
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt
index 7d85c8849..d304c1801 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt
@@ -6,7 +6,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.Build
 import android.os.Bundle
-import android.preference.PreferenceManager
+import android.util.Log
 import androidx.fragment.app.Fragment
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -20,6 +20,11 @@ import com.pennapps.labs.pennmobile.classes.HomeCell
 import kotlinx.android.synthetic.main.fragment_home.*
 import kotlinx.android.synthetic.main.fragment_home.view.*
 import kotlinx.android.synthetic.main.loading_panel.*
+import android.provider.Settings.Secure
+import androidx.preference.PreferenceManager
+import androidx.core.content.ContextCompat.getSystemService
+import android.telephony.TelephonyManager
+
 
 
 class HomeFragment : Fragment()  {
@@ -61,9 +66,12 @@ class HomeFragment : Fragment()  {
         val sp = PreferenceManager.getDefaultSharedPreferences(activity)
         val sessionID = sp.getString(getString(R.string.huntsmanGSR_SessionID), "")
 
+        val deviceID = Secure.getString(mActivity.contentResolver,
+                Secure.ANDROID_ID) ?: "test"
+
         // get API data
         val labs = MainActivity.getLabsInstance() //TODO: get for an account id
-        labs.getHomePage("test_android", null, sessionID).subscribe({ cells ->
+        labs.getHomePage(deviceID, null, null).subscribe({ cells ->
             mActivity.runOnUiThread {
                 val gsrBookingCell = HomeCell()
                 gsrBookingCell.type = "gsr_booking"