Move platform and campusexpress to retrofit2

Author: meiron03

PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt

@@ -37,6 +37,7 @@ import com.google.gson.reflect.TypeToken
 import com.pennapps.labs.pennmobile.api.CampusExpress
 import com.pennapps.labs.pennmobile.api.OAuth2NetworkManager
 import com.pennapps.labs.pennmobile.api.Platform
+import com.pennapps.labs.pennmobile.api.Platform2
 import com.pennapps.labs.pennmobile.api.Serializer
 import com.pennapps.labs.pennmobile.api.classes.Account
 import com.pennapps.labs.pennmobile.api.fragments.LoginFragment
@@ -315,27 +316,39 @@ class MainActivity : AppCompatActivity() {
 
         private var mStudentLife: StudentLife? = null
         private var mPlatform: Platform? = null
+        private var mPlatform2: Platform2? = null
         private var mCampusExpress: CampusExpress? = null
 
         @JvmStatic
         val campusExpressInstance: CampusExpress
             get() {
                 if (mCampusExpress == null) {
-                    val gsonBuilder = GsonBuilder()
-                    val gson = gsonBuilder.create()
-                    val restAdapter =
-                        RestAdapter
-                            .Builder()
-                            .setConverter(GsonConverter(gson))
-                            .setLogLevel(RestAdapter.LogLevel.FULL)
-                            .setLog(AndroidLog("Campus Express"))
-                            .setEndpoint(Platform.campusExpressBaseUrl)
-                            .build()
-                    mCampusExpress = restAdapter.create(CampusExpress::class.java)
-                }
+                    val retrofit = Retrofit.Builder()
+                        .baseUrl(Platform2.campusExpressBaseUrl)
+                        .client(OkHttpClient.Builder().build())
+                        .addConverterFactory(GsonConverterFactory.create())
+                        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                        .build()
+
+                    mCampusExpress = retrofit.create(CampusExpress::class.java)                }
                 return mCampusExpress!!
             }
 
