Refactored and gave ResetPasswordActivity a makover. Simplified input validation in background tasks. Changed the bottom navigation bar colors for the MainActivity.

app/src/main/AndroidManifest.xml

@@ -16,10 +16,6 @@
         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.TANIA.NoActionBar" />
         <activity android:name=".activities.GettingStartedActivity">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -81,7 +77,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="account"
+                    android:host="reset_password"
                     android:scheme="tania" />
             </intent-filter>
         </activity>

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

@@ -1,122 +0,0 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
-package uprrp.tania;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-import android.util.Log;
-import android.widget.Toast;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-
-import uprrp.tania.activities.MainActivity;
-
-public class SendResetPasswordToServer extends AsyncTask <String, String, String> {
-
-    private Context context;
-
-    public SendResetPasswordToServer(Context context){
-        this.context = context.getApplicationContext();
-    }
-
-    @Override
-    protected String doInBackground(String... strings) {
-        String jsonResetPassword  = "";
-
-        try {
-            jsonResetPassword = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(strings[0], "UTF-8");
-
-        }
-
-        catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        String serverReply = "";
-        BufferedReader serverReader;
-
-        //Send the signature to TANIA's server
-        try
-        {
-            //Defined URL  where to send data
-            URL url = new URL("https://tania.uprrp.edu/resetPassword.php");
-
-            //Send POST data request
-            URLConnection conn = url.openConnection();
-            conn.setDoOutput(true);
-
-            Writer writer = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8));
-            writer.write(jsonResetPassword);
-            writer.close();
-
-            InputStream inputStream = conn.getInputStream();
-            StringBuffer buffer = new StringBuffer();
-
-            if (inputStream == null) {
-                return null;
-            }
-
-            //Get the server response
-            serverReader = new BufferedReader(new InputStreamReader(inputStream));
-            StringBuilder serverResponse = new StringBuilder();
-            String serverResponseLine;
-
-            // Read Server Response
-            while((serverResponseLine = serverReader.readLine()) != null)
-            {
-                //Append server response in string
-                serverResponse.append(serverResponseLine);
-            }
-
-            serverReply = serverResponse.toString();
-        }
-        catch(Exception ex) {
-            Log.e("ERROR RESET PASSWORD", ex.getMessage());
-        }
-
-        return serverReply;
-    }
-
-    @Override
-    protected void onPostExecute(String s) {
-        Log.d("RESET PASSWORD SERVER REPLY", s);
-
-        String ss = s.substring(0,6);
-        String se = s.substring(0,8);
-        if (ss.equals("Succes")){
-
-            try {
-                Intent intent = new Intent(context, MainActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(intent);
-            }
-            catch (Exception e){
-                Log.d("REGISTRATION TO MAIN ACTIVITY", e.getMessage());
-            }
-
-        }
-
-        else if (se.equals("Error:fo")){
-            Toast.makeText(context, "", Toast.LENGTH_LONG).show();
-        }
-
-        else {
-            Toast.makeText(context, "An error occured while trying to register. Please start again.", Toast.LENGTH_LONG).show();
-        }
-
-    }
-}

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

