Multiple account UI

client/app/src/main/java/com/microsoft/research/karya/data/exceptions/AccessCodeAlreadyUsedException.kt

@@ -0,0 +1,3 @@
+package com.microsoft.research.karya.data.exceptions
+
+class AccessCodeAlreadyUsedException(message: String) : Exception(message)

client/app/src/main/java/com/microsoft/research/karya/data/exceptions/SessionExpiredException.kt

@@ -0,0 +1,3 @@
+package com.microsoft.research.karya.data.exceptions
+
+class SessionExpiredException(message: String) : Exception(message)

client/app/src/main/java/com/microsoft/research/karya/data/repo/WorkerRepository.kt

@@ -1,8 +1,9 @@
 package com.microsoft.research.karya.data.repo
 
+import com.microsoft.research.karya.data.exceptions.AccessCodeAlreadyUsedException
 import com.microsoft.research.karya.data.exceptions.IncorrectAccessCodeException
 import com.microsoft.research.karya.data.exceptions.IncorrectOtpException
-import com.microsoft.research.karya.data.exceptions.PhoneNumberAlreadyUsedException
+import com.microsoft.research.karya.data.exceptions.SessionExpiredException
 import com.microsoft.research.karya.data.exceptions.UnknownException
 import com.microsoft.research.karya.data.local.daos.WorkerDao
 import com.microsoft.research.karya.data.model.karya.WorkerRecord
@@ -35,7 +36,7 @@ constructor(private val workerAPI: WorkerAPI, private val workerDao: WorkerDao)
     if (!response.isSuccessful) {
       throw when (response.code()) {
         404 -> IncorrectOtpException("Incorrect OTP")
-        403 -> PhoneNumberAlreadyUsedException("Phone Number is Already in use")
+        403 -> AccessCodeAlreadyUsedException("Access Code is being used by another phone number")
         401 -> IncorrectAccessCodeException("Access Code is incorrect")
         else -> UnknownException("Something went wrong")
       }
@@ -53,7 +54,10 @@ constructor(private val workerAPI: WorkerAPI, private val workerDao: WorkerDao)
     val responseBody = response.body()
 
     if (!response.isSuccessful) {
-      error("Request failed, response code: ${response.code()}")
+      throw when (response.code()) {
+        401 -> IncorrectAccessCodeException("Access Code is incorrect")
+        else -> UnknownException("Something went wrong")
+      }
     }
 
     if (responseBody != null) {
@@ -70,7 +74,10 @@ constructor(private val workerAPI: WorkerAPI, private val workerDao: WorkerDao)
     val workerRecord = response.body()
 
     if (!response.isSuccessful) {
-      error("Request failed, response code: ${response.code()}")
+      throw when (response.code()) {
+        401 -> SessionExpiredException("Invalid id-token")
+        else -> UnknownException("Something went wrong")
+      }
     }
 
     if (workerRecord != null) {
@@ -90,7 +97,7 @@ constructor(private val workerAPI: WorkerAPI, private val workerDao: WorkerDao)
 
     if (!response.isSuccessful) {
       throw when (response.code()) {
-        401 -> IncorrectAccessCodeException("Access Code is incorrect")
+        401 -> IncorrectAccessCodeException("Invalid Access Code or id token")
         else -> UnknownException("Something went wrong")
       }
     }

client/app/src/main/java/com/microsoft/research/karya/ui/accesscode/AccessCodeFragment.kt

@@ -65,7 +65,7 @@ class AccessCodeFragment : Fragment(R.layout.fragment_access_code) {
       when (result) {
         is Result.Success<*> -> onAccessCodeVerified(result as Result.Success<Int>, accessCode)
         // TODO: Use error codes and exceptions from Anurag's PR
-        is Result.Error -> showErrorMessage(result.exception.message ?: "Error fetching data")
+        is Result.Error -> showErrorMessage(getString(result.errorMessageId))
         Result.Loading -> showLoading()
       }
     }

client/app/src/main/java/com/microsoft/research/karya/ui/registration/RegistrationViewModel.kt

@@ -7,9 +7,9 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.microsoft.research.karya.R
+import com.microsoft.research.karya.data.exceptions.AccessCodeAlreadyUsedException
 import com.microsoft.research.karya.data.exceptions.IncorrectAccessCodeException
 import com.microsoft.research.karya.data.exceptions.IncorrectOtpException
-import com.microsoft.research.karya.data.exceptions.PhoneNumberAlreadyUsedException
 import com.microsoft.research.karya.data.exceptions.UnknownException
 import com.microsoft.research.karya.data.model.karya.enums.OtpSendState
 import com.microsoft.research.karya.data.model.karya.enums.OtpVerifyState
@@ -126,7 +126,7 @@ constructor(
   private fun sendGenerateOtpError(e: Throwable) {
     phoneNumberFragmentErrorId =
         when (e) {
-          is PhoneNumberAlreadyUsedException -> R.string.s_phone_number_already_used
+          is AccessCodeAlreadyUsedException -> R.string.s_phone_number_already_used
           is IncorrectAccessCodeException ->
               R.string.s_invalid_creation_code // this case should never happen
           is UnknownException -> R.string.s_unknown_error

client/app/src/main/java/com/microsoft/research/karya/utils/Result.kt

@@ -1,7 +1,28 @@
 package com.microsoft.research.karya.utils
 
+import com.microsoft.research.karya.R
+import com.microsoft.research.karya.data.exceptions.AccessCodeAlreadyUsedException
+import com.microsoft.research.karya.data.exceptions.IncorrectAccessCodeException
+import com.microsoft.research.karya.data.exceptions.IncorrectOtpException
+import com.microsoft.research.karya.data.exceptions.UnknownException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+
 sealed class Result {
   class Success<T>(val value: T) : Result()
-  class Error(val exception: Throwable) : Result()
+  class Error(val exception: Throwable) : Result() {
+    val errorMessageId =
+        when (exception) {
+          is UnknownHostException -> R.string.s_no_internet_or_server_down
+          is SocketTimeoutException -> R.string.s_no_internet_or_server_down
+          // Socket Timeout may also happen due to bad internet connection, maybe indicate in the
+          // string?
+          is AccessCodeAlreadyUsedException -> R.string.s_phone_number_already_used
+          is IncorrectAccessCodeException -> R.string.s_invalid_creation_code
+          is IncorrectOtpException -> R.string.s_invalid_otp
+          is UnknownException -> R.string.s_unknown_error
+          else -> R.string.s_unknown_error
+        }
+  }
   object Loading : Result()
 }

client/app/src/main/res/layout/account_chooser.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Please choose your account"
+        android:gravity="center"
+        android:textColor="#000000"
+        android:textSize="@dimen/_18ssp"
+        android:layout_marginBottom="@dimen/_18sdp"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:itemCount="3"
+        tools:listitem="@layout/item_user_account" />
+
+</LinearLayout>

client/app/src/main/res/layout/item_user_account.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent" android:layout_height="match_parent"
+    app:cardCornerRadius="@dimen/_10sdp"
+    android:elevation="@dimen/_3sdp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:src="@tools:sample/avatars"
+            android:padding="8dp" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_gravity="center">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="Anurag Shukla"
+                android:textSize="@dimen/_28ssp"
+                android:textColor="@color/colorBlack"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="9399151865"
+                android:textSize="@dimen/_20ssp"/>
+        </LinearLayout>
+    </LinearLayout>
+
+</androidx.cardview.widget.CardView>