Refactored and gave ForgotPasswordActivity a makeover. Added loading and error states to it.

app/src/main/java/uprrp/tania/SendRecoveryEmailToServer.java

@@ -1,104 +0,0 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
-package uprrp.tania;
-
-import android.content.Context;
-import android.os.AsyncTask;
-import android.util.Log;
-import android.widget.Toast;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-
-public class SendRecoveryEmailToServer extends AsyncTask<String, String, String> {
-
-    private Context context;
-
-    public SendRecoveryEmailToServer(Context context){
-        this.context = context.getApplicationContext();
-    }
-
-    @Override
-    protected String doInBackground(String... strings) {
-
-        String json  = null;
-        try {
-            json = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(strings[0], "UTF-8");
-            Log.d("RESET PASSWORD EMAIL", json);
-        } catch (UnsupportedEncodingException e) {
-            Log.e("RESET PASSWORD EMAIL ERROR", e.getMessage());
-        }
-
-        String text = "";
-        BufferedReader reader = null;
-
-        // Send data
-        try
-        {
-            // Defined URL  where to send data
-            URL url = new URL("https://tania.uprrp.edu/askForEmail.php");
-
-            // Send POST data request
-            URLConnection conn = url.openConnection();
-            conn.setDoOutput(true);
-            OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-            assert json != null;
-            wr.write(json);
-            wr.flush();
-
-            // Get the server response
-            reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            StringBuilder sb = new StringBuilder();
-            String line;
-
-            // Read Server Response
-            while((line = reader.readLine()) != null)
-            {
-                // Append server response in string
-                sb.append(line).append("\n");
-            }
-
-            text = sb.toString();
-        }
-        catch(Exception ex) {
-            Log.e("RESET PASSWORD EMAIL", ex.getMessage());
-        }
-        finally
-        {
-            try
-            {
-                assert reader != null;
-                reader.close();
-            }
-            catch(Exception ex) {
-                Log.e("RESET PASSWORD EMAIL ERROR", ex.getMessage());
-            }
-        }
-
-        return text;
-
-    }
-
-    @Override
-    protected void onPostExecute(String s) {
-        Log.d("RESET PASSWORD EMAIL RESPOND", "The server's response is: " + s);
-
-        String ss = s.substring(0,6);
-        String se = s.substring(0,8);
-        if (ss.equals("Succes")){
-            Toast.makeText(context, "Thanks! We will shortly send an email to reset your password.", Toast.LENGTH_SHORT).show();
-
-        }
-
-
-    }
-
-}

app/src/main/java/uprrp/tania/activities/AccountRecoveryActivity.java

