Refactored AccountRecoveryActivity. Changed default activity to GettingStarted. Cleaned up redirection logic (in case user starts in other activities). Renamed theme. Validation added to background tasks.

app/src/main/AndroidManifest.xml

@@ -13,20 +13,20 @@
         android:label="TANIA"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
-        android:theme="@style/Theme.MarleApp"
+        android:theme="@style/Theme.TANIA"
         android:usesCleartextTraffic="true">
 
         <activity
             android:name=".activities.ConsentPdfViewerActivity"
             android:label="@string/title_activity_consent_pdf_viewer"
-            android:theme="@style/Theme.MarleApp.NoActionBar" />
-        <activity android:name=".activities.GettingStartedActivity" />
-        <activity android:name=".activities.MainActivity">
+            android:theme="@style/Theme.TANIA.NoActionBar" />
+        <activity android:name=".activities.GettingStartedActivity">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
-
+        </activity>
+        <activity android:name=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -41,13 +41,13 @@
         <activity
             android:name="org.researchstack.backbone.ui.ViewTaskActivity"
             android:parentActivityName=".activities.MainActivity"
-            android:theme="@style/Theme.MarleApp"
+            android:theme="@style/Theme.TANIA"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.researchstack.backbone.ui.ViewWebDocumentActivity"
             android:label="@string/appName"
             android:parentActivityName=".activities.MainActivity"
-            android:theme="@style/Theme.MarleApp" />
+            android:theme="@style/Theme.TANIA" />
         <activity
             android:name=".activities.RegisterActivity"
             android:parentActivityName=".activities.GettingStartedActivity">
@@ -56,7 +56,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activities.LoginActivity"
+            android:name=".activities.AccountRecoveryActivity"
             android:parentActivityName=".activities.GettingStartedActivity">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
@@ -64,8 +64,8 @@
         </activity>
         <activity
             android:name=".activities.ForgotPasswordActivity"
-            android:parentActivityName=".activities.LoginActivity"
-            android:theme="@style/Theme.MarleApp">
+            android:parentActivityName=".activities.AccountRecoveryActivity"
+            android:theme="@style/Theme.TANIA">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -73,7 +73,7 @@
         <activity
             android:name=".activities.ResetPasswordActivity"
             android:parentActivityName=".activities.ResetPasswordActivity"
-            android:theme="@style/Theme.MarleApp">
+            android:theme="@style/Theme.TANIA">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -88,7 +88,7 @@
         <activity
             android:name=".activities.ExperienceRegistrationActivity"
             android:parentActivityName=".activities.ExperienceRegistrationActivity"
-            android:theme="@style/Theme.MarleApp">
+            android:theme="@style/Theme.TANIA">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 

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

@@ -1,10 +1,14 @@
 package uprrp.tania;
 
 import android.app.Application;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
 import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import com.amazonaws.auth.CognitoCachingCredentialsProvider;
 import com.amazonaws.regions.Regions;
@@ -22,6 +26,8 @@ import org.researchstack.backbone.storage.file.PinCodeConfig;
 import org.researchstack.backbone.storage.file.SimpleFileAccess;
 import org.researchstack.backbone.storage.file.UnencryptedProvider;
 
+import uprrp.tania.activities.GettingStartedActivity;
+
 public class App extends Application {
 
     private static final String TAG = "App";
@@ -79,5 +85,17 @@ public class App extends Application {
                     }
                 });
 
+        // If user hasn't already registered, redirect accordingly,
+        // JUST IN CASE user starts non-default activity from somewhere else (like a browser)
+        // TODO: find a way to not redirect twice to GettingStarted
+        SharedPreferences prefs = getSharedPreferences("prefs", MODE_PRIVATE);
+        boolean needsToRegister = prefs.getBoolean("needsToRegister", true);
+        if(needsToRegister) {
+            Log.wtf(TAG, "Redirecting to GettingStarted");
+            Intent intent = new Intent(this, GettingStartedActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        }
+
     }
 }

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

