Added intermediate states between finishing consent form and sending user registration data. Patched issue #6 temporarily. Added many more toasts for improved interaction and UX. Fixed typo bug in SendConsentForm. Substituted HTTP for HTTPS when establishing connections.

app/src/main/AndroidManifest.xml

@@ -45,7 +45,7 @@
             android:parentActivityName=".activities.MainActivity"
             android:theme="@style/Theme.TANIA" />
         <activity
-            android:name=".activities.RegisterActivity"
+            android:name=".activities.UserRegistrationActivity"
             android:parentActivityName=".activities.GettingStartedActivity">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />

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

@@ -3,12 +3,10 @@ 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;
@@ -31,6 +29,7 @@ import uprrp.tania.activities.GettingStartedActivity;
 public class App extends Application {
 
     private static final String TAG = "App";
+    private static final String IDENTITY_POOL_ID = "us-east-1:574094cd-0784-4e26-bd14-4fa72ae63579";
 
     @Override
     public void onCreate() {
@@ -54,6 +53,8 @@ public class App extends Application {
         StorageAccess.getInstance().init(pinCodeConfig, encryptionProvider, fileAccess, database);
 
         // Get device token
+        Toast.makeText(getApplicationContext(), "Waiting for token...", Toast.LENGTH_LONG).show();
+
         FirebaseInstanceId.getInstance().getInstanceId()
                 .addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
                     @Override
@@ -67,12 +68,15 @@ public class App extends Application {
                         // Enable notifications (NEEDS TOKEN TO BE GLOBALLY AVAILABLE)
                         CognitoCachingCredentialsProvider credentialsProvider = new CognitoCachingCredentialsProvider(
                                 getApplicationContext(),
-                                getString(R.string.identityPoolID), // Identity pool ID
+                                IDENTITY_POOL_ID, // Identity pool ID
                                 Regions.US_EAST_1 // Region
                         );
                         SNSRegister snsRegister = new SNSRegister(credentialsProvider);
                         snsRegister.execute();
 
+                        // Notify user of token success
+                        Toast.makeText(getApplicationContext(), "Got token!", Toast.LENGTH_LONG).show();
+
                     }
                 })
                 .addOnFailureListener(new OnFailureListener() {

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

@@ -1,131 +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.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;
-
-import uprrp.tania.activities.MainActivity;
-
-public class SendRegistrationToServer extends AsyncTask <String, String, String> {
-
-
-    private Context context;
-
-    public SendRegistrationToServer(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("REGISTRATION", json);
-        } catch (UnsupportedEncodingException e) {
-            Log.e("REGISTRATION 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/registrationAnd.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 = null;
-
-            // 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("REGISTRATION ERROR", ex.getMessage());
-        }
-        finally
-        {
-            try
-            {
-                assert reader != null;
-                reader.close();
-            }
-            catch(Exception ex) {
-                Log.e("REGISTRATION ERROR", ex.getMessage());
-            }
-        }
-
-        return text;
-
-    }
-
-    @Override
-    protected void onPostExecute(String s) {
-        Log.d("REGISTRATION RESPOND", "The server's response is: " + s);
-
-        String ss = s.substring(0,6);
-        String se = s.substring(0,8);
-        if (ss.equals("Succes")){
-
-            SharedPreferences prefs = context.getSharedPreferences("prefs", Context.MODE_PRIVATE);
-            SharedPreferences.Editor editor = prefs.edit();
-            editor.putBoolean("needsToRegister", false);
-            editor.apply();
-
-            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:to")){
-            Toast.makeText(context, "You have already registered. Please refer to the login page.", 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/GettingStartedActivity.java

@@ -1,6 +1,7 @@
 package uprrp.tania.activities;
 
 import android.Manifest;
+import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -45,13 +46,15 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.Observable;
+import java.util.Observer;
 
 import uprrp.tania.GlobalValues;
 import uprrp.tania.R;
 import uprrp.tania.networking.SendConsentForm;
 import uprrp.tania.utils.URLEventListener;
 
-public class GettingStartedActivity extends AppCompatActivity {
+public class GettingStartedActivity extends AppCompatActivity implements Observer {
 
     private static final String TAG = "GettingStartedActivity";
     private static final int REQUEST_CONSENT = 0;
@@ -69,12 +72,9 @@ public class GettingStartedActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_getting_started);
 
-        // Get permission to write to external storage - files
-        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);
+        final SharedPreferences prefs = getSharedPreferences("prefs", MODE_PRIVATE);
         boolean needsToRegister = prefs.getBoolean("needsToRegister", true);
         if(!needsToRegister) {
             Intent intent = new Intent(GettingStartedActivity.this, MainActivity.class);
@@ -82,15 +82,40 @@ public class GettingStartedActivity extends AppCompatActivity {
             return;
         }
 
+
+        // Get permission to write to external storage - files
+        String[] permissions = { Manifest.permission.WRITE_EXTERNAL_STORAGE };
+        requestPermissions(permissions, 1);
+
+
+        // Listen for device token changes
+        this.startObservingGlobals();
+
+
+        // Disable interaction initially while token is being fetched
+        if(GlobalValues.getInstance().getDeviceToken() == null) {
+            disableInteraction();
+        } else {
+            enableInteraction();
+        }
+
+
         // Attach onClick listeners to buttons
-        Button createAccountButton = findViewById(R.id.buttonCreateAccount);
-        Button loginAccountButton = findViewById(R.id.buttonRecoverAccount);
+        final Button createAccountButton = findViewById(R.id.buttonCreateAccount);
+        final Button loginAccountButton = findViewById(R.id.buttonRecoverAccount);
         createAccountButton.setTransformationMethod(null); // TODO: this is a workaround I found, any other acceptable solution is welcome
         loginAccountButton.setTransformationMethod(null); // TODO: this is a workaround I found, any other acceptable solution is welcome
         createAccountButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                boolean alreadyConsented = prefs.getBoolean("alreadyConsented", false);
+
+                if(alreadyConsented) {
+                    Intent intent = new Intent(GettingStartedActivity.this, UserRegistrationActivity.class);
+                    startActivity(intent);
+                } else {
                     launchConsent();
+                }
             }
         });
         loginAccountButton.setOnClickListener(new View.OnClickListener() {
@@ -103,17 +128,53 @@ public class GettingStartedActivity extends AppCompatActivity {
 
     }
 
+    // TAKEN FROM https://stackoverflow.com/questions/21886768/is-there-any-method-i-can-listen-for-changes-to-global-variable-to-trigger-an-ev
+    private void startObservingGlobals() {
+        GlobalValues.getInstance().addObserver(this);
+    }
+
+    // TAKEN FROM https://stackoverflow.com/questions/21886768/is-there-any-method-i-can-listen-for-changes-to-global-variable-to-trigger-an-ev
+    @Override
+    public void update(Observable observable, Object o) {
+        if(observable instanceof GlobalValues) {
+            if(o instanceof GlobalValues.ValueKey) {
+                if(((GlobalValues.ValueKey) o).getKey() == GlobalValues.ValueName.DEVICE_TOKEN) {
+                    if(GlobalValues.getInstance().getDeviceToken() == null) {
+                        disableInteraction();
+                    } else {
+                        enableInteraction();
+                    }
+                }
+            }
+        }
+    }
+
+    private void enableInteraction() {
+        Button createAccountButton = findViewById(R.id.buttonCreateAccount);
+        Button loginAccountButton = findViewById(R.id.buttonRecoverAccount);
+        createAccountButton.setEnabled(true);
+        loginAccountButton.setEnabled(true);
+    }
+
+    private void disableInteraction() {
+        Button createAccountButton = findViewById(R.id.buttonCreateAccount);
+        Button loginAccountButton = findViewById(R.id.buttonRecoverAccount);
+        createAccountButton.setEnabled(false);
+        loginAccountButton.setEnabled(false);
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if(requestCode == REQUEST_CONSENT && resultCode == RESULT_OK) {
-            processConsentResult((TaskResult) data.getSerializableExtra(ViewTaskActivity.EXTRA_TASK_RESULT));
+            TaskResult taskResult = (TaskResult) data.getSerializableExtra(ViewTaskActivity.EXTRA_TASK_RESULT);
+            this.processConsentResult(taskResult);
         }
     }
 
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions [], int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         if(requestCode == 1) {
             if(grantResults[0] != PackageManager.PERMISSION_GRANTED) {
                 Toast.makeText(getApplicationContext(), "Permission for writing to external storage: DENIED", Toast.LENGTH_LONG).show();
@@ -144,40 +205,57 @@ public class GettingStartedActivity extends AppCompatActivity {
             byte[] signatureBytes = Base64.decode(signatureBase64, Base64.DEFAULT);
             String consentFormBase64 = this.createPdf(signatureBytes, signatureDate);
 
-            // Send JSON with consent form, signature date, and token
-            String deviceToken = GlobalValues.getInstance().getDeviceToken();
-            this.sendConsentForm(deviceToken, consentFormBase64, signatureDate);
-
-            // Save consent signature and date separately on preferences
-            SharedPreferences prefs = getSharedPreferences("prefs", MODE_PRIVATE);
-            SharedPreferences.Editor editor = prefs.edit();
-            editor.putString("consentSignature", signatureBase64);
-            editor.putString("consentDate", signatureDate);
-            editor.apply();
-
-            // Prompt user to register as student
-            Intent registration = new Intent(this, RegisterActivity.class);
-            startActivity(registration);
+            // Send consent form to backend
+            this.sendConsentForm(signatureBase64, consentFormBase64, signatureDate);
 
         }
 
     }
 
-    private void sendConsentForm(String deviceToken, String consentFormBase64, String signatureDate) {
+    private void sendConsentForm(final String signatureBase64, String consentFormBase64, final String signatureDate) {
+
+        Toast.makeText(getApplicationContext(), "Sending consent form...", Toast.LENGTH_LONG).show();
+
+        // Initiate progress dialog
+        // TODO: find substitute for this deprecated dialog box
+//        final ProgressDialog progressDialog = ProgressDialog.show(getApplicationContext(),
+//                "Sending Consent Form",
+//                getString(R.string.progressDialogDescriptionText));
+
         SendConsentForm sendConsentFormTask = new SendConsentForm(new URLEventListener() {
             @Override
             public void onSuccess() {
-                Toast.makeText(getApplicationContext(), "Sent consent form to server!", Toast.LENGTH_LONG).show();
+
+//                progressDialog.dismiss();
+                Toast.makeText(getApplicationContext(), "Consent form sent!", Toast.LENGTH_LONG).show();
+
+                // Save consent signature, consent date and consented boolean on preferences
+                SharedPreferences prefs = getSharedPreferences("prefs", MODE_PRIVATE);
+                SharedPreferences.Editor editor = prefs.edit();
+                editor.putString("consentSignature", signatureBase64);
+                editor.putString("consentDate", signatureDate);
+                editor.putBoolean("alreadyConsented", true);
+                editor.apply();
+
+                // Redirect to UserRegistrationActivity
+                Intent intent = new Intent(getApplicationContext(), UserRegistrationActivity.class);
+                startActivity(intent);
             }
 
             @Override
             public void onFailure(Exception e) {
-                Toast.makeText(getApplicationContext(), "Couldn't send consent form to server!", Toast.LENGTH_LONG).show();
+//                progressDialog.dismiss();
+                Toast.makeText(getApplicationContext(), "Couldn't send consent form to server!\nPlease retry registration...", Toast.LENGTH_LONG).show();
                 Log.e(TAG, "Couldn't send consent form to server!");
                 e.printStackTrace();
+
+                // TODO: prompt retry? although user can just register again...
+                //  1. when cancelling, return to getting started activity
+                //  2. when retrying, just do recursive call
             }
         });
 
+        String deviceToken = GlobalValues.getInstance().getDeviceToken();
         sendConsentFormTask.execute(deviceToken, consentFormBase64, signatureDate);
     }
 
@@ -356,24 +434,25 @@ public class GettingStartedActivity extends AppCompatActivity {
             Font subtitleFont = new Font(Font.FontFamily.HELVETICA, 14, Font.BOLD, BaseColor.BLACK);
             Font signatureSectionFont = new Font(Font.FontFamily.HELVETICA, 12, Font.BOLDITALIC, BaseColor.BLACK);
             int signatureOffsetX = 145;
-            int signatureOffsetY = -24;
+            int signatureOffsetY = -100; // TODO: must set absolute offset to avoid bad signatures from cluttering up the PDF (originally -24)
 
 
-            // Consent Title
+            // Create reusable newline component
+            Paragraph newLine = new Paragraph("\n");
+
+
+            // Consent Section 1 - Overview (Welcome)
             Chunk titleChunk = new Chunk("Consent form:\n" + getString(R.string.appName), titleFont);
             Paragraph title = new Paragraph(titleChunk);
             title.setAlignment(Element.ALIGN_CENTER);
             document.add(title);
-
-            Paragraph newLine = new Paragraph("\n"); // TODO: find out if this is necessary
             document.add(newLine);
 
-
-            // Consent Section 1 - Overview (Welcome)
             String consentOverview = getString(R.string.consentOverview);
             Paragraph paragraph1 = new Paragraph(consentOverview);
             paragraph1.setAlignment(Element.ALIGN_JUSTIFIED);
             document.add(paragraph1);
+            document.add(newLine);
 
 
             // Consent Section 2 - Time Commitment
@@ -385,6 +464,7 @@ public class GettingStartedActivity extends AppCompatActivity {
             Paragraph paragraph2 = new Paragraph(consentTimeCommitment);
             paragraph2.setAlignment(Element.ALIGN_JUSTIFIED);
             document.add(paragraph2);
+            document.add(newLine);
 
 
             // Consent Section 3 - Data Gathering
@@ -396,6 +476,7 @@ public class GettingStartedActivity extends AppCompatActivity {
             Paragraph paragraph3 = new Paragraph(consentDataGathering);
             paragraph3.setAlignment(Element.ALIGN_JUSTIFIED);
             document.add(paragraph3);
+            document.add(newLine);
 
 
             // Consent Section 4 - Privacy
@@ -407,6 +488,7 @@ public class GettingStartedActivity extends AppCompatActivity {
             Paragraph paragraph4 = new Paragraph(consentPrivacy);
             paragraph4.setAlignment(Element.ALIGN_JUSTIFIED);
             document.add(paragraph4);
+            document.add(newLine);
 
 
             // Consent Section 5 - Data Use
@@ -418,6 +500,7 @@ public class GettingStartedActivity extends AppCompatActivity {
             Paragraph paragraph5 = new Paragraph(consentUseOfData);
             paragraph5.setAlignment(Element.ALIGN_JUSTIFIED);
             document.add(paragraph5);
+            document.add(newLine);
 
 
             // Consent Section 6 - General & Conclusion
@@ -429,11 +512,13 @@ public class GettingStartedActivity extends AppCompatActivity {
             Paragraph paragraph6 = new Paragraph(consentGeneral);
             paragraph6.setAlignment(Element.ALIGN_JUSTIFIED);
             document.add(paragraph6);
+            document.add(newLine);
 
             String consentConclusion = getString(R.string.consentConclusion);
             Paragraph paragraph7 = new Paragraph(consentConclusion);
             paragraph7.setAlignment(Element.ALIGN_JUSTIFIED);
             document.add(paragraph7);
+            document.add(newLine);
 
 
             // Signature Section
@@ -455,15 +540,14 @@ public class GettingStartedActivity extends AppCompatActivity {
             document.close();
 
 
-            // Read document back, encode to base64 and return
-            // TODO: find out if we really need to read it back,
-            //  cause AndroidStudio says its value is ignored
+            // Read document back into consentBytes array, and encode it to base64
             File file = new File(filePath);
             int size = (int) file.length();
             byte[] consentBytes = new byte[size];
 
             BufferedInputStream buffer = new BufferedInputStream(new FileInputStream(file));
-            buffer.read(consentBytes, 0, consentBytes.length);
+            int bytesRead = buffer.read(consentBytes, 0, consentBytes.length);
+            Log.d(TAG, "Read a total of " + bytesRead + " bytes, which is supposed to be " + size + " bytes!");
             buffer.close();
 
             return Base64.encodeToString(consentBytes, Base64.DEFAULT);
@@ -491,4 +575,5 @@ public class GettingStartedActivity extends AppCompatActivity {
         }
 
     }
+
 }

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

@@ -1,147 +0,0 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
-package uprrp.tania.activities;
-
-import android.app.DatePickerDialog;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.DatePicker;
-import android.widget.EditText;
-import android.widget.RadioButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Calendar;
-import java.util.Objects;
-
-import uprrp.tania.GlobalValues;
-import uprrp.tania.R;
-import uprrp.tania.SendRegistrationToServer;
-
-public class RegisterActivity extends AppCompatActivity {
-
-    private static final String TAG = "RegisterActivity";
-    private JSONObject registrationInfo = new JSONObject();
-    private DatePickerDialog.OnDateSetListener mDateSetListener;
-    private String name;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_registration);
-
-        final EditText nameEditText = findViewById(R.id.nameEditText);
-
-        final TextView birthDateText = findViewById(R.id.birthDateText);
-
-        final RadioButton maleGender = findViewById(R.id.maleRadioButton);
-        final RadioButton femaleGender = findViewById(R.id.femaleRadioButton);
-        final RadioButton notSpecifyGender = findViewById(R.id.notSayRadioButton);
-        final RadioButton otherGender = findViewById(R.id.otherRadioButton);
-
-        final RadioButton partTime = findViewById(R.id.partTimeRadioButton);
-        final RadioButton fullTime = findViewById(R.id.fullTimeRadioButton);
-        final RadioButton noJob = findViewById(R.id.noJobRadioButton);
-
-        final EditText emailText = findViewById(R.id.emailText);
-        final EditText passwordText = findViewById(R.id.passwordText);
-
-        birthDateText.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Calendar cal = Calendar.getInstance();
-                int year = cal.get(Calendar.YEAR);
-                int month = cal.get(Calendar.MONTH);
-                int day = cal.get(Calendar.DAY_OF_MONTH);
-
-                DatePickerDialog dialog = new DatePickerDialog(
-                        RegisterActivity.this,
-                        android.R.style.Theme_Holo_Light_Dialog_MinWidth,
-                        mDateSetListener,
-                        year, month, day);
-                Objects.requireNonNull(dialog.getWindow()).setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-                dialog.show();
-            }
-        });
-
-        mDateSetListener = new DatePickerDialog.OnDateSetListener() {
-            @Override
-            public void onDateSet(DatePicker datePicker, int year, int month, int day) {
-                month = month + 1;
-                Log.d(TAG, "onDateSet: mm/dd/yyy: " + month + "/" + day + "/" + year);
-
-                String date = month + "/" + day + "/" + year;
-                birthDateText.setText(date);
-            }
-        };
-
-
-        Button buttonRegister = findViewById(R.id.registerButton);
-
-        buttonRegister.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-
-                    if (nameEditText != null) {
-                        name = nameEditText.getText().toString();
-                    }
-                    if (birthDateText.getText() != null && emailText.getText() != null && passwordText.getText() != null && (maleGender.isChecked() || femaleGender.isChecked() || notSpecifyGender.isChecked() || otherGender.isChecked()) && (partTime.isChecked() || fullTime.isChecked() || noJob.isChecked())) {
-                        registrationInfo.put("birthDate", birthDateText.getText().toString());
-                        registrationInfo.put("email", emailText.getText().toString());
-                        registrationInfo.put("password", passwordText.getText().toString());
-
-                        if (maleGender.isChecked()) {
-                            registrationInfo.put("gender", "Male");
-                        } else if (femaleGender.isChecked()) {
-                            registrationInfo.put("gender", "Female");
-                        } else if (notSpecifyGender.isChecked()) {
-                            registrationInfo.put("gender", "Prefer not to say");
-                        } else if (otherGender.isChecked()){
-                            registrationInfo.put("gender", "Other");
-                        }
-
-                        if (partTime.isChecked()) {
-                            registrationInfo.put("hasJob", "Part time");
-                        } else if (fullTime.isChecked()) {
-                            registrationInfo.put("hasJob", "Full time");
-                        } else if (noJob.isChecked()) {
-                            registrationInfo.put("hasJob", "No job");
-                        }
-                        registrationInfo.put("token", GlobalValues.getInstance().getDeviceToken());
-                    } else {
-                        Toast.makeText(RegisterActivity.this, "All the fields are needed to complete registration.", Toast.LENGTH_LONG).show();
-                    }
-
-                    SharedPreferences prefs = getSharedPreferences("prefs", MODE_PRIVATE);
-                    SharedPreferences.Editor editor = prefs.edit();
-                    editor.putString("consentName", name);
-                    editor.apply();
-
-                    Log.d("REGISTER ACTIVITY", registrationInfo.toString());
-                    new SendRegistrationToServer(getApplicationContext()).execute(registrationInfo.toString());
-
-                } catch (JSONException e) {
-                    Log.e("REGISTRATION ERROR", e.getMessage());
-                }
-            }
-        });
-    }
-
-}
-
-
-

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

@@ -0,0 +1,241 @@
+package uprrp.tania.activities;
+
+import android.app.DatePickerDialog;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.DatePicker;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import java.util.Objects;
+
+import uprrp.tania.GlobalValues;
+import uprrp.tania.R;
+import uprrp.tania.networking.SendUserRegistration;
+import uprrp.tania.models.UserModel;
+import uprrp.tania.utils.URLEventListener;
+
+public class UserRegistrationActivity extends AppCompatActivity {
+
+    private static final String TAG = "RegisterActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        // Constructor stuff
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_user_registration);
+
+        // Set onClick listener for the birth date text
+        // TODO: should change UI to use an actual datePicker instead of this garbage
+        final TextView birthDateText = findViewById(R.id.birthDateText);
+        birthDateText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                openDatePickerNew();
+            }
+        });
+
+        // Change all caps text to normal capitalization and add onClick listener
+        final Button buttonRegister = findViewById(R.id.registerButton);
+        buttonRegister.setTransformationMethod(null); // TODO: this is a workaround I found, any other acceptable solution is welcome
+        buttonRegister.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                sendRegistrationData();
+            }
+        });
+
+    }
+
+    private void openDatePickerNew() {
+        final TextView birthDateText = findViewById(R.id.birthDateText);
+
+        DatePickerDialog dialog = new DatePickerDialog(UserRegistrationActivity.this, android.R.style.Theme_Holo_Light_Dialog_MinWidth);
+        dialog.setOnDateSetListener(new DatePickerDialog.OnDateSetListener() {
+            @Override
+            public void onDateSet(DatePicker datePicker, int year, int month, int day) {
+                month = month + 1; // 0-indexed month
+                Log.d(TAG, "onDateSet: mm/dd/yyy: " + month + "/" + day + "/" + year);
+                String date = month + "/" + day + "/" + year;
+                birthDateText.setText(date);
+            }
+        });
+
+        // Remove ugly border
+        Objects.requireNonNull(dialog.getWindow()).setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+        dialog.show();
+    }
+
+    private boolean validInputs() {
+
+        final EditText nameEditText = findViewById(R.id.nameEditText);
+        final TextView birthDateText = findViewById(R.id.birthDateText);
+
+        final RadioButton maleGender = findViewById(R.id.maleRadioButton);
+        final RadioButton femaleGender = findViewById(R.id.femaleRadioButton);
+        final RadioButton notSpecifyGender = findViewById(R.id.notSayRadioButton);
+        final RadioButton otherGender = findViewById(R.id.otherRadioButton);
+
+        final RadioButton partTime = findViewById(R.id.partTimeRadioButton);
+        final RadioButton fullTime = findViewById(R.id.fullTimeRadioButton);
+        final RadioButton noJob = findViewById(R.id.noJobRadioButton);
+
+        final EditText emailText = findViewById(R.id.emailText);
+        final EditText passwordText = findViewById(R.id.passwordText);
+
+        if(nameEditText.getText().toString().equals("")) {
+            return false;
+        }
+
+        if(birthDateText.getText().toString().equals("")) {
+            return false;
+        }
+
+        if(emailText.getText().toString().equals("")) {
+            return false;
+        }
+
+        if(passwordText.getText().toString().equals("")) {
+            return false;
+        }
+
+        // Genders
+        if(!(maleGender.isChecked() || femaleGender.isChecked() || notSpecifyGender.isChecked() || otherGender.isChecked())) {
+            return false;
+        }
+
+        // Job Field
+        if(!(partTime.isChecked() || fullTime.isChecked() || noJob.isChecked())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private void sendRegistrationData() {
+
+        final EditText nameEditText = findViewById(R.id.nameEditText);
+        final TextView birthDateText = findViewById(R.id.birthDateText);
+
+        final RadioButton maleGender = findViewById(R.id.maleRadioButton);
+        final RadioButton femaleGender = findViewById(R.id.femaleRadioButton);
+        final RadioButton notSpecifyGender = findViewById(R.id.notSayRadioButton);
+        final RadioButton otherGender = findViewById(R.id.otherRadioButton);
+
+        final RadioButton partTime = findViewById(R.id.partTimeRadioButton);
+        final RadioButton fullTime = findViewById(R.id.fullTimeRadioButton);
+        final RadioButton noJob = findViewById(R.id.noJobRadioButton);
+
+        final EditText emailText = findViewById(R.id.emailText);
+        final EditText passwordText = findViewById(R.id.passwordText);
+
+
+        if(this.validInputs()) {
+
+            // Extract fields
+            String name = nameEditText.getText().toString();
+            String birthDate = birthDateText.getText().toString();
+            String email = emailText.getText().toString();
+            String password = passwordText.getText().toString();
+            String deviceToken = GlobalValues.getInstance().getDeviceToken();
+
+            String genderText;
+            if(maleGender.isChecked()) {
+                genderText = "Male";
+            } else if (femaleGender.isChecked()) {
+                genderText = "Female";
+            } else if (notSpecifyGender.isChecked()) {
+                genderText = "Prefer not to say";
+            } else if (otherGender.isChecked()){
+                genderText = "Other";
+            } else {
+                Log.wtf(TAG, "Unknown radio button case for gender!");
+                genderText = "Other";
+            }
+
+            String jobType;
+            if(partTime.isChecked()) {
+                jobType = "Part time";
+            } else if (fullTime.isChecked()) {
+                jobType = "Full time";
+            } else if (noJob.isChecked()) {
+                jobType = "No job";
+            } else {
+                Log.wtf(TAG, "Unknown radio button case for job type!");
+                jobType = "No job";
+            }
+
+            // Save name in preferences
+            SharedPreferences prefs = getSharedPreferences("prefs", MODE_PRIVATE);
+            SharedPreferences.Editor editor = prefs.edit();
+            editor.putString("consentName", name);
+            editor.apply();
+
+            // Send registration request
+            UserModel user = new UserModel(birthDate, email, password, genderText, jobType, deviceToken);
+            this.sendUserRegistrationRequest(user);
+
+        } else {
+            Toast.makeText(UserRegistrationActivity.this, "All fields are required!", Toast.LENGTH_LONG).show();
+        }
+
+    }
+
+    private void sendUserRegistrationRequest(UserModel user) {
+
+        // Initiate progress dialog
+        // TODO: find substitute for this deprecated dialog box
+        final ProgressDialog progressDialog = ProgressDialog.show(UserRegistrationActivity.this,
+                "Registering User",
+                getString(R.string.progressDialogDescriptionText));
+
+        // Send registration request to server
+        SendUserRegistration sendUserRegistrationTask = new SendUserRegistration(new URLEventListener() {
+            @Override
+            public void onSuccess() {
+
+                progressDialog.dismiss();
+                Context context = getApplicationContext();
+                Toast.makeText(getApplicationContext(), "Welcome to TANIA!", Toast.LENGTH_LONG).show();
+
+                // Change needsToRegister to false
+                SharedPreferences prefs = context.getSharedPreferences("prefs", Context.MODE_PRIVATE);
+                SharedPreferences.Editor editor = prefs.edit();
+                editor.putBoolean("needsToRegister", false);
+                editor.apply();
+
+                // Redirect to MainActivity
+                Intent intent = new Intent(context, MainActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                context.startActivity(intent);
+            }
+
+            @Override
+            public void onFailure(Exception e) {
+                progressDialog.dismiss();
+                Toast.makeText(getApplicationContext(), "An error occurred while trying to register. Please start again.", Toast.LENGTH_LONG).show();
+                Log.e(TAG, "An error occurred while trying to register user!");
+                e.printStackTrace();
+            }
+        });
+
+        // Start task
+        sendUserRegistrationTask.execute(user);
+
+    }
+
+}

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

@@ -469,7 +469,7 @@ public class AssessmentsFragment extends Fragment implements Observer {
         AlertDialog.Builder builder = new AlertDialog.Builder(Objects.requireNonNull(getContext()));
         builder.setCancelable(true);
         builder.setTitle("ERROR");
-        builder.setMessage("Couldn't send answer!");
+        builder.setMessage("Couldn't send answers!");
         builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {

app/src/main/java/uprrp/tania/models/UserModel.java

@@ -0,0 +1,23 @@
+package uprrp.tania.models;
+
+public class UserModel {
+
+    // NOTE: these attributes must have the same name
+    // as in the JSON and need not be manually initialized
+    String birthDate;
+    String email;
+    String password;
+    String gender;
+    String hasJob;
+    String token;
+
+    public UserModel(String birthDate, String email, String password, String gender, String jobType, String token) {
+        this.birthDate = birthDate;
+        this.email = email;
+        this.password = password;
+        this.gender = gender;
+        this.hasJob = jobType;
+        this.token = token;
+    }
+
+}

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

@@ -13,10 +13,11 @@ 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 javax.net.ssl.HttpsURLConnection;
+
 import uprrp.tania.utils.URLEventListener;
 
 public class SendConsentForm extends AsyncTask <String, Void, String> {
@@ -77,16 +78,16 @@ public class SendConsentForm extends AsyncTask <String, Void, String> {
             // Create JSON
             JSONObject consentFormJSON = new JSONObject();
             consentFormJSON.put("token", deviceToken);
-            consentFormJSON.put("signaturePDFBase64", consentFormBase64);
             consentFormJSON.put("signatureDate", signatureDate);
+            consentFormJSON.put("signaturePDFBase64", consentFormBase64);
             Log.d(TAG, "ConsentFormJSON is " + consentFormJSON.toString()); // log
 
             // Encode data
-            String encodedRequestBody = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(strings[0], "UTF-8");
+            String encodedRequestBody = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(consentFormJSON.toString(), "UTF-8");
 
             // Send POST data request
             URL url = new URL(consentFormBaseURL);
-            URLConnection conn = url.openConnection();
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
             conn.setDoOutput(true);
             Writer writer = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8));
             writer.write(encodedRequestBody);

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

@@ -17,6 +17,8 @@ import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
+import javax.net.ssl.HttpsURLConnection;
+
 import uprrp.tania.utils.URLEventListener;
 
 public class SendResetPassword extends AsyncTask <String, Void, String> {
@@ -86,7 +88,7 @@ public class SendResetPassword extends AsyncTask <String, Void, String> {
 
             // Send POST data request
             URL url = new URL(resetPasswordBaseURL);
-            URLConnection conn = url.openConnection();
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
             conn.setDoOutput(true);
             Writer writer = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8));
             writer.write(encodedRequestBody);

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

@@ -0,0 +1,146 @@
+package uprrp.tania.networking;
+
+import android.os.AsyncTask;
+import android.util.Log;
+
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+
+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.models.UserModel;
+import uprrp.tania.utils.URLEventListener;
+
+public class SendUserRegistration extends AsyncTask <UserModel, Void, String> {
+
+    private static final String TAG = "SendUserRegistration";
+    private static final String sendUserRegistrationURL = "https://tania.uprrp.edu/registrationAnd.php";
+    private final URLEventListener myCallback;
+
+    public SendUserRegistration(URLEventListener callback) {
+        this.myCallback = callback;
+    }
+
+    private boolean validInputs(UserModel... users) {
+
+        if(users.length != 1) {
+            Log.e(TAG, "Invalid array length!");
+            return false;
+        }
+
+        for(int i = 0; i < users.length; i++) {
+            if(users[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,
+            "birthDate": String,
+            "password": String,
+            "gender": String,
+            "hasJob": String,
+            "token": String
+        }
+    */
+    @Override
+    protected String doInBackground(UserModel... users) {
+
+        // Validation
+        if(!validInputs(users)) {
+            Log.e(TAG, "Invalid inputs given!");
+            return null;
+        }
+
+        // Extract variables
+        UserModel user = users[0];
+
+        try {
+
+            // Serialize user
+            GsonBuilder builder = new GsonBuilder();
+//            builder.setPrettyPrinting(); // the server doesn't like pretty printing...
+            String serializedUser = builder.create().toJson(user);
+            Log.d(TAG,"RegistrationJSON is \n" + serializedUser);
+
+            // Encode data
+            String encodedRequestBody = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(serializedUser, "UTF-8");
+
+            // Send POST data request
+            URL url = new URL(sendUserRegistrationURL);
+            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();
+//            String response = "lkajhkljsdhlakjsdhaf";
+            Log.d(TAG, "The server's response is: " + response);
+            if(response.contains("Success")) {
+                return response;
+            } else {
+                return null;
+            }
+
+        } catch (JsonSyntaxException e) {
+            Log.e(TAG, "Failed to JSONify User!");
+            e.printStackTrace();
+            return null;
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Couldn't encode registrationJSON!");
+            e.printStackTrace();
+            return null;
+        } catch(Exception e) {
+            Log.e(TAG,"Couldn't communicate with server while sending user registration!" + e.getMessage());
+            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/values/strings.xml

@@ -16,22 +16,12 @@
 <!--    <string name="log_token">Log Token</string>-->
 <!--    <string name="msg_subscribed">Subscribed to weather topic</string>-->
 
-    <!--  IDK???  -->
+    <!--  ¿¿¿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> <!--might not be necessary-->
     <string name="default_notification_channel_id" translatable="false">fcm_default_channel</string>
 
-    <!--  AmazonCognito Details  -->
-    <string name="identityPoolID">us-east-1:574094cd-0784-4e26-bd14-4fa72ae63579</string>
-    <!--  API Endpoints  -->
-<!--    <string name="sendAnswersURL">https://tania.uprrp.edu/parseAnswers.php</string>-->
-<!--    <string name="activateExperienceURL">https://tania.uprrp.edu/inscripcionExperiencia.php</string>-->
-<!--    <string name="withdrawalURL">https://tania.uprrp.edu/withdrawal.php</string>-->
-<!--    <string name="userStatusBaseURL">https://tania.uprrp.edu/status.php?tk=</string>-->
-<!--    <string name="assessmentsBaseURL">https://tania.uprrp.edu/getSubQ2.php?tk=</string>-->
-<!--    <string name="loginBaseURL">https://tania.uprrp.edu/recoverAccount.php</string>-->
     <!--  General App Configurations  -->
     <string name="appName">TANIA</string>
     <string name="appNameLong">Timely And Non-Intrusive Assessments</string>
@@ -50,7 +40,7 @@
     <string name="withdrawDescriptionText">If you no longer want to participate in this research study, you can choose to withdraw. By withdrawing, you understand that your decision is final and your account on TANIA will be removed without any chance of recovery.</string>
     <!--  Experience Registration Activity  -->
     <string name="experienceRegistrationTitleText">Activate Experience</string>
-    <string name="experienceRegistrationDescriptionText">Click the button below to enter the research experience you are participating in.</string>
+    <string name="experienceRegistrationDescriptionText">Click the button below to enroll on the Experience for the research experience you are participating in.</string>
     <string name="experienceRegistrationButtonText">Enter</string>
     <!--  Consent Document Information  -->
     <string name="consentFileName">/consent-tania-app.pdf</string>
@@ -60,7 +50,7 @@
     <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 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>
+    <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.\n\nYour 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>