@@ -70,7 +70,7 @@ public class AccountRecoveryActivity extends AppCompatActivity {
             // TODO: find substitute for this deprecated dialog box
             final ProgressDialog progressDialog = ProgressDialog.show(AccountRecoveryActivity.this,
                     "Recovering Account",
-                    "This shouldn't take long");
+                    getString(R.string.progressDialogDescriptionText));
 
             // Send request to server
             SendAccountRecovery accountRecoveryTask = new SendAccountRecovery(new URLEventListener() {

app/src/main/java/uprrp/tania/activities/ExperienceRegistrationActivity.java

@@ -3,7 +3,6 @@ package uprrp.tania.activities;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
@@ -20,8 +19,8 @@ import java.util.Observer;
 
 import uprrp.tania.GlobalValues;
 import uprrp.tania.R;
-import uprrp.tania.utils.URLEventListener;
 import uprrp.tania.networking.SendExperienceRegistration;
+import uprrp.tania.utils.URLEventListener;
 
 public class ExperienceRegistrationActivity  extends AppCompatActivity implements Observer {
 
@@ -124,7 +123,7 @@ public class ExperienceRegistrationActivity  extends AppCompatActivity implement
         // TODO: find substitute for this deprecated dialog box
         final ProgressDialog progressDialog = ProgressDialog.show(ExperienceRegistrationActivity.this,
                 "Registering in Experience",
-                "This shouldn't take long");
+                getString(R.string.progressDialogDescriptionText));
 
         // Send registration request to server
         SendExperienceRegistration experienceRegistrationTask = new SendExperienceRegistration(new URLEventListener() {

app/src/main/java/uprrp/tania/activities/ForgotPasswordActivity.java

@@ -1,11 +1,9 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
 package uprrp.tania.activities;
 
+import android.app.ProgressDialog;
+import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -14,51 +12,73 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import uprrp.tania.R;
-import uprrp.tania.SendRecoveryEmailToServer;
+import uprrp.tania.networking.SendRecoveryEmail;
+import uprrp.tania.utils.URLEventListener;
 
 public class ForgotPasswordActivity extends AppCompatActivity {
 
-    private String recovery_email;
+    private static final String TAG = "ForgotPasswordActivity";
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+
+        // Constructor stuff
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_forgot_password);
 
-        //Let's get the email provided by the user so we can help them reset their password
-        final EditText emailRecoveryEditText = findViewById(R.id.editTextEmailResetPassword);
-        recovery_email = emailRecoveryEditText.getText().toString();
-
-        final JSONObject recoveryEmailJSON = new JSONObject();
-
-        //Let's send the provided email to the server
-        Button sendEmailRecoveryButton = findViewById(R.id.buttonSendEmail);
+        // Change all caps text to normal capitalization and add onClick listeners
+        final Button sendEmailRecoveryButton = findViewById(R.id.buttonSendEmail);
+        sendEmailRecoveryButton.setTransformationMethod(null); // TODO: this is a workaround I found, any other acceptable solution is welcome
         sendEmailRecoveryButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                try {
-                    recovery_email = emailRecoveryEditText.getText().toString();
-                    //If we have an email, then we send it. Otherwise, the user needs to provide an email.
-                    if (!recovery_email.equals("")) {
-                        recoveryEmailJSON.put("email", recovery_email);
-                        SendRecoveryEmailToServer sendRecoveryEmailToServer = new SendRecoveryEmailToServer(getApplicationContext());
-                        sendRecoveryEmailToServer.execute(recoveryEmailJSON.toString());
-                    }
-                    else{
-                        Toast.makeText(getApplicationContext(), "Please enter your email to reset your password.", Toast.LENGTH_LONG);
-                    }
-                }
-                catch(JSONException e){
-                    e.getMessage();
-                }
-
+                sendRecoveryEmail();
             }
         });
 
+    }
+
+    private void sendRecoveryEmail() {
+
+        final EditText emailRecoveryEditText = findViewById(R.id.editTextEmailRecovery);
+        String email = emailRecoveryEditText.getText().toString();
+
+        // Email and password are needed (make sure user knows); else, proceed
+        if(email.equals("")) {
+            Toast.makeText(getApplicationContext(), "Please enter your email to reset your password.", Toast.LENGTH_LONG).show();
+        } else {
+
+            // Initiate progress dialog
+            // TODO: find substitute for this deprecated dialog box
+            final ProgressDialog progressDialog = ProgressDialog.show(ForgotPasswordActivity.this,
+                    "Verifying Email",
+                    getString(R.string.progressDialogDescriptionText));
+
+            // Define task
+            SendRecoveryEmail sendRecoveryEmailTask = new SendRecoveryEmail(new URLEventListener() {
+                @Override
+                public void onSuccess() {
+                    progressDialog.dismiss();
+                    Toast.makeText(getApplicationContext(), "Thanks!\nWe'll send you an email to reset your password.", Toast.LENGTH_SHORT).show();
+                    Intent intent = new Intent(ForgotPasswordActivity.this, GettingStartedActivity.class);
+                    startActivity(intent);
+                }
+
+                @Override
+                public void onFailure(Exception e) {
+                    progressDialog.dismiss();
+                    Toast.makeText(getApplicationContext(), "Error!\nPlease try again (make sure to write your email correctly)", Toast.LENGTH_SHORT).show();
+                    Log.e(TAG, "Couldn't send recovery email to server!");
+                    e.printStackTrace();
+                }
+            });
 
+            // Start task
+            sendRecoveryEmailTask.execute(email);
+
+        }
 
     }