@@ -1,137 +0,0 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
-package uprrp.tania;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.os.AsyncTask;
-import android.os.Environment;
-import android.util.Base64;
-import android.util.Log;
-import android.widget.Toast;
-
-import java.io.BufferedReader;
-import java.io.FileOutputStream;
-import java.io.IOException;
-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 uprrp.tania.activities.MainActivity;
-
-public class SendLoginToServer extends AsyncTask<String, String, String> {
-
-    private static final String loginBaseURL = "https://tania.uprrp.edu/recoverAccount.php";
-    private Context context;
-
-    public SendLoginToServer(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("RECOVER ACCOUNT", json);
-        } catch (UnsupportedEncodingException e) {
-            Log.e("RECOVER ACCOUNT ERROR", e.getMessage());
-        }
-
-        String text = "";
-        BufferedReader reader = null;
-
-        // Send data
-        try
-        {
-            // Defined URL  where to send data
-            URL url = new URL(loginBaseURL);
-
-            // 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("RECOVER ACCOUNT ERROR", ex.getMessage());
-        }
-        finally
-        {
-            try
-            {
-//                assert reader != null;
-                reader.close();
-            }
-            catch(Exception ex) {
-                Log.e("RECOVER ACCOUNT ERROR", ex.getMessage());
-            }
-        }
-
-        return text;
-
-    }
-
-    @Override
-    protected void onPostExecute(String s) {
-        Log.d("RECOVER ACCOUNT RESPOND", "The server's response is: " + s);
-
-        String se = s.substring(0, 5);
-        if (!se.equals("Error")) {
-
-            try {
-
-                FileOutputStream consentForm = new FileOutputStream(Environment.getExternalStorageDirectory().getPath() + "/consent-tania-app.pdf");
-
-                byte[] consentBytes = Base64.decode(s, Base64.NO_WRAP);
-                consentForm.write(consentBytes);
-                consentForm.close();
-
-                SharedPreferences prefs = context.getSharedPreferences("prefs", Context.MODE_PRIVATE);
-                SharedPreferences.Editor editor = prefs.edit();
-                editor.putBoolean("needsToRegister", false);
-                editor.apply();
-
-                Intent intent = new Intent(context, MainActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(intent);
-
-            } catch (IOException e) {
-                Log.e("RECOVER CONSENT LOGIN", "File not found!");
-            }
-        }
-
-        else
-            {
-                Toast.makeText(context, "Can't recover account! Try again later. ", Toast.LENGTH_LONG).show();
-            }
-        }
-
-
-
-}

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

@@ -0,0 +1,135 @@
+package uprrp.tania.activities;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.Base64;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import uprrp.tania.GlobalValues;
+import uprrp.tania.R;
+import uprrp.tania.networking.SendAccountRecovery;
+import uprrp.tania.utils.URLEventListener;
+
+public class AccountRecoveryActivity extends AppCompatActivity {
+
+    private static final String TAG = "AccountRecoveryActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        // Start constructor
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_account_recovery);
+
+        // Change all caps text to normal capitalization and add onClick listeners
+        final Button recoverButton = findViewById(R.id.recoverButton);
+        final Button forgotPasswordButton = findViewById(R.id.forgotPasswordButton);
+        recoverButton.setTransformationMethod(null); // TODO: this is a workaround I found, any other acceptable solution is welcome
+        forgotPasswordButton.setTransformationMethod(null); // TODO: this is a workaround I found, any other acceptable solution is welcome
+        recoverButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                sendAccountRecoveryRequest();
+            }
+        });
+        forgotPasswordButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(AccountRecoveryActivity.this, ForgotPasswordActivity.class);
+                startActivity(intent);
+            }
+        });
+
+    }
+
+    private void sendAccountRecoveryRequest() {
+
+        final EditText emailText = findViewById(R.id.emailTextRecover);
+        final EditText passwordText = findViewById(R.id.passwordTextRecover);
+
+        // Email and password are needed (make sure user knows); else, proceed
+        if(emailText.getText().toString().equals("") || passwordText.getText().toString().equals("")) {
+            Toast.makeText(AccountRecoveryActivity.this, "All fields are needed!", Toast.LENGTH_LONG).show();
+        } else {
+
+            // Initiate progress dialog
+            // TODO: find substitute for this deprecated dialog box
+            final ProgressDialog progressDialog = ProgressDialog.show(AccountRecoveryActivity.this,
+                    "Recovering Account",
+                    "This shouldn't take long");
+
+            // Send request to server
+            SendAccountRecovery accountRecoveryTask = new SendAccountRecovery(new URLEventListener() {
+
+                @Override
+                public void onSuccess(String response) {
+
+                    progressDialog.dismiss();
+                    restoreConsentForm(response);
+
+                    // Change user preferences to reflect login
+                    Context context = AccountRecoveryActivity.this;
+                    SharedPreferences prefs = context.getSharedPreferences("prefs", Context.MODE_PRIVATE);
+                    SharedPreferences.Editor editor = prefs.edit();
+                    editor.putBoolean("needsToRegister", false);
+                    editor.apply();
+
+                    // Start MainActivity
+                    Intent intent = new Intent(context, MainActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    context.startActivity(intent);
+                    Toast.makeText(getApplicationContext(), "Login successful!", Toast.LENGTH_LONG).show();
+
+                }
+
+                @Override
+                public void onFailure(Exception e) {
+                    progressDialog.dismiss();
+                    Toast.makeText(AccountRecoveryActivity.this, "Couldn't recover account!\nTry again later with the correct credentials...", Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "Error occurred while sending account recovery request to server...");
+                    e.printStackTrace();
+                }
+
+            });
+
+            // Start task
+            String deviceToken = GlobalValues.getInstance().getDeviceToken();
+            String email = emailText.getText().toString();
+            String password = passwordText.getText().toString();
+            accountRecoveryTask.execute(deviceToken, email, password);
+
+        }
+
+    }
+
+    // TODO: IO should be moved to a background task
+    private void restoreConsentForm(String response) {
+        try {
+            byte[] consentBytes = Base64.decode(response, Base64.NO_WRAP);
+            FileOutputStream consentForm = new FileOutputStream(Environment.getExternalStorageDirectory().getPath() + getString(R.string.consentFileName));
+            consentForm.write(consentBytes);
+            consentForm.close();
+        } catch (FileNotFoundException e) {
+            Log.e(TAG, "Couldn't find consent form (we were going to write to it)!");
+            e.printStackTrace();
+        } catch (IOException e) {
+            Log.e(TAG, "Couldn't rewrite consent form!");
+            e.printStackTrace();
+        }
+    }
+
+}

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