+        val platformInstance2: Platform2
+            get() {
+                if (mPlatform2 == null) {
+                    val retrofit = Retrofit.Builder()
+                        .baseUrl(Platform2.platformBaseUrl)
+                        .client(OkHttpClient.Builder().build())
+                        .addConverterFactory(GsonConverterFactory.create())
+                        .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                        .build()
+
+                    mPlatform2 = retrofit.create(Platform2::class.java)
+                }
+                return mPlatform2!!
+            }
+
         @JvmStatic
         val platformInstance: Platform
             get() {

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/CampusExpress.kt

@@ -3,33 +3,32 @@ package com.pennapps.labs.pennmobile.api
 import com.pennapps.labs.pennmobile.api.classes.CampusExpressAccessTokenResponse
 import com.pennapps.labs.pennmobile.dining.classes.DiningBalances
 import com.pennapps.labs.pennmobile.dining.classes.DiningBalancesList
-import retrofit.Callback
-import retrofit.http.GET
-import retrofit.http.Header
-import retrofit.http.Query
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Query
 import rx.Observable
 
 /**
  * Created by Julius Snipes on 09/23/2022.
  * Retrofit interface to the Campus Express API
  */
 interface CampusExpress {
-    @GET("/oauth/token")
-    fun getAccessToken(
+    @GET("oauth/token")
+    suspend fun getAccessToken(
         @Query("code") authCode: String?,
         @Query("grant_type") grantType: String?,
         @Query("client_id") clientID: String?,
         @Query("redirect_uri") redirectURI: String?,
         @Query("code_verifier") codeVerifier: String?,
-        callback: Callback<CampusExpressAccessTokenResponse>,
-    )
+    ): Response<CampusExpressAccessTokenResponse>
 
-    @GET("/dining/currentBalance")
+    @GET("dining/currentBalance")
     fun getCurrentDiningBalances(
         @Header("x-authorization") bearerToken: String?,
     ): Observable<DiningBalances>
 
-    @GET("/dining/pastBalances")
+    @GET("dining/pastBalances")
     fun getPastDiningBalances(
         @Header("x-authorization") bearerToken: String?,
         @Query("start_date") startDate: String?,

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Platform.java

@@ -11,7 +11,7 @@
 public interface Platform {
 
     String platformBaseUrl = "https://platform.pennlabs.org";
-    String campusExpressBaseUrl = "https://prod.campusexpress.upenn.edu/api/v1";
+    String campusExpressBaseUrl = "https://prod.campusexpress.upenn.edu/api/v1/";
 
     @FormUrlEncoded
     @POST("/accounts/introspect/")

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Platform2.kt

@@ -0,0 +1,23 @@
+package com.pennapps.labs.pennmobile.api
+
+import com.pennapps.labs.pennmobile.api.classes.GetUserResponse
+import retrofit2.Response
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.Header
+import retrofit2.http.POST
+
+interface Platform2 {
+    companion object {
+
+        val platformBaseUrl: String = "https://platform.pennlabs.org/"
+        val campusExpressBaseUrl: String = "https://prod.campusexpress.upenn.edu/api/v1/"
+    }
+
+    @FormUrlEncoded
+    @POST("accounts/introspect/")
+    suspend fun getUser(
+        @Header("Authorization") authorizationHeader: String?,
+        @Field("token") token: String?,
+    ): Response<GetUserResponse>
+}

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/CampusExpressLoginFragment.kt

@@ -16,13 +16,15 @@ import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.CampusExpress
 import com.pennapps.labs.pennmobile.api.classes.Account
 import com.pennapps.labs.pennmobile.api.classes.CampusExpressAccessTokenResponse
 import com.pennapps.labs.pennmobile.dining.fragments.DiningInsightsFragment
+import kotlinx.coroutines.launch
 import org.apache.commons.lang3.RandomStringUtils
 import retrofit.Callback
 import retrofit.RetrofitError
@@ -144,18 +146,19 @@ class CampusExpressLoginFragment : Fragment() {
     }
 
     private fun initiateAuthentication(authCode: String) {
-        mCampusExpress?.getAccessToken(
-            authCode,
-            "authorization_code",
-            clientID,
-            redirectUri,
-            codeVerifier,
-            object : Callback<CampusExpressAccessTokenResponse> {
-                override fun success(
-                    t: CampusExpressAccessTokenResponse?,
-                    response: Response?,
-                ) {
-                    if (response?.status == 200) {
+        viewLifecycleOwner.lifecycleScope.launch {
+            mCampusExpress?.let {
+                try {
+                    val response = it.getAccessToken(
+                        authCode,
+                        "authorization_code",
+                        clientID,
+                        redirectUri,
+                        codeVerifier,
+                    )
+
+                    if (response.isSuccessful) {
+                        val t = response.body()
                         val accessToken = t?.accessToken
                         val expiresIn = t?.expiresIn
                         val editor = sp.edit()
@@ -170,21 +173,22 @@ class CampusExpressLoginFragment : Fragment() {
                         }
                         editor.apply()
                         goToDiningInsights(true)
+                    } else {
+                        val error = Exception(response.errorBody()?.string() ?: "Unknown Error")
+                        Log.e("Campus Webview", "Error fetching access token $error")
+                        Toast
+                            .makeText(
+                                context,
+                                "Error getting campus express authorization",
+                                Toast.LENGTH_SHORT,
+                            ).show()
+                        goToDiningInsights(false)
                     }
+                } catch (e: Exception) {
+                    e.printStackTrace()
                 }
-
-                override fun failure(error: RetrofitError) {
-                    Log.e("Campus Webview", "Error fetching access token $error")
-                    Toast
-                        .makeText(
-                            context,
-                            "Error getting campus express authorization",
-                            Toast.LENGTH_SHORT,
-                        ).show()
-                    goToDiningInsights(false)
-                }
-            },
-        )
+            }
+        }
     }
 
     private fun getCodeChallenge(codeVerifier: String): String {

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/LoginWebviewFragment.kt

@@ -27,6 +27,7 @@ import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.Platform
 import com.pennapps.labs.pennmobile.api.Platform.platformBaseUrl
+import com.pennapps.labs.pennmobile.api.Platform2
 import com.pennapps.labs.pennmobile.api.classes.AccessTokenResponse
 import com.pennapps.labs.pennmobile.api.classes.Account
 import com.pennapps.labs.pennmobile.api.classes.GetUserResponse
@@ -49,7 +50,7 @@ class LoginWebviewFragment : Fragment() {
     lateinit var cancelButton: Button
     lateinit var user: Account
     private lateinit var mStudentLife: StudentLife
-    private var mPlatform: Platform? = null
+    private var mPlatform: Platform2? = null
     private lateinit var mActivity: MainActivity
     lateinit var sp: SharedPreferences
     lateinit var codeChallenge: String
@@ -67,7 +68,7 @@ class LoginWebviewFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         mStudentLife = MainActivity.studentLifeInstance
-        mPlatform = MainActivity.platformInstance
+        mPlatform = MainActivity.platformInstance2
         arguments?.let {
             user = arguments?.getSerializable("user") as Account
         }
@@ -229,15 +230,16 @@ class LoginWebviewFragment : Fragment() {
     }
 
     private fun getUser(accessToken: String?) {
-        try {
-            mPlatform?.getUser(
-                "Bearer $accessToken",
-                accessToken,
-                object : Callback<GetUserResponse> {
-                    override fun success(
-                        t: GetUserResponse?,
-                        response: Response?,
-                    ) {
+        viewLifecycleOwner.lifecycleScope.launch {
+            try {
+                mPlatform?.let {
+                    val response = it.getUser(
+                        "Bearer $accessToken",
+                        accessToken,
+                    )
+
+                    if (response.isSuccessful) {
+                        val t = response.body()
                         val user = t?.user
                         val editor = sp.edit()
                         editor.putString(getString(R.string.first_name), user?.firstName)
@@ -253,19 +255,16 @@ class LoginWebviewFragment : Fragment() {
                         editor.putString(getString(R.string.pennkey), user?.username)
                         editor.apply()
                         mActivity.startHomeFragment()
-                        // saveAccount(Account(user?.firstName, user?.lastName,
-                        //        user?.username, user?.pennid, user?.email, user?.affiliation), user?.username.toString(), accessToken)
-                    }
-
-                    override fun failure(error: RetrofitError) {
+                    } else {
+                        val error = Exception(response.errorBody()?.string() ?: "Unknown Error")
                         Log.e("Accounts", "Error getting user $error")
                         Toast.makeText(mActivity, "Error logging in", Toast.LENGTH_SHORT).show()
                         mActivity.startLoginFragment()
                     }
-                },
-            )
-        } catch (e: Exception) {
-            e.printStackTrace()
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
         }
     }
 

PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningInsightsFragment.kt

@@ -21,6 +21,8 @@ import com.pennapps.labs.pennmobile.dining.classes.DiningBalancesList
 import com.pennapps.labs.pennmobile.dining.classes.DiningInsightCell
 import com.pennapps.labs.pennmobile.dining.classes.DollarsSpentCell
 import com.pennapps.labs.pennmobile.isOnline
+import rx.android.schedulers.AndroidSchedulers
+import rx.schedulers.Schedulers
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import kotlin.collections.ArrayList
@@ -143,7 +145,9 @@ class DiningInsightsFragment : Fragment() {
             binding.internetConnectionDiningInsights.visibility = View.GONE
         }
         val bearerToken = "Bearer $accessToken"
-        mCampusExpress.getCurrentDiningBalances(bearerToken).subscribe(
+        mCampusExpress.getCurrentDiningBalances(bearerToken)
+            .subscribeOn(Schedulers.io())
+            .subscribe(
             { t: DiningBalances? ->
                 activity?.runOnUiThread {
                     val diningBalanceCell = cells[0]
@@ -162,21 +166,20 @@ class DiningInsightsFragment : Fragment() {
         val current = LocalDateTime.now()
         val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
         val formattedCurrentDate = current.format(formatter)
-        mCampusExpress.getPastDiningBalances(bearerToken, DiningInsightsCardAdapter.START_DAY_OF_SEMESTER, formattedCurrentDate).subscribe(
+        mCampusExpress.getPastDiningBalances(bearerToken, DiningInsightsCardAdapter.START_DAY_OF_SEMESTER, formattedCurrentDate)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(
             { t: DiningBalancesList? ->
-                activity?.runOnUiThread {
-                    cells[1].diningBalancesList = t
-                    cells[2].diningBalancesList = t
-                    (insightsrv.adapter as DiningInsightsCardAdapter).notifyItemChanged(1)
-                    (insightsrv.adapter as DiningInsightsCardAdapter).notifyItemChanged(2)
-                    binding.diningInsightsRefresh.isRefreshing = false
-                }
+                cells[1].diningBalancesList = t
+                cells[2].diningBalancesList = t
+                (insightsrv.adapter as DiningInsightsCardAdapter).notifyItemChanged(1)
+                (insightsrv.adapter as DiningInsightsCardAdapter).notifyItemChanged(2)
+                binding.diningInsightsRefresh.isRefreshing = false
             },
             { throwable ->
-                activity?.runOnUiThread {
-                    Log.e("DiningInsightsFragment", "Error getting balances", throwable)
-                    binding.diningInsightsRefresh.isRefreshing = false
-                }
+                Log.e("DiningInsightsFragment", "Error getting balances", throwable)
+                binding.diningInsightsRefresh.isRefreshing = false
             },
         )
     }