@@ -1,85 +0,0 @@
-package uprrp.tania.activities;
-
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.os.Bundle;
-
-import com.github.barteksc.pdfviewer.PDFView;
-import com.github.barteksc.pdfviewer.listener.OnDrawListener;
-import com.github.barteksc.pdfviewer.listener.OnPageChangeListener;
-import com.github.barteksc.pdfviewer.listener.OnPageErrorListener;
-import com.github.barteksc.pdfviewer.listener.OnRenderListener;
-import com.github.barteksc.pdfviewer.listener.OnTapListener;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
-import android.os.Environment;
-import android.view.MotionEvent;
-import android.widget.Toast;
-
-import java.io.File;
-
-import uprrp.tania.R;
-
-public class ConsentPdfViewerActivity extends AppCompatActivity {
-
-    PDFView pdfView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_consent_pdf_viewer);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        this.pdfView = findViewById(R.id.pdf_viewer);
-        File consentFile = new File(Environment.getExternalStorageDirectory().getPath() + "/consent-tania-app.pdf");
-
-        this.pdfView.fromFile(consentFile)
-            .password(null)
-            .defaultPage(0)
-            .enableSwipe(true)
-            .swipeHorizontal(false)
-            .enableDoubletap(true)
-            .onDraw(new OnDrawListener() {
-                @Override
-                public void onLayerDrawn(Canvas canvas, float pageWidth, float pageHeight, int displayedPage) {
-                   // Code here if you want to do something
-                }
-            })
-            .onDrawAll(new OnDrawListener() {
-                @Override
-                public void onLayerDrawn(Canvas canvas, float pageWidth, float pageHeight, int displayedPage) {
-                    // Code here if you want to do something
-                }
-            })
-            .onPageError(new OnPageErrorListener() {
-                @Override
-                public void onPageError(int page, Throwable t) {
-                    Toast.makeText(ConsentPdfViewerActivity.this, "Error opening page " + page, Toast.LENGTH_LONG).show();
-                }
-            })
-            .onPageChange(new OnPageChangeListener() {
-                @Override
-                public void onPageChanged(int page, int pageCount) {
-                    //Code here
-                }
-            })
-            .onTap(new OnTapListener() {
-                @Override
-                public boolean onTap(MotionEvent e) {
-                    return true;
-                }
-            })
-            .onRender(new OnRenderListener() {
-                @Override
-                public void onInitiallyRendered(int nbPages, float pageWidth, float pageHeight) {
-                    pdfView.fitToWidth();
-                }
-            })
-            .enableAnnotationRendering(true)
-            .invalidPageColor(Color.WHITE)
-            .load();
-    }
-
-}

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

@@ -1,8 +1,7 @@
 package uprrp.tania.activities;
 
-import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.MenuItem;
 
 import androidx.annotation.NonNull;
