Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug fixes.
Browse files Browse the repository at this point in the history
Change CREATOR companion object for menus in DiningHall.kt. Hopefully fixes crashes related to that

Change GsrFragment to initialize the shared preferences in onCreate.
meiron03 committed Feb 4, 2024
1 parent aac2c23 commit 62d9245
Showing 2 changed files with 13 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ package com.pennapps.labs.pennmobile

import android.app.DatePickerDialog
import android.app.TimePickerDialog
import android.content.SharedPreferences
import android.os.Bundle
import android.util.Log
import androidx.fragment.app.Fragment
@@ -64,16 +65,17 @@ class GsrFragment : Fragment() {

private var populatedDropDownGSR = false

private var bearerToken = ""
private var isWharton = false
private var sortByTime = false

private lateinit var mActivity: MainActivity
private lateinit var sharedPreferences: SharedPreferences

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
mStudentLife = MainActivity.studentLifeInstance
mActivity = activity as MainActivity
sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity)
mActivity.closeKeyboard()

// set default GSR selection date + time to the current date and time
@@ -196,8 +198,7 @@ class GsrFragment : Fragment() {

private fun updateStatus() {
mActivity.mNetworkManager.getAccessToken {
val sp = PreferenceManager.getDefaultSharedPreferences(activity)
bearerToken = sp.getString(getString(R.string.access_token), "").toString()
val bearerToken = sharedPreferences.getString(getString(R.string.access_token), "").toString()

if (bearerToken.isEmpty()) {
Toast.makeText(activity, "You are not logged in!", Toast.LENGTH_LONG).show()
@@ -234,8 +235,7 @@ class GsrFragment : Fragment() {
val location = mapGSR(gsrLocation)
val gid = mapGID(gsrLocation)
mActivity.mNetworkManager.getAccessToken {
val sp = PreferenceManager.getDefaultSharedPreferences(activity)
bearerToken = sp.getString(getString(R.string.access_token), "").toString()
val bearerToken = sharedPreferences.getString(getString(R.string.access_token), "").toString()

if (location.isEmpty() || bearerToken.isEmpty()) {
showNoResults()
@@ -276,8 +276,7 @@ class GsrFragment : Fragment() {


mActivity.mNetworkManager.getAccessToken {
val sp = PreferenceManager.getDefaultSharedPreferences(activity)
bearerToken = sp.getString(getString(R.string.access_token), "").toString()
val bearerToken = sharedPreferences.getString(getString(R.string.access_token), "").toString()

Log.i("GsrFragment", "Bearer Token: $bearerToken")
Log.i("GsrFragment", "Wharton Status: $isWharton")
Original file line number Diff line number Diff line change
@@ -177,16 +177,15 @@ open class DiningHall : Parcelable {
dest.writeString(name)
}

companion object {
val CREATOR: Parcelable.Creator<Menu?> = object : Parcelable.Creator<Menu?> {
override fun createFromParcel(`in`: Parcel): Menu? {
return Menu(`in`)
}
companion object CREATOR : Parcelable.Creator<Menu?> {
override fun createFromParcel(`in`: Parcel): Menu? {
return Menu(`in`)
}

override fun newArray(size: Int): Array<Menu?> {
return arrayOfNulls(size)
}
override fun newArray(size: Int): Array<Menu?> {
return arrayOfNulls(size)
}

}

}

0 comments on commit 62d9245

Please sign in to comment.