@@ -3,6 +3,7 @@ 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;
@@ -19,13 +20,13 @@ import java.util.Observer;
 
 import uprrp.tania.GlobalValues;
 import uprrp.tania.R;
-import uprrp.tania.URLEventListener;
+import uprrp.tania.utils.URLEventListener;
 import uprrp.tania.networking.SendExperienceRegistration;
 
 public class ExperienceRegistrationActivity  extends AppCompatActivity implements Observer {
 
     private static final String TAG = "ExperienceRegistrationActivity";
-    private String EXPERIENCE_ID;
+    private String EXPERIENCE_TOKEN;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -34,26 +35,32 @@ public class ExperienceRegistrationActivity  extends AppCompatActivity implement
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_experience_registration);
 
-        // Fetch experience ID from URL (only if we launched this Activity from Browser)
+
+        // Fetch experience token from URL (only if we launched this Activity from Browser)
         Intent intent = getIntent();
         if(Intent.ACTION_VIEW.equals(intent.getAction())) {
             Uri uri = intent.getData();
             assert uri != null; // TODO: figure out if this causes crashes...
-            EXPERIENCE_ID = uri.getQueryParameter("id");
-            Log.wtf("EXPERIENCE ID", EXPERIENCE_ID);
+            EXPERIENCE_TOKEN = uri.getQueryParameter("id");
+            Log.d(TAG, "Experience Token is " + EXPERIENCE_TOKEN);
+        } else {
+            Log.wtf(TAG, "Activity started from somewhere other than the browser!");
+            disableInteraction();
         }
 
+
         // Listen for device token changes
         this.startObservingGlobals();
 
+
         // Disable interaction initially while token is being fetched
         if(GlobalValues.getInstance().getDeviceToken() == null) {
-            Log.wtf("EXPERIENCE ID", "DISABLING");
             disableInteractionTemporarily();
         } else {
             enableInteraction();
         }
 
+
         // Change all caps text to normal capitalization and add onClick listener
         final Button experienceRegistrationButton = findViewById(R.id.buttonEnterExperience);
         experienceRegistrationButton.setTransformationMethod(null); // TODO: this is a workaround I found, any other acceptable solution is welcome
@@ -140,7 +147,10 @@ public class ExperienceRegistrationActivity  extends AppCompatActivity implement
             }
         });
 