@@ -48,18 +47,16 @@ public class MainActivity extends PinCodeActivity {
 
                 Fragment selectedFragment;
 
-                switch (item.getItemId()) {
-                    case R.id.nav_assessments:
-                        selectedFragment = new AssessmentsFragment();
-                        break;
-                    case R.id.nav_consent:
-                        selectedFragment = new ConsentFragment();
-                        break;
-                    case R.id.nav_settings:
-                        selectedFragment = new WithdrawFragment();
-                        break;
-                    default:
-                        selectedFragment = new Fragment();
+                int id = item.getItemId();
+                if(id == R.id.nav_assessments) {
+                    selectedFragment = new AssessmentsFragment();
+                } else if(id == R.id.nav_consent) {
+                    selectedFragment = new ConsentFragment();
+                } else if(id == R.id.nav_settings) {
+                    selectedFragment = new WithdrawFragment();
+                } else {
+                    Log.wtf(TAG, "Illegal fragment reach attempt with id: " + id);
+                    selectedFragment = new Fragment(); // use empty fragment
                 }
 
                 getSupportFragmentManager()

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

@@ -1,10 +1,6 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
 package uprrp.tania.activities;
 
+import android.app.ProgressDialog;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -17,60 +13,90 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.json.JSONObject;
-
 import uprrp.tania.GlobalValues;
 import uprrp.tania.R;
-import uprrp.tania.SendResetPasswordToServer;
+import uprrp.tania.networking.SendResetPassword;
+import uprrp.tania.utils.URLEventListener;
 
 public class ResetPasswordActivity extends AppCompatActivity {
 
-    String forgotPasswordKey;
+    private static final String TAG = "ResetPasswordActivity";
+    private String FORGOT_PASSWORD_KEY;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+
+        // Constructor stuff
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_reset_password);
 
+        // Fetch experience token from URL (only if we launched this Activity from Browser)
         Intent intent = getIntent();
-        if(Intent.ACTION_VIEW.equals(intent.getAction())){
+        if(Intent.ACTION_VIEW.equals(intent.getAction())) {
             Uri uri = intent.getData();
-            assert uri != null;
-            forgotPasswordKey = uri.getQueryParameter("id");
+            assert uri != null; // TODO: figure out if this causes crashes...
+            FORGOT_PASSWORD_KEY = uri.getQueryParameter("forgotPasswordKey");
+            Log.d(TAG, "ForgotPasswordKey is " + FORGOT_PASSWORD_KEY);
+        } else {
+            Log.wtf(TAG, "Activity started from somewhere other than the browser!");
         }
 
-
-        final EditText newPassword = findViewById(R.id.editTextNewPassword);
-        final EditText confirmPassword = findViewById(R.id.editTextConfirmPassword);
-
-        final JSONObject resetPasswordJSON = new JSONObject();
-
-        final Button resetPassword = findViewById(R.id.buttonResetPassword);
-        resetPassword.setOnClickListener(new View.OnClickListener() {
+        // Change all caps text to normal capitalization and add onClick listeners
+        final Button resetPasswordButton = findViewById(R.id.buttonResetPassword);
+        resetPasswordButton.setTransformationMethod(null); // TODO: this is a workaround I found, any other acceptable solution is welcome
+        resetPasswordButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                try {
-                    if (newPassword.getText().toString().equals(confirmPassword.getText().toString())){
-                        resetPasswordJSON.put("token", GlobalValues.getInstance().getDeviceToken());
-                        resetPasswordJSON.put("password", newPassword.getText().toString());
-                        resetPasswordJSON.put("forgotPasswordKey", forgotPasswordKey);
+                sendPasswordResetRequest();
+            }
+        });
 
-                        Log.d("RESET PASSWORD JSON", resetPasswordJSON.toString());
+    }
 
-                        SendResetPasswordToServer sendResetPasswordToServer = new SendResetPasswordToServer(getApplicationContext());
-                        sendResetPasswordToServer.execute(resetPasswordJSON.toString());
+    private void sendPasswordResetRequest() {
 
+        final EditText newPasswordEditText = findViewById(R.id.editTextNewPassword);
+        final EditText confirmPasswordEditText = findViewById(R.id.editTextConfirmPassword);
 
-                    }
-                    else{
-                        Toast.makeText(ResetPasswordActivity.this, "The password and confirmation must match!", Toast.LENGTH_LONG).show();
-                    }
+        String newPassword = newPasswordEditText.getText().toString();
+        String confirmPassword = confirmPasswordEditText.getText().toString();
 
+        if(newPassword.equals(confirmPassword) && !newPassword.equals("")) {
 
-                } catch (Exception e) {
+            // Initiate progress dialog
+            // TODO: find substitute for this deprecated dialog box
+            final ProgressDialog progressDialog = ProgressDialog.show(ResetPasswordActivity.this,
+                    "Resetting Password",
+                    getString(R.string.progressDialogDescriptionText));
+
+            // Define task
+            SendResetPassword sendResetPasswordTask = new SendResetPassword(new URLEventListener() {
+                @Override
+                public void onSuccess() {
+                    progressDialog.dismiss();
+                    Toast.makeText(getApplicationContext(), "Success!\nYou can login with your new password now.", Toast.LENGTH_SHORT).show();
+                    Intent intent = new Intent(getApplicationContext(), GettingStartedActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    startActivity(intent);
+                }
+
+                @Override
+                public void onFailure(Exception e) {
+                    progressDialog.dismiss();
+                    Toast.makeText(getApplicationContext(), "An error occurred while trying to register. Please try again.", Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "Couldn't reset password!");
                     e.printStackTrace();
                 }
-            }
-        });
+            });
+
+            // Start task
+            String deviceToken = GlobalValues.getInstance().getDeviceToken();
+            sendResetPasswordTask.execute(deviceToken, newPassword, FORGOT_PASSWORD_KEY);
+
+        } else {
+            Toast.makeText(ResetPasswordActivity.this, "Both fields must match and can't be blank!", Toast.LENGTH_LONG).show();
+        }
+
 
     }
 }

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