+
 }

app/src/main/java/uprrp/tania/activities/GettingStartedActivity.java

@@ -96,8 +96,8 @@ public class GettingStartedActivity extends AppCompatActivity {
         loginAccountButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent loginAccountIntent = new Intent(GettingStartedActivity.this, AccountRecoveryActivity.class);
-                startActivity(loginAccountIntent);
+                Intent intent = new Intent(GettingStartedActivity.this, AccountRecoveryActivity.class);
+                startActivity(intent);
             }
         });
 
@@ -142,7 +142,7 @@ public class GettingStartedActivity extends AppCompatActivity {
 
             // Use signature to get encoded consent form
             byte[] signatureBytes = Base64.decode(signatureBase64, Base64.DEFAULT);
-            String consentFormBase64 = createPdf(signatureBytes, signatureDate);
+            String consentFormBase64 = this.createPdf(signatureBytes, signatureDate);
 
             // Send JSON with consent form, signature date, and token
             String deviceToken = GlobalValues.getInstance().getDeviceToken();

app/src/main/java/uprrp/tania/fragments/AssessmentsFragment.java

@@ -255,7 +255,7 @@ public class AssessmentsFragment extends Fragment implements Observer {
         // TODO: find substitute for this deprecated dialog box
         final ProgressDialog progressDialog = ProgressDialog.show(getContext(),
                 "Looking for Survey",
-                "This shouldn't take long");
+                getString(R.string.progressDialogDescriptionText));
 
         // Fetch the assessment to be taken (if there is at least one available),
         // and launch the assessment (if the button is pressed)
@@ -324,7 +324,7 @@ public class AssessmentsFragment extends Fragment implements Observer {
         // TODO: find substitute for this deprecated dialog box
         final ProgressDialog progressDialog = ProgressDialog.show(getContext(),
                 "Sending Answers",
-                "This shouldn't take long");
+                getString(R.string.progressDialogDescriptionText));
 
         // Send answers and prompt user if he wants to retry sending them if an error occurs
         SendAnswers sendAnswersTask = new SendAnswers(new URLEventListener() {

app/src/main/java/uprrp/tania/fragments/WithdrawFragment.java

@@ -138,7 +138,7 @@ public class WithdrawFragment extends Fragment implements Observer {
         // TODO: find substitute for this deprecated dialog box
         final ProgressDialog progressDialog = ProgressDialog.show(getContext(),
                 "Withdrawing",
-                "This shouldn't take long");
+                getString(R.string.progressDialogDescriptionText));
 
         // Send withdrawal request to server
         SendWithdrawal sendWithdrawalTask = new SendWithdrawal(new URLEventListener() {

app/src/main/java/uprrp/tania/networking/FetchAssessment.java

@@ -64,11 +64,14 @@ public class FetchAssessment extends AsyncTask<String, Void, JSONObject> {
 
         try {
 
+            // Send GET data request
             URL url = new URL(assessmentBaseURL + deviceToken);
             Log.d(TAG, "token:" + deviceToken); // log
             Log.d(TAG, "url:" + url.toString()); // log
-            HttpsURLConnection httpsURLConnection = (HttpsURLConnection) url.openConnection();
-            InputStream inputStream = httpsURLConnection.getInputStream();
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
+            InputStream inputStream = conn.getInputStream();
+
+            // Get the server response
             BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
             StringBuilder serverResponse =  new StringBuilder();
 

app/src/main/java/uprrp/tania/networking/FetchUserStatus.java

@@ -65,11 +65,14 @@ public class FetchUserStatus extends AsyncTask<String, Void, JSONArray> {
 
         try {
 
+            // Send GET data request
             URL url = new URL(userStatusBaseURL + deviceToken);
             Log.d(TAG, "token:" + deviceToken); // log
             Log.d(TAG, "url:" + url.toString()); // log
-            HttpsURLConnection httpURLConnection = (HttpsURLConnection) url.openConnection();
-            InputStream inputStream = httpURLConnection.getInputStream();
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
+            InputStream inputStream = conn.getInputStream();
+
+            // Get the server response
             BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
             StringBuilder serverResponse =  new StringBuilder();
 

app/src/main/java/uprrp/tania/networking/SendAccountRecovery.java

@@ -11,9 +11,10 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.net.URLEncoder;
 
+import javax.net.ssl.HttpsURLConnection;
+
 import uprrp.tania.utils.URLEventListener;
 
 public class SendAccountRecovery extends AsyncTask<String, Void, String> {
@@ -91,7 +92,7 @@ public class SendAccountRecovery extends AsyncTask<String, Void, String> {
 
             // Send POST data request
             URL url = new URL(loginBaseURL);
-            URLConnection conn = url.openConnection();
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
             conn.setDoOutput(true);
             OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
             wr.write(encodedRequestBody);

app/src/main/java/uprrp/tania/networking/SendConsentForm.java

@@ -90,14 +90,14 @@ public class SendConsentForm extends AsyncTask <String, Void, String> {
             Log.d(TAG, "ConsentFormJSON is " + consentFormJSON.toString()); // log
 
             // Encode data
-            String jsonConsentSignature = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(strings[0], "UTF-8");
+            String encodedRequestBody = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(strings[0], "UTF-8");
 
             // Send POST data request
             URL url = new URL(consentFormBaseURL);
             URLConnection conn = url.openConnection();
             conn.setDoOutput(true);
             Writer writer = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8));
-            writer.write(jsonConsentSignature);
+            writer.write(encodedRequestBody);
             writer.close();
 
             // Get the server response

app/src/main/java/uprrp/tania/networking/SendRecoveryEmail.java

@@ -0,0 +1,129 @@
+package uprrp.tania.networking;
+
+import android.os.AsyncTask;
+import android.util.Log;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLEncoder;
+
+import javax.net.ssl.HttpsURLConnection;
+
+import uprrp.tania.utils.URLEventListener;
+
+public class SendRecoveryEmail extends AsyncTask<String, String, String> {
+
+    private static final String TAG = "SendRecoveryEmail";
+    private static final String emailRecoveryBaseURL = "https://tania.uprrp.edu/askForEmail.php";
+    private final URLEventListener myCallback;
+
+    public SendRecoveryEmail(URLEventListener callback){
+        this.myCallback = callback;
+    }
+
+    private boolean validInputs(String... strings) {
+
+        if(strings.length != 1) {
+            Log.e(TAG, "Invalid string array length!");
+            return false;
+        }
+
+        String email = strings[0];
+
+        if(email == null) {
+            Log.e(TAG, "Encountered null email!");
+            return false;
+        }
+
+        return true;
+
+    }
+
+    @Override
+    protected String doInBackground(String... strings) {
+
+        // Validation
+        if(!validInputs(strings)) {
+            Log.e(TAG, "Invalid inputs given!");
+            return null;
+        }
+
+        // Extract variables
+        String email = strings[0];
+
+        try {
+
+            // Create JSON
+            JSONObject recoveryEmailJSON = new JSONObject();
+            recoveryEmailJSON.put("email", email);
+            Log.d(TAG, "recoveryEmailJSON is " + recoveryEmailJSON.toString());
+
+            // Encode data
+            String encodedRequestBody = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(recoveryEmailJSON.toString(), "UTF-8");
+
+            // Send POST data request
+            URL url = new URL(emailRecoveryBaseURL);
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
+            conn.setDoOutput(true);
+            OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
+            wr.write(encodedRequestBody);
+            wr.flush();
+
+            // Get the server response
+            BufferedReader serverReader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            StringBuilder serverResponse = new StringBuilder();
+
+            String line = "";
+            while(line != null) {
+                serverResponse.append(line);
+                line = serverReader.readLine();
+            }
+
+            String response = serverResponse.toString();
+            Log.d(TAG, "The server's response is " + response);
+            if(response.contains("Success")) {
+                return response;
+            } else {
+                return null;
+            }
+
+        } catch(JSONException e) {
+            Log.e(TAG, "Couldn't prepare recoveryEmailJSON!");
+            e.printStackTrace();
+            return null;
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Couldn't encode recoveryEmailJSON!");
+            e.printStackTrace();
+            return null;
+        } catch(Exception e) {
+            Log.e(TAG, "Couldn't communicate with server while sending recovery email!");
+            e.printStackTrace();
+            return null;
+        }
+
+    }
+
+    @Override
+    protected void onPostExecute(String response) {
+
+        if(this.myCallback == null) {
+            Log.e(TAG, "Callback wasn't initialized first!");
+            return;
+        }
+
+        if(response == null) {
+            this.myCallback.onFailure(new Exception("Error occurred during transaction!"));
+            return;
+        }
+
+        this.myCallback.onSuccess();
+
+    }
+
+}

app/src/main/res/layout/activity_account_recovery.xml

@@ -90,7 +90,6 @@
         android:layout_marginEnd="@dimen/horizontalMargin"
         android:autofillHints="AUTOFILL_HINT_EMAIL_ADDRESS"
         android:backgroundTint="@color/colorPrimary"
-        android:ems="10"
         android:hint="@string/rsb_email"
         android:inputType="textEmailAddress"
         android:textColor="@color/textColor2"

app/src/main/res/layout/activity_forgot_password.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -8,49 +7,51 @@
 
     <TextView
         android:id="@+id/textViewEmailResetPassword"
-        android:layout_width="307dp"
-        android:layout_height="71dp"
-        android:fontFamily="@font/acme"
-        android:text="Please provide the email associated to your account so you can reset your password:"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:fontFamily="@font/cabin"
+        android:text="@string/forgotPasswordDescriptionText"
         android:textAlignment="center"
         android:textSize="18sp"
-        app:layout_constraintBottom_toTopOf="@+id/editTextEmailResetPassword"
+        app:layout_constraintBottom_toTopOf="@+id/buttonSendEmail"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="1.0" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <EditText
-        android:id="@+id/editTextEmailResetPassword"
-        android:layout_width="wrap_content"
+        android:id="@+id/editTextEmailRecovery"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ems="10"
-        android:fontFamily="@font/acme"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:autofillHints="AUTOFILL_HINT_EMAIL_ADDRESS"
+        android:backgroundTint="@color/colorPrimary"
+        android:hint="@string/rsb_email"
         android:inputType="textEmailAddress"
         android:textAlignment="center"
-        android:textColor="#BEBEBE"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/buttonSendEmail"
+        android:textColor="@color/textColor2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.935"
-        tools:text="email for password recovery" />
+        app:layout_constraintTop_toBottomOf="@+id/textViewEmailResetPassword" />
 
     <Button
         android:id="@+id/buttonSendEmail"
-        android:layout_width="272dp"
-        android:layout_height="47dp"
-        android:background="@color/colorPrimaryDark"
-        android:fontFamily="@font/acme"
-        android:text="SEND EMAIL"
-        android:textColor="@color/textColor1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:layout_marginBottom="@dimen/verticalMargin"
+        android:background="@drawable/button_background"
+        android:fontFamily="sans-serif-black"
+        android:text="@string/sendEmailButtonText"
+        android:textColor="@android:color/white"
         android:textSize="18sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.496"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.559" />
+        app:layout_constraintTop_toBottomOf="@+id/textViewEmailResetPassword" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -1,26 +1,28 @@
 <resources>
-    <string name="menu_data_cleared">La información ha sido borrada</string>
-    <string name="user_name">Nombre de usuario:</string>
-    <string name="date_consented">Fecha de consentimiento:</string>
-    <string name="msg_token_fmt" translatable="false">InstanceID Token: %s</string>
-    <string name="log_token">Log Token</string>
-    <string name="msg_subscribed">Subscribed to weather topic</string>
-    <string name="default_notification_channel_id" translatable="false">fcm_default_channel</string>
+
     <!--
         This is the name that users will see when interacting with this channel.
         It should describe the category of notifications that will be sent through this channel
      -->
-    <string name="default_notification_channel_name" translatable="true">Weather</string>
-    <string name="msg_subscribe_failed">Failed to subscribe to weather topic</string>
-    <string name="fcm_message">FCM Message</string>
-    <string name="title_encuestamarle">Encuesta MARLE</string>
-    <string name="title_activity_main2">MainActivity2</string>
+<!--    <string name="default_notification_channel_name" translatable="true">Weather</string>-->
+<!--    <string name="msg_subscribe_failed">Failed to subscribe to weather topic</string>-->
+<!--    <string name="fcm_message">FCM Message</string>-->
+<!--    <string name="title_encuestamarle">Encuesta MARLE</string>-->
+<!--    <string name="title_activity_main2">MainActivity2</string>-->
+<!--    <string name="menu_data_cleared">La información ha sido borrada</string>-->
+<!--    <string name="user_name">Nombre de usuario:</string>-->
+<!--    <string name="date_consented">Fecha de consentimiento:</string>-->
+<!--    <string name="msg_token_fmt" translatable="false">InstanceID Token: %s</string>-->
+<!--    <string name="log_token">Log Token</string>-->
+<!--    <string name="msg_subscribed">Subscribed to weather topic</string>-->
+
+    <!--  IDK???  -->
     <string name="title_home">Home</string>
     <string name="title_dashboard">Dashboard</string>
     <string name="title_notifications">Notifications</string>
-    <string name="title_activity_consent_pdf_viewer">Consent TANIA</string>
+    <string name="title_activity_consent_pdf_viewer">Consent TANIA</string> <!--might not be necessary-->
+    <string name="default_notification_channel_id" translatable="false">fcm_default_channel</string>
 
-    <!-- !!!!! POST-Víctor !!!!! -->
     <!--  AmazonCognito Details  -->
     <string name="identityPoolID">us-east-1:574094cd-0784-4e26-bd14-4fa72ae63579</string>
     <!--  API Endpoints  -->
@@ -35,6 +37,7 @@
     <string name="appNameLong">Timely And Non-Intrusive Assessments</string>
     <string name="surveyToolbarText">Assessment</string>
     <string name="tokenErrorText">There was an error…\nPlease come back later!</string>
+    <string name="progressDialogDescriptionText">This shouldn\'t take long</string>
     <!--  Assessment Fragment  -->
     <string name="mainGreetingText">Hello! 👋</string>
     <string name="loadingText">Please wait a moment…</string>
@@ -52,12 +55,12 @@
     <!--  Consent Document Information  -->
     <string name="consentFileName">/consent-tania-app.pdf</string>
     <string name="consentOverview">You have been invited to participate in this study whose objectives are (1) to develop and demonstrate the utility of a mobile application (TANIA) to collect perception data of students participating in research experiences and (2) to use TANIA to determine the sources of self-efficacy that lead to career exploration and decision-making in undergraduate students. This study is been carried out under the supervision of Dr. Juan S. Ramírez Lugo, Department of Biology and Dr. Carlos Corrada Bravo, Department of Computer Sciences at the University of Puerto Rico, Río Piedras Campus. You were selected to participate in this study because you are enrolled in a course that offers a research experience or you voluntarily participate in research with a professor affiliated to the Río Piedras Campus.</string>
-    <string name="consentTimeCommitment">In the study you will be asked to answer a questionnaire, about your perception of self-efficacy in research, scientific identity and decision-making about your professional career at the beginning and end of your research experience. It will take you between 10-20 minutes to answer this questionnaire. You are also expected to respond to short questionnaires between 1-3 times per week while you are participating in the research. You will receive notifications at random times during your research experience and answer questions adapted from survey instruments that have been previously validated. It will take you between 1-3 minutes to answer these questionnaires. It is expected that 25 students will participate in this phase of the study.</string>
+    <string name="consentTimeCommitment">In the study you will be asked to answer a questionnaire, about your perception of self–efficacy in research, scientific identity and decision–making about your professional career at the beginning and end of your research experience. It will take you between 10–20 minutes to answer this questionnaire. You are also expected to respond to short questionnaires between 1–3 times per week while you are participating in the research. You will receive notifications at random times during your research experience and answer questions adapted from survey instruments that have been previously validated. It will take you between 1–3 minutes to answer these questionnaires. It is expected that 25 students will participate in this phase of the study.</string>
     <string name="consentDataGathering">While answering the questions, you may feel uncomfortable because the questions are about your general opinion about science and research and your career. If you feel uncomfortable with the questions, you can stop and choose not to answer the question. When you download the application, it will occupy space in the memory of your mobile device and also consume your data plan in the transmission of information when you answer the questionnaires. It is estimated that the application will have a size of 40 Mb (As reference the WhatsApp application is 88.9 Mb). Although at the moment we cannot say exactly how much memory or data you will consume, we understand that both will be minimal. The risks of this study are minimal.</string>
     <string name="consentPrivacy">Your identity will be protected throughout the study. Your identifiable information will be handled confidentially and when presenting the results of the investigation you will not be identified. The information you issue through the application will be through access credentials (username and password) that only you will know. These access credentials will be encrypted and any subsequent association between you and your data will be made by reference to the encrypted information, not your personal identity. The data collected through the questionnaires will be stored digitally on a secure hard drive in the researcher\'s office. These data will also be stored virtually in the cloud, with access limited only to researchers.</string>
     <string name="consentDataUse">The data obtained will be used to improve academic offerings and research experiences. The results of this study may be part of a scientific publication on science education strategies and will serve as a basis to improve the teaching curriculum. It may be used to develop proposals for obtaining external funds for research. The officials of the Río Piedras Campus of the University of Puerto Rico and / or federal agencies responsible for ensuring the integrity of the research may require the researcher to prove the data obtained in this study, including this informed consent.</string>
     <string name="consentGeneral">If you decide to participate in this study, understand that your participation is completely voluntary and that you have the right to abstain from participating or even withdraw at any time of the study without incurring in any penalty. In the application you will find the instructions to withdraw from the study and stop receiving notifications if you wish. You also have the right not to answer any question if you wish. Your participation in this study will not affect in any way your academic evaluation in the courses in which you are carrying out this research. Finally, you have the right to receive a copy of this document.</string>
-    <string name="consentConclusion">If you have any questions or would like more information about this study, please contact Prof. Ramírez Lugo at 787-764-0000 Ext. 88068, at 787-918-5330 or by email at juan.ramirez3@upr.edu at any moment. If you have any questions about your rights as a participant or claim or complaint related to your participation in this study, you may contact the Compliance Officer of the Río Piedras Campus of the University of Puerto Rico, at telephone 764-0000, extension 86773 or cipshi. degi@upr.edu. Your signature on this document means that you have decided to participate voluntarily, that the information presented on this Consent Sheet has been discussed and that you have received a copy of this document. This printed sheet will be stored under lock and key for a period of 5 years after completion of the investigation and will then be shredded and discarded.</string>
+    <string name="consentConclusion">If you have any questions or would like more information about this study, please contact Prof. Ramírez Lugo at 787–764–0000 Ext. 88068, at 787–918–5330 or by email at juan.ramirez3@upr.edu at any moment. If you have any questions about your rights as a participant or claim or complaint related to your participation in this study, you may contact the Compliance Officer of the Río Piedras Campus of the University of Puerto Rico, at telephone 787–764–0000, extension 86773 or cipshi. degi@upr.edu. Your signature on this document means that you have decided to participate voluntarily, that the information presented on this Consent Sheet has been discussed and that you have received a copy of this document. This printed sheet will be stored under lock and key for a period of 5 years after completion of the investigation and will then be shredded and discarded.</string>
     <!--  Getting Started Activity  -->
     <string name="createAccountButtonText">Join the Study</string>
     <string name="recoverAccountButtonText">Login</string>
@@ -66,8 +69,8 @@
     <string name="overviewConsentSectionSummaryText">You have been invited to participate in this study whose objectives are (1) to develop and demonstrate the utility of a mobile application (TANIA) to collect perception data of students participating in research experiences and (2) to use TANIA to determine the sources of self-efficacy that lead to career exploration and decision-making in undergraduate students.</string>
     <string name="overviewConsentSectionContentText">This study is been carried out under the supervision of Dr. Juan S. Ramírez Lugo, Department of Biology and Dr. Carlos Corrada Bravo, Department of Computer Sciences at the University of Puerto Rico, Río Piedras Campus. You were selected to participate in this study because you are enrolled in a course that offers a research experience or you voluntarily participate in research with a professor affiliated to the Río Piedras Campus.</string>
     <string name="timeCommitmentTitleText">Time Commitment</string>
-    <string name="timeCommitmentConsentSectionContentText">You are also expected to respond to short questionnaires between 1-3 times per week while you are participating in the research. You will receive notifications at random times during your research experience and answer questions adapted from survey instruments that have been previously validated. It will take you between 1-3 minutes to answer these questionnaires. It is expected that 25 students will participate in this phase of the study.</string>
-    <string name="timeCommitmentConsentSectionSummaryText">In the study you will be asked to answer a questionnaire, about your perception of self-efficacy in research, scientific identity and decision-making about your professional career at the beginning and end of your research experience. It will take you between 10-20 minutes to answer this questionnaire.</string>
+    <string name="timeCommitmentConsentSectionContentText">You are also expected to respond to short questionnaires between 1–3 times per week while you are participating in the research. You will receive notifications at random times during your research experience and answer questions adapted from survey instruments that have been previously validated. It will take you between 1–3 minutes to answer these questionnaires. It is expected that 25 students will participate in this phase of the study.</string>
+    <string name="timeCommitmentConsentSectionSummaryText">In the study you will be asked to answer a questionnaire, about your perception of self–efficacy in research, scientific identity and decision–making about your professional career at the beginning and end of your research experience. It will take you between 10–20 minutes to answer this questionnaire.</string>
     <string name="dataGatheringTitleText">Data Gathering</string>
     <string name="dataGatheringConsentSectionSummaryText">While answering the questions, you may feel uncomfortable because the questions are about your general opinion about science and research and your career. If you feel uncomfortable with the questions, you can stop and choose not to answer the question.</string>
     <string name="dataGatheringConsentSectionContentText">In addition, when you download the application, it will occupy space in the memory of your mobile device and also consume your data plan in the transmission of information when you answer the questionnaires. It is estimated that the application will have a size of 40 Mb (As reference the WhatsApp application is 88.9 Mb). Although at the moment we cannot say exactly how much memory or data you will consume, we understand that both will be minimal. The risks of this study are minimal.</string>
@@ -78,8 +81,12 @@
     <string name="dataUseConsentSectionSummaryText">The data obtained will be used to improve academic offerings and research experiences. The results of this study may be part of a scientific publication on science education strategies and will serve as a basis to improve the teaching curriculum.</string>
     <string name="dataUseConsentSectionContentText">It may be used to develop proposals for obtaining external funds for research. The officials of the Río Piedras Campus of the University of Puerto Rico and / or federal agencies responsible for ensuring the integrity of the research may require the researcher to prove the data obtained in this study, including this informed consent. The information handled by your device can be intervened or revised by third parties. These people can be people with legitimate or illegitimate access to the device and its content such as a family member, employer, hackers, intruders, etc. In addition, the device that you use may keep track of the information you access or send over the Internet.</string>
     <string name="generalTitleText">General</string>
+    <!--  Account Recovery Account  -->
     <string name="accountRecoveryTitleText">LOG IN TO ACCOUNT</string>
     <string name="forgotPasswordButtonText">Forgot Password</string>
     <string name="emailInputLabelText">Email:</string>
     <string name="passwordInputLabelText">Password:</string>
+    <!--  Forgot Password Activity  -->
+    <string name="sendEmailButtonText">Send Email</string>
+    <string name="forgotPasswordDescriptionText">Please provide the email associated to your account so you can reset your password:</string>
 </resources>