-        experienceRegistrationTask.execute(GlobalValues.getInstance().getDeviceToken(), this.EXPERIENCE_ID);
+        // Start task
+        String deviceToken = GlobalValues.getInstance().getDeviceToken();
+        String experienceToken = this.EXPERIENCE_TOKEN;
+        experienceRegistrationTask.execute(deviceToken, experienceToken);
 
         // UNCOMMENT THIS FOR TESTING (REMEMBER TO COMMENT .execute() LINE)
         /*

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

@@ -74,6 +74,15 @@ public class GettingStartedActivity extends AppCompatActivity {
         String[] permissions = { Manifest.permission.WRITE_EXTERNAL_STORAGE };
         requestPermissions(permissions, 1);
 
+        // If user is already logged in, go to MainActivity
+        SharedPreferences prefs = getSharedPreferences("prefs", MODE_PRIVATE);
+        boolean needsToRegister = prefs.getBoolean("needsToRegister", true);
+        if(!needsToRegister) {
+            Intent intent = new Intent(GettingStartedActivity.this, MainActivity.class);
+            startActivity(intent);
+            return;
+        }
+
         // Attach onClick listeners to buttons
         Button createAccountButton = findViewById(R.id.buttonCreateAccount);
         Button loginAccountButton = findViewById(R.id.buttonRecoverAccount);
@@ -88,7 +97,7 @@ public class GettingStartedActivity extends AppCompatActivity {
         loginAccountButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent loginAccountIntent = new Intent(GettingStartedActivity.this, LoginActivity.class);
+                Intent loginAccountIntent = new Intent(GettingStartedActivity.this, AccountRecoveryActivity.class);
                 startActivity(loginAccountIntent);
             }
         });
@@ -115,6 +124,7 @@ public class GettingStartedActivity extends AppCompatActivity {
 
 
     // TODO: decide which parts in this function to move to a background task
+    // TODO: define a model for the JSON and use Gson to encode it
     private void processConsentResult(TaskResult result) {
 
         boolean consented = (boolean) result.getStepResult(CONSENT_DOC).getResult();
@@ -328,7 +338,7 @@ public class GettingStartedActivity extends AppCompatActivity {
 
     }
 
-
+    // TODO: IO should be moved to a background task
     private String createPdf(byte[] signatureBytes, String consentDate) {
 
         try {

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

@@ -1,78 +0,0 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
-package uprrp.tania.activities;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import uprrp.tania.GlobalValues;
-import uprrp.tania.R;
-import uprrp.tania.SendLoginToServer;
-
-
-public class LoginActivity extends AppCompatActivity {
-
-    private JSONObject recoverAccount = new JSONObject();
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_login);
-
-        final EditText emailText = findViewById(R.id.emailTextRecover);
-        final EditText passwordText = findViewById(R.id.passwordTextRecover);
-
-        final Button recoverButton = findViewById(R.id.recoverButton);
-        recoverButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-
-                    //As long as the email and password have been provided, then we can log in
-                    if (!emailText.getText().toString().equals("")&& !passwordText.getText().toString().equals("")) {
-                        recoverAccount.put("email", emailText.getText());
-                        recoverAccount.put("password", passwordText.getText());
-                        recoverAccount.put("token", GlobalValues.getInstance().getDeviceToken());
-
-                        //Log.d("LOGIN ACCOUNT JSON", recoverAccount.toString());
-                        new SendLoginToServer(getApplicationContext()).execute(recoverAccount.toString());
-
-                    } else {
-                        Toast.makeText(LoginActivity.this, "All fields are needed to complete the login.", Toast.LENGTH_LONG).show();
-                    }
-
-
-                } catch (JSONException e) {
-                    Log.e("LOGIN ACCOUNT ERROR", e.getMessage());
-
-                }
-            }
-
-        });
-
-        //If by some chance they don't remember their password, then lets take them to the recovery activity
-        final Button forgotPasswordButton = findViewById(R.id.forgotPasswordButton);
-        forgotPasswordButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-                Intent needsRegisterIntent = new Intent(LoginActivity.this, ForgotPasswordActivity.class);
-                startActivity(needsRegisterIntent);
-
-            }
-        });
-    }
-}

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

@@ -31,16 +31,6 @@ public class MainActivity extends PinCodeActivity {
         setContentView(R.layout.activity_main);
 
 
-        // We need to know if the user has already registered, otherwise they need to do that first
-        SharedPreferences prefs = getSharedPreferences("prefs", MODE_PRIVATE);
-        boolean needsToRegister = prefs.getBoolean("needsToRegister", true);
-        if(needsToRegister) {
-            Intent needsRegisterIntent = new Intent(this, GettingStartedActivity.class);
-            startActivity(needsRegisterIntent);
-            return;
-        }
-
-
         // Create toolbar
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);

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

@@ -38,7 +38,7 @@ import java.util.Observer;
 
 import uprrp.tania.GlobalValues;
 import uprrp.tania.R;
-import uprrp.tania.URLEventListener;
+import uprrp.tania.utils.URLEventListener;
 import uprrp.tania.models.AnsweredAssessmentModel;
 import uprrp.tania.models.AnsweredQuestionModel;
 import uprrp.tania.models.AssessmentModel;

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

@@ -25,7 +25,7 @@ import java.util.Observer;
 
 import uprrp.tania.GlobalValues;
 import uprrp.tania.R;
-import uprrp.tania.URLEventListener;
+import uprrp.tania.utils.URLEventListener;
 import uprrp.tania.activities.GettingStartedActivity;
 import uprrp.tania.networking.SendWithdrawal;
 

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

@@ -18,7 +18,7 @@ import java.net.URL;
 
 import javax.net.ssl.HttpsURLConnection;
 
-import uprrp.tania.URLEventListener;
+import uprrp.tania.utils.URLEventListener;
 import uprrp.tania.models.AssessmentModel;
 import uprrp.tania.models.EmptyAssessmentModel;
 

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

@@ -19,7 +19,7 @@ import java.net.URL;
 
 import javax.net.ssl.HttpsURLConnection;
 
-import uprrp.tania.URLEventListener;
+import uprrp.tania.utils.URLEventListener;
 import uprrp.tania.models.EmptyUserStatusModel;
 import uprrp.tania.models.UserStatusModel;
 

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

@@ -0,0 +1,151 @@
+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.URLConnection;
+import java.net.URLEncoder;
+
+import uprrp.tania.utils.URLEventListener;
+
+public class SendAccountRecovery extends AsyncTask<String, String, String> {
+
+    private static final String TAG = "SendAccountRecovery";
+    private static final String loginBaseURL = "https://tania.uprrp.edu/recoverAccount.php";
+    private final URLEventListener myCallback;
+
+    public SendAccountRecovery(URLEventListener callback) {
+        this.myCallback = callback;
+    }
+
+    private boolean validInputs(String... strings) {
+
+        if(strings.length != 3) {
+            Log.e(TAG, "Invalid string array length!");
+            return false;
+        }
+
+        String deviceToken = strings[0];
+        String email = strings[1];
+        String password = strings[2];
+
+        if(email == null) {
+            Log.e(TAG, "Encountered null email!");
+            return false;
+        } else if (deviceToken == null) {
+            Log.e(TAG, "Encountered null device token!");
+            return false;
+        } else if (password == null) {
+            Log.e(TAG, "Encountered null password!");
+            return false;
+        }
+
+        return true;
+
+    }
+
+    // TODO: instead of making a normal POST request with
+    //  the body data=<JSON>, we should just send the JSON itself
+    //  This is adding unnecessary layers of complexity when decoding AND encoding
+    /*
+        JSON format:
+        {
+            "email": String,
+            "password": String,
+            "token": String,
+        }
+    */
+    @Override
+    protected String doInBackground(String... strings) {
+
+        // Validation
+        if(!validInputs(strings)) {
+            Log.e(TAG, "Invalid inputs given!");
+            return null;
+        }
+
+        // Extract variables
+        String deviceToken = strings[0];
+        String email = strings[1];
+        String password = strings[2];
+
+        try {
+
+            // Create JSON
+            JSONObject accountRecoveryJSON = new JSONObject();
+            accountRecoveryJSON.put("email", email);
+            accountRecoveryJSON.put("password", password);
+            accountRecoveryJSON.put("token", deviceToken);
+            Log.d(TAG, "RecoveryJSON: " + accountRecoveryJSON.toString());
+
+            // Encode data
+            String encodedRequestBody = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(accountRecoveryJSON.toString(), "UTF-8");
+
+            // Send POST data request
+            URL url = new URL(loginBaseURL);
+            URLConnection conn = 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("Error")) {
+                return null;
+            } else {
+                return response;
+            }
+
+        } catch (JSONException e) {
+            Log.e(TAG, "Couldn't prepare accountRecoveryJSON!");
+            e.printStackTrace();
+            return null;
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Couldn't encode accountRecoveryJSON!");
+            e.printStackTrace();
+            return null;
+        } catch(Exception e) {
+            Log.e(TAG, "Couldn't communicate with server while recovering account!");
+            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(response);
+
+    }
+
+}

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