@@ -39,11 +39,11 @@ public class FetchAssessment extends AsyncTask<String, Void, JSONObject> {
             return false;
         }
 
-        String deviceToken = strings[0];
-
-        if(deviceToken == null) {
-            Log.e(TAG, "Encountered null device token!");
-            return false;
+        for(int i = 0; i < strings.length; i++) {
+            if(strings[i] == null) {
+                Log.e(TAG, "Encountered null parameter on index " + i);
+                return false;
+            }
         }
 
         return true;

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

@@ -40,11 +40,11 @@ public class FetchUserStatus extends AsyncTask<String, Void, JSONArray> {
             return false;
         }
 
-        String deviceToken = strings[0];
-
-        if(deviceToken == null) {
-            Log.e(TAG, "Encountered null device token!");
-            return false;
+        for(int i = 0; i < strings.length; i++) {
+            if(strings[i] == null) {
+                Log.e(TAG, "Encountered null parameter on index " + i);
+                return false;
+            }
         }
 
         return true;

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

@@ -34,19 +34,11 @@ public class SendAccountRecovery extends AsyncTask<String, Void, String> {
             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;
+        for(int i = 0; i < strings.length; i++) {
+            if(strings[i] == null) {
+                Log.e(TAG, "Encountered null parameter on index " + i);
+                return false;
+            }
         }
 
         return true;

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

@@ -31,18 +31,18 @@ public class SendAnswers extends AsyncTask<AnsweredAssessmentModel, Void, String
         this.myCallback = callback;
     }
 
-    private boolean validInputs(AnsweredAssessmentModel... answeredAssessments) {
+    private boolean validInputs(AnsweredAssessmentModel... assessments) {
 
-        if(answeredAssessments.length != 1) {
+        if(assessments.length != 1) {
             Log.e(TAG, "Invalid array length!");
             return false;
         }
 
-        AnsweredAssessmentModel assessment = answeredAssessments[0];
-
-        if(assessment == null) {
-            Log.e(TAG, "Encountered null assessment!");
-            return false;
+        for(int i = 0; i < assessments.length; i++) {
+            if(assessments[i] == null) {
+                Log.e(TAG, "Encountered null parameter on index " + i);
+                return false;
+            }
         }
 
         return true;
@@ -93,16 +93,16 @@ public class SendAnswers extends AsyncTask<AnsweredAssessmentModel, Void, String
         }
      */
     @Override
-    protected String doInBackground(AnsweredAssessmentModel... answeredAssessments) {
+    protected String doInBackground(AnsweredAssessmentModel... assessments) {
 
         // Validation
-        if(!validInputs(answeredAssessments)) {
+        if(!validInputs(assessments)) {
             Log.e(TAG, "Invalid inputs given!");
             return null;
         }
 
         // Extract variables
-        AnsweredAssessmentModel answeredAssessment = answeredAssessments[0]; // array will only ever contain a single element
+        AnsweredAssessmentModel answeredAssessment = assessments[0]; // array will only ever contain a single element
 
         try {
 

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

@@ -36,19 +36,11 @@ public class SendConsentForm extends AsyncTask <String, Void, String> {
             return false;
         }
 
-        String deviceToken = strings[0];
-        String consentFormBase64 = strings[1];
-        String signatureDate = strings[2];
-
-        if(consentFormBase64 == null) {
-            Log.e(TAG, "Encountered null consent form!");
-            return false;
-        } else if (deviceToken == null) {
-            Log.e(TAG, "Encountered null device token!");
-            return false;
-        } else if (signatureDate == null) {
-            Log.e(TAG, "Encountered null signature date!");
-            return false;
+        for(int i = 0; i < strings.length; i++) {
+            if(strings[i] == null) {
+                Log.e(TAG, "Encountered null parameter on index " + i);
+                return false;
+            }
         }
 
         return true;
@@ -123,7 +115,7 @@ public class SendConsentForm extends AsyncTask <String, Void, String> {
             e.printStackTrace();
             return null;
         } catch (UnsupportedEncodingException e) {
-            Log.e(TAG, "Couldn't encode consentFormJSON");
+            Log.e(TAG, "Couldn't encode consentFormJSON!");
             e.printStackTrace();
             return null;
         } catch(Exception e) {

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

@@ -34,15 +34,11 @@ public class SendExperienceRegistration extends AsyncTask<String, Void, String>
             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;
+        for(int i = 0; i < strings.length; i++) {
+            if(strings[i] == null) {
+                Log.e(TAG, "Encountered null parameter on index " + i);
+                return false;
+            }
         }
 
         return true;

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

@@ -34,17 +34,26 @@ public class SendRecoveryEmail extends AsyncTask<String, String, String> {
             return false;
         }
 
-        String email = strings[0];
-
-        if(email == null) {
-            Log.e(TAG, "Encountered null email!");
-            return false;
+        for(int i = 0; i < strings.length; i++) {
+            if(strings[i] == null) {
+                Log.e(TAG, "Encountered null parameter on index " + i);
+                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,
+        }
+    */
     @Override
     protected String doInBackground(String... strings) {
 

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

@@ -0,0 +1,145 @@
+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.BufferedWriter;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+import uprrp.tania.utils.URLEventListener;
+
+public class SendResetPassword extends AsyncTask <String, Void, String> {
+
+    private static final String TAG = "SendResetPassword";
+    private static final String resetPasswordBaseURL = "https://tania.uprrp.edu/resetPassword.php";
+    private final URLEventListener myCallback;
+
+    public SendResetPassword(URLEventListener callback){
+        this.myCallback = callback;
+    }
+
+    private boolean validInputs(String... strings) {
+
+        if(strings.length != 3) {
+            Log.e(TAG, "Invalid string array length!");
+            return false;
+        }
+
+        for(int i = 0; i < strings.length; i++) {
+            if(strings[i] == null) {
+                Log.e(TAG, "Encountered null parameter on index " + i);
+                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:
+        {
+            "forgotPasswordKey": 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 newPassword = strings[1];
+        String forgotPasswordKey = strings[2];
+
+        try {
+
+            // Create JSON
+            JSONObject resetPasswordJSON = new JSONObject();
+            resetPasswordJSON.put("token", deviceToken);
+            resetPasswordJSON.put("password", newPassword);
+            resetPasswordJSON.put("forgotPasswordKey", forgotPasswordKey);
+            Log.d(TAG, "resetPasswordJSON is " + resetPasswordJSON.toString());
+
+            // Encode data
+            String encodedRequestBody = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(resetPasswordJSON.toString(), "UTF-8");
+
+            // Send POST data request
+            URL url = new URL(resetPasswordBaseURL);
+            URLConnection conn = url.openConnection();
+            conn.setDoOutput(true);
+            Writer writer = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8));
+            writer.write(encodedRequestBody);
+            writer.close();
+
+            // 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 resetPasswordJSON!");
+            e.printStackTrace();
+            return null;
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Couldn't encode resetPasswordJSON!");
+            e.printStackTrace();
+            return null;
+        } catch(Exception e) {
+            Log.e(TAG, "Couldn't communicate with server while resetting password!");
+            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/java/uprrp/tania/networking/SendWithdrawal.java

@@ -37,11 +37,11 @@ public class SendWithdrawal extends AsyncTask<String, Void, String> {
             return false;
         }
 
-        String deviceToken = strings[0];
-
-        if(deviceToken == null) {
-            Log.e(TAG, "Encountered null device token!");
-            return false;
+        for(int i = 0; i < strings.length; i++) {
+            if(strings[i] == null) {
+                Log.e(TAG, "Encountered null parameter on index " + i);
+                return false;
+            }
         }
 
         return true;

app/src/main/res/color/bottom_nav_selector.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_checked="true" android:color="@color/colorAccent" />
-    <item android:color="@color/textColor1"  />
+    <item android:state_checked="true" android:color="@android:color/white" />
+    <item android:color="#80FFFFFF" />
 
 </selector>

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

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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:id="@+id/ConstraintLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="uprrp.tania.activities.ConsentPdfViewerActivity">
-
-
-    <com.github.barteksc.pdfviewer.PDFView
-        android:id="@+id/pdf_viewer"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
-
-    </com.github.barteksc.pdfviewer.PDFView>
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="61dp"
-        android:theme="@style/Theme.TANIA.AppBarOverlay"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/Theme.TANIA.PopupOverlay" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,68 +2,74 @@
 <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:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/textViewResetPassword"
-        android:layout_width="310dp"
-        android:layout_height="34dp"
-        android:fontFamily="@font/acme"
-        android:text="Reset your password:"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginTop="@dimen/verticalMargin"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:fontFamily="@font/cabin"
+        android:text="@string/resetPasswordDescriptionText"
         android:textAlignment="center"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:textColor="@color/textColor2"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/buttonResetPassword"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.495"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.318" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <EditText
         android:id="@+id/editTextNewPassword"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:autofillHints="AUTOFILL_HINT_PASSWORD"
+        android:backgroundTint="@color/colorPrimary"
         android:ems="10"
-        android:fontFamily="@font/acme"
-        android:hint="New password"
+        android:hint="@string/newPasswordButtonHint"
         android:inputType="textPassword"
-        android:textAlignment="center"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:textColor="@color/textColor2"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewResetPassword"
-        app:layout_constraintVertical_bias="0.055" />
+        app:layout_constraintTop_toBottomOf="@+id/textViewResetPassword" />
 
     <EditText
         android:id="@+id/editTextConfirmPassword"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:autofillHints="AUTOFILL_HINT_PASSWORD"
+        android:backgroundTint="@color/colorPrimary"
         android:ems="10"
-        android:fontFamily="@font/acme"
-        android:hint="Confirm password"
+        android:hint="@string/confirmPasswordButtonHint"
         android:inputType="textPassword"
-        android:textAlignment="center"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.494"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editTextNewPassword"
-        app:layout_constraintVertical_bias="0.019" />
+        android:textColor="@color/textColor2"
+        app:layout_constraintEnd_toEndOf="@+id/editTextNewPassword"
+        app:layout_constraintStart_toStartOf="@+id/editTextNewPassword"
+        app:layout_constraintTop_toBottomOf="@+id/editTextNewPassword" />
 
     <Button
         android:id="@+id/buttonResetPassword"
-        android:layout_width="309dp"
-        android:layout_height="47dp"
-        android:background="@color/colorPrimary"
-        android:fontFamily="@font/acme"
-        android:text="Reset Password"
-        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/resetPasswordButtonText"
+        android:textColor="@android:color/white"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editTextConfirmPassword"
-        app:layout_constraintVertical_bias="0.095" />
+        app:layout_constraintTop_toBottomOf="@+id/textViewResetPassword" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="uprrp.tania.activities.ConsentPdfViewerActivity"
-    tools:showIn="@layout/activity_consent_pdf_viewer">
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -89,4 +89,9 @@
     <!--  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>
+    <!--  Reset Password Activity  -->
+    <string name="resetPasswordDescriptionText">Reset your Password</string>
+    <string name="confirmPasswordButtonHint">Confirm Password</string>
+    <string name="newPasswordButtonHint">New Password</string>
+    <string name="resetPasswordButtonText">Reset Password</string>
 </resources>