@@ -18,7 +18,7 @@ import java.net.URLEncoder;
 
 import javax.net.ssl.HttpsURLConnection;
 
-import uprrp.tania.URLEventListener;
+import uprrp.tania.utils.URLEventListener;
 import uprrp.tania.models.AnsweredAssessmentModel;
 
 public class SendAnswers extends AsyncTask<AnsweredAssessmentModel, Void, String> {

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

@@ -15,7 +15,7 @@ import java.net.URLEncoder;
 
 import javax.net.ssl.HttpsURLConnection;
 
-import uprrp.tania.URLEventListener;
+import uprrp.tania.utils.URLEventListener;
 
 public class SendExperienceRegistration extends AsyncTask<String, String, String> {
 
@@ -27,6 +27,28 @@ public class SendExperienceRegistration extends AsyncTask<String, String, String
         this.myCallback = callback;
     }
 
+    private boolean validInputs(String... strings) {
+
+        if(strings.length != 2) {
+            Log.e(TAG, "Invalid string array length!");
+            return false;
+        }
+
+        String deviceToken = strings[0];
+        String experienceID = strings[1];
+
+        if(experienceID == null) {
+            Log.e(TAG, "Encountered null experience ID!");
+            return false;
+        } else if (deviceToken == null) {
+            Log.e(TAG, "Encountered null device token!");
+            return false;
+        }
+
+        return true;
+
+    }
+
     // TODO: instead of making a normal POST request with
     //  the body data=<JSON>, we should just send the JSON itself
     //  This is adding unnecessary layers of complexity when decoding AND encoding
@@ -40,17 +62,16 @@ public class SendExperienceRegistration extends AsyncTask<String, String, String
     @Override
     protected String doInBackground(String... strings) {
 
-        String deviceToken = strings[0];
-        String experienceID = strings[1];
-
-        if(experienceID == null) {
-            Log.e(TAG, "Encountered null experience ID!");
-            return null;
-        } else if (deviceToken == null) {
-            Log.e(TAG, "Encountered null device token!");
+        // Validation
+        if(!validInputs(strings)) {
+            Log.e(TAG, "Invalid inputs given!");
             return null;
         }
 
+        // Extract variables
+        String deviceToken = strings[0];
+        String experienceID = strings[1];
+
         try {
 
             // Create JSON

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

@@ -18,7 +18,7 @@ import java.nio.charset.StandardCharsets;
 
 import javax.net.ssl.HttpsURLConnection;
 
-import uprrp.tania.URLEventListener;
+import uprrp.tania.utils.URLEventListener;
 
 public class SendWithdrawal extends AsyncTask<String, String, String> {
 

app/src/main/java/uprrp/tania/URLEventListener.java → app/src/main/java/uprrp/tania/utils/URLEventListener.java

@@ -1,10 +1,11 @@
-package uprrp.tania;
+package uprrp.tania.utils;
 
 import uprrp.tania.models.AssessmentModel;
 import uprrp.tania.models.UserStatusModel;
 
 public class URLEventListener {
     public void onSuccess() {}
+    public void onSuccess(String response) {}
     public void onSuccess(AssessmentModel assessment) {}
     public void onSuccess(UserStatusModel userStatus) {}
     public void onFailure(Exception e) {}

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

@@ -24,7 +24,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="61dp"
-        android:theme="@style/Theme.MarleApp.AppBarOverlay"
+        android:theme="@style/Theme.TANIA.AppBarOverlay"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -34,7 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/colorPrimary"
-            app:popupTheme="@style/Theme.MarleApp.PopupOverlay" />
+            app:popupTheme="@style/Theme.TANIA.PopupOverlay" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -61,6 +61,7 @@
     <!--  Getting Started Activity  -->
     <string name="createAccountButtonText">Join the Study</string>
     <string name="recoverAccountButtonText">Login</string>
+    <string name="bubbleDescription">Just a blue bubble for decoration</string>
     <string name="overviewTitleText">Welcome</string>
     <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>
@@ -77,5 +78,4 @@
     <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>
-    <string name="bubbleDescription">Just a blue bubble for decoration</string>
 </resources>

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

@@ -1,76 +1,76 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="Theme.MarleApp" parent="Theme.Backbone">
+    <style name="Theme.TANIA" parent="Theme.Backbone">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="alertDialogTheme">@style/Theme.MarleApp.Dialog</item>
-        <item name="toolbarTheme">@style/Theme.MarleApp.Toolbar</item>
+        <item name="alertDialogTheme">@style/Theme.TANIA.Dialog</item>
+        <item name="toolbarTheme">@style/Theme.TANIA.Toolbar</item>
         <item name="android:textColorSecondary">@color/textColor1</item>
     </style>
 
-    <style name="Theme.MarleApp.Survey">
-        <item name="toolbarTheme">@style/Theme.MarleApp.Toolbar.Transparent</item>
+    <style name="Theme.TANIA.Survey">
+        <item name="toolbarTheme">@style/Theme.TANIA.Toolbar.Transparent</item>
         <item name="android:windowBackground">@android:color/white</item>
         <item name="colorPrimaryDark">@color/dark_gray</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
-    <style name="Theme.MarleApp.Toolbar.Transparent">
+    <style name="Theme.TANIA.Toolbar.Transparent">
         <item name="colorControlNormal">@color/rsb_warm_gray</item>
         <item name="colorPrimary">@android:color/white</item>
-        <item name="toolbarStyle">@style/Widget.MarleApp.Toolbar.Transparent</item>
+        <item name="toolbarStyle">@style/Widget.TANIA.Toolbar.Transparent</item>
     </style>
 
-    <style name="Theme.MarleApp.Dialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <style name="Theme.TANIA.Dialog" parent="Theme.AppCompat.Light.Dialog.Alert">
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:textColorPrimary">@color/rsb_warm_gray</item>
         <item name="android:background">@android:color/white</item>
     </style>
 
-    <style name="Theme.MarleApp.Toolbar">
+    <style name="Theme.TANIA.Toolbar">
         <item name="colorControlNormal">@android:color/white</item>
-        <item name="toolbarStyle">@style/Widget.MarleApp.Toolbar</item>
+        <item name="toolbarStyle">@style/Widget.TANIA.Toolbar</item>
     </style>
 
-    <style name="Base.Widget.MarleApp.Toolbar" parent="@style/Widget.AppCompat.Toolbar">
+    <style name="Base.Widget.TANIA.Toolbar" parent="@style/Widget.AppCompat.Toolbar">
         <item name="android:background">?attr/colorPrimary</item>
         <item name="android:minHeight">56dp</item>
-        <item name="titleTextAppearance">@style/TextAppearance.Widget.MarleApp.Toolbar.Title</item>
+        <item name="titleTextAppearance">@style/TextAppearance.Widget.TANIA.Toolbar.Title</item>
     </style>
 
-    <style name="TextAppearance.Widget.MarleApp.Toolbar.Title" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
+    <style name="TextAppearance.Widget.TANIA.Toolbar.Title" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
         <item name="android:textColor">@color/textColor1</item>
         <item name="android:textSize">20sp</item>
     </style>
 
-    <style name="TextAppearance.Widget.MarleApp.Toolbar.Title.Transparent">
+    <style name="TextAppearance.Widget.TANIA.Toolbar.Title.Transparent">
         <item name="android:textColor">@color/textColor1</item>
     </style>
 
-    <style name="Widget.MarleApp.Toolbar" parent="@style/Base.Widget.MarleApp.Toolbar">
+    <style name="Widget.TANIA.Toolbar" parent="@style/Base.Widget.TANIA.Toolbar">
         <item name="android:elevation">4dp</item>
         <item name="android:outlineProvider">bounds</item>
     </style>
 
-    <style name="Widget.MarleApp.Toolbar.Transparent" parent="@style/Base.Widget.MarleApp.Toolbar">
+    <style name="Widget.TANIA.Toolbar.Transparent" parent="@style/Base.Widget.TANIA.Toolbar">
         <item name="android:elevation">0dp</item>
         <item name="android:outlineProvider">none</item>
         <item name="titleTextAppearance">
-            @style/TextAppearance.Widget.MarleApp.Toolbar.Title.Transparent
+            @style/TextAppearance.Widget.TANIA.Toolbar.Title.Transparent
         </item>
     </style>
 
-    <style name="Theme.MarleApp.NoActionBar">
+    <style name="Theme.TANIA.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="Theme.MarleApp.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="Theme.TANIA.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-    <style name="Theme.MarleApp.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="Theme.TANIA.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
 
 </resources>