ExperienceRegistration got a makeover. Fixes scaled questions bug. Implements 'Retry/Cancel' logic when sending survey answers. Adds multiline open answers (yet limits them to database limit). Heavy refactoring once more.

app/build.gradle

@@ -66,6 +66,7 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui:2.2.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.12'
 
     implementation 'com.android.support:support-v4:28.0.0'

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

@@ -1,95 +0,0 @@
-package uprrp.tania;
-
-import android.os.AsyncTask;
-import android.util.Log;
-
-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;
-
-public class SendActivateExperienceToServer extends AsyncTask<String, String, String> {
-
-    private final String TAG = "SendActivateExperience";
-    private final URLEventListener myCallBack;
-    private URLEventListener myCallback;
-
-    public SendActivateExperienceToServer(URLEventListener callback) {
-        this.myCallBack = callback;
-    }
-
-    @Override
-    protected String doInBackground(String... strings) {
-
-        String experienceRegistrationJSON = strings[0]; // array will only ever contain a single element
-        String jsonActivateExperience = "";
-
-        // Encode data
-        try {
-            jsonActivateExperience = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(experienceRegistrationJSON, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            Log.e(TAG, "Couldn't encode the following JSON: " + experienceRegistrationJSON);
-            e.printStackTrace();
-            return null;
-        }
-
-        // Send data
-        try {
-
-            // Send POST data request
-            URL url = new URL("https://tania.uprrp.edu/inscripcionExperiencia.php"); // TODO: extract URL into @string/activateExperienceURL
-            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
-            conn.setDoOutput(true);
-            OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-            wr.write(jsonActivateExperience);
-            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();
-            if(response.startsWith("Success")) {
-                return response;
-            } else {
-                return null;
-            }
-
-
-        } catch(Exception e) {
-            Log.e("Couldn't communicate with server while activating experience!", e.getMessage());
-        }
-
-        return null;
-
-    }
-
-    @Override
-    protected void onPostExecute(String response) {
-
-        if(this.myCallBack == null) {
-            this.myCallBack.onFailure(new Exception("Callback wasn't initialized first!"));
-            return;
-        }
-
-        if(response == null) {
-            this.myCallback.onFailure(new Exception("Error occurred during transaction!"));
-            return;
-        }
-
-        Log.d("ACTIVATE EXPERIENCE RESPONSE", "The server's response is: " + response);
-        this.myCallBack.onSuccess();
-
-    }
-
-}

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

@@ -1,71 +0,0 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
-package uprrp.tania;
-
-import android.os.AsyncTask;
-import android.util.Log;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-
-public class SendAnswersToServer extends AsyncTask <String, String, String> {
-    @Override
-    protected String doInBackground(String... strings) {
-        String jsonSurveyAnswers  = " ";
-        try {
-            jsonSurveyAnswers = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(strings[0], "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        String serverReply = "";
-        BufferedReader serverReader;
-
-        //Send data
-        try
-        {
-            //Defined URL  where to send data
-            URL url = new URL("https://tania.uprrp.edu/parseAnswers.php");
-
-            // Send POST data request
-            URLConnection conn = url.openConnection();
-            conn.setDoOutput(true);
-            OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-            wr.write(jsonSurveyAnswers);
-            wr.flush();
-
-            // Get the server response
-            serverReader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            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 SURVEYS ANSWERS", ex.getMessage());
-        }
-
-        return serverReply;
-    }
-
-    @Override
-    protected void onPostExecute(String s) {
-        Log.d("SURVEYS ANSWERS REPLY", s);
-
-    }
-
-}

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

@@ -1,118 +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 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.GettingStartedActivity;
-
-public class SendWithdrawalToServer extends AsyncTask<String, String, String> {
-
-    private Context context;
-
-    public SendWithdrawalToServer(Context context){
-        this.context = context.getApplicationContext();
-    }
-    @Override
-    protected String doInBackground(String... strings) {
-        String jsonWithdraw  = "";
-
-        try {
-            jsonWithdraw = 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/withdrawal.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(jsonWithdraw);
-            writer.close();
-
-            InputStream inputStream = conn.getInputStream();
-
-            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 WITHDRAWAL", ex.getMessage());
-        }
-
-        return serverReply;
-    }
-
-    @Override
-    protected void onPostExecute(String s) {
-        Log.d("WITHDRAWAL SERVER REPLY", s);
-
-        String ss = s.substring(0,6);
-        String se = s.substring(0,7);
-        if (ss.equals("Succes")){
-
-            SharedPreferences prefs = context.getSharedPreferences("prefs", Context.MODE_PRIVATE);
-            SharedPreferences.Editor editor = prefs.edit();
-            editor.putBoolean("needsToRegister", true);
-            editor.apply();
-
-            try {
-                Intent intent = new Intent(context, GettingStartedActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(intent);
-            }
-            catch (Exception e){
-                Log.d("WITHDRAWAL TO GETTING STARTED", e.getMessage());
-            }
-
-
-        }
-
-    }
-}

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

@@ -4,8 +4,8 @@ import uprrp.tania.models.AssessmentModel;
 import uprrp.tania.models.UserStatusModel;
 
 public class URLEventListener {
-    public void onSuccess() {};
-    public void onSuccess(AssessmentModel assessment) {};
-    public void onSuccess(UserStatusModel userStatus) {};
-    public void onFailure(Exception e) {};
+    public void onSuccess() {}
+    public void onSuccess(AssessmentModel assessment) {}
+    public void onSuccess(UserStatusModel userStatus) {}
+    public void onFailure(Exception e) {}
 }

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

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -18,18 +17,15 @@ import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.InstanceIdResult;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import uprrp.tania.R;
-import uprrp.tania.SendActivateExperienceToServer;
+import uprrp.tania.networking.SendExperienceRegistration;
 import uprrp.tania.URLEventListener;
 
 public class ExperienceRegistrationActivity  extends AppCompatActivity {
 
-    private final String TAG = "ExperienceRegistrationActivity";
-    private String device_token;
-    private String id_experience;
+    private static final String TAG = "ExperienceRegistrationActivity";
+    private String DEVICE_TOKEN;
+    private String EXPERIENCE_ID;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -44,90 +40,24 @@ public class ExperienceRegistrationActivity  extends AppCompatActivity {
         experienceRegistrationButton.setTransformationMethod(null);
 
         // Request to Firebase...
+        // TODO: Should we implement retry logic in onFailureListener?
         FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
             @Override
             public void onSuccess(InstanceIdResult instanceIdResult) {
 
             // Get device's token
-            device_token = instanceIdResult.getToken();
+            // IMPORTANT: must come first before calling
+            // another function that uses the token
+            DEVICE_TOKEN = instanceIdResult.getToken();
 
             // Set onClick listener on button
             experienceRegistrationButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-
-                    // Initiate progress dialog
-                    // TODO: find substitute for this deprecated dialog box
-                    final ProgressDialog progressDialog = ProgressDialog.show(ExperienceRegistrationActivity.this,
-                            "Registering in Experience",
-                            "This shouldn't take long");
-
-                    if(!id_experience.equals("") && id_experience != null) {
-                        try {
-
-                            // Create JSON with details we'll send
-                            JSONObject experienceCodeJSON = new JSONObject();
-                            experienceCodeJSON.put("token", device_token);
-                            experienceCodeJSON.put("id_experiencia", id_experience);
-                            Log.d("EXPERIENCE CODE JSON", experienceCodeJSON.toString());
-
-                            // Send registration request to server
-                            SendActivateExperienceToServer experienceRegistrationTask = new SendActivateExperienceToServer(new URLEventListener() {
-                                @Override
-                                public void onSuccess() {
-                                    progressDialog.dismiss();
-                                    Context context = ExperienceRegistrationActivity.this;
-                                    Intent intent = new Intent(context, MainActivity.class);
-                                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                    context.startActivity(intent);
-                                    Toast.makeText(getApplicationContext(), "You have been registered!", Toast.LENGTH_LONG).show();
-                                }
-
-                                @Override
-                                public void onFailure(Exception e) {
-                                    progressDialog.dismiss();
-                                    // TODO: restrict double registration (maybe in backend?)
-                                    Toast.makeText(ExperienceRegistrationActivity.this, "Oops! Something went wrong...", Toast.LENGTH_LONG).show();
-                                    Log.e(TAG, "Error occurred while sending registration request to server...");
-                                    e.printStackTrace();
-                                }
-                            });
-
-                            experienceRegistrationTask.execute(experienceCodeJSON.toString());
-
-                            // UNCOMMENT THIS FOR TESTING (REMEMBER TO COMMENT .execute() LINE)
-                            /*
-                            Handler handler = new Handler();
-                            handler.postDelayed(new Runnable() {
-                                public void run() {
-                                    progressDialog.dismiss();
-                                    if(false) { // Imitate success
-                                        Context context = ExperienceRegistrationActivity.this;
-                                        Intent intent = new Intent(context, MainActivity.class);
-                                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                        context.startActivity(intent);
-                                        Toast.makeText(getApplicationContext(), "You have been registered!", Toast.LENGTH_LONG).show();
-                                    } else { // Imitate failure
-                                        Toast.makeText(ExperienceRegistrationActivity.this, "Oops! Something went wrong...", Toast.LENGTH_LONG).show();
-                                    }
-                                }
-                            }, 5000);
-                            */
-                            // UNCOMMENT THIS FOR TESTING (REMEMBER TO COMMENT .execute() LINE)
-
-                        } catch (JSONException e) {
-                            progressDialog.dismiss();
-                            Toast.makeText(ExperienceRegistrationActivity.this, "Oops! Something went wrong...", Toast.LENGTH_LONG).show();
-                            Log.e(TAG, "Error occurred while preparing JSON for server");
-                            e.printStackTrace();
-                        }
-                    } else {
-                        progressDialog.dismiss();
-                        Toast.makeText(ExperienceRegistrationActivity.this, "Invalid URL!", Toast.LENGTH_LONG).show();
-                        Log.d(TAG, "Invalid query parameter found (" + id_experience + ")");
-                    }
+                    sendRegistrationRequest();
                 }
             });
+
             }
         });
 
@@ -136,9 +66,62 @@ public class ExperienceRegistrationActivity  extends AppCompatActivity {
         if(Intent.ACTION_VIEW.equals(intent.getAction())) {
             Uri uri = intent.getData();
             assert uri != null; // TODO: figure out if this causes crashes...
-            id_experience = uri.getQueryParameter("id");
+            EXPERIENCE_ID = uri.getQueryParameter("id");
         }
 
     }
 
+    private void sendRegistrationRequest() {
+
+        // Initiate progress dialog
+        // TODO: find substitute for this deprecated dialog box
+        final ProgressDialog progressDialog = ProgressDialog.show(ExperienceRegistrationActivity.this,
+                "Registering in Experience",
+                "This shouldn't take long");
+
+        // Send registration request to server
+        SendExperienceRegistration experienceRegistrationTask = new SendExperienceRegistration(new URLEventListener() {
+            @Override
+            public void onSuccess() {
+                progressDialog.dismiss();
+                Context context = ExperienceRegistrationActivity.this;
+                Intent intent = new Intent(context, MainActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                context.startActivity(intent);
+                Toast.makeText(getApplicationContext(), "You have been registered!", Toast.LENGTH_LONG).show();
+            }
+
+            @Override
+            public void onFailure(Exception e) {
+                progressDialog.dismiss();
+                Toast.makeText(ExperienceRegistrationActivity.this, "Oops! Something went wrong...\nPlease try again", Toast.LENGTH_LONG).show();
+                Log.e(TAG, "Error occurred while sending registration request to server...");
+                e.printStackTrace();
+            }
+        });
+
+        experienceRegistrationTask.execute(this.DEVICE_TOKEN, this.EXPERIENCE_ID);
+
+        // UNCOMMENT THIS FOR TESTING (REMEMBER TO COMMENT .execute() LINE)
+        /*
+        Handler handler = new Handler();
+        handler.postDelayed(new Runnable() {
+            public void run() {
+                progressDialog.dismiss();
+                if(false) { // Imitate success
+                    Context context = ExperienceRegistrationActivity.this;
+                    Intent intent = new Intent(context, MainActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    context.startActivity(intent);
+                    Toast.makeText(getApplicationContext(), "You have been registered!", Toast.LENGTH_LONG).show();
+                } else { // Imitate failure
+                    Toast.makeText(ExperienceRegistrationActivity.this, "Oops! Something went wrong...", Toast.LENGTH_LONG).show();
+                }
+            }
+        }, 5000);
+        */
+        // UNCOMMENT THIS FOR TESTING (REMEMBER TO COMMENT .execute() LINE)
+
+    }
+
 }

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

@@ -1,8 +1,3 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
 package uprrp.tania.activities;
 
 import android.content.Intent;
@@ -32,97 +27,79 @@ import uprrp.tania.fragments.AssessmentsFragment;
 import uprrp.tania.fragments.ConsentFragment;
 import uprrp.tania.fragments.WithdrawFragment;
 
-
 public class MainActivity extends PinCodeActivity {
 
-    String device_token;
+    private static final String TAG = "MainActivity";
+
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(final Bundle savedInstanceState) {
+
+        // Constructor stuff
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        // If the application was opened using the URL scheme
-        Intent intent = getIntent();
-        if (intent != null && intent.getData() != null) {
-            Uri uri = intent.getData();
-            String expToken = null;
-            if (uri != null) {
-                expToken = uri.getQueryParameter("expToken");
-            }
-            Log.d("URL SCHEME", "The experience token is " + expToken);
-            //SendActivateExperienceToServer activateExperience = new SendActivateExperienceToServer();
-            //activateExperience.execute(expToken);
-        }
-        /////////////////////////////////////////////////////////////////////////////
 
         // 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);
+        if(needsToRegister) {
+            Intent needsRegisterIntent = new Intent(this, GettingStartedActivity.class);
             startActivity(needsRegisterIntent);
-         }
-        /////////////////////////////////////////////////////////////////////////////
-
+        }
 
-        //////////////////// Let's get NOTIFICATIONS //////////////////////////
-        FirebaseInstanceId.getInstance().getInstanceId()
-                .addOnSuccessListener(MainActivity.this, new OnSuccessListener<InstanceIdResult>() {
-                    @Override
-                    public void onSuccess(InstanceIdResult instanceIdResult) {
-                        device_token = instanceIdResult.getToken();
-                    }
-                });
 
+        // Enable notifications
         CognitoCachingCredentialsProvider credentialsProvider = new CognitoCachingCredentialsProvider(
                 getApplicationContext(),
-                "us-east-1:574094cd-0784-4e26-bd14-4fa72ae63579", // Identity pool ID
+                getString(R.string.identityPoolID), // Identity pool ID
                 Regions.US_EAST_1 // Region
         );
-
         SNSRegister snsRegister = new SNSRegister(credentialsProvider);
         snsRegister.execute();
-        ////////////////////////////////////////////////////////////////
 
 
+        // Create toolbar
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
-        assert actionBar != null;
-        actionBar.setTitle("TANIA");
+        assert actionBar != null; // TODO: find out if this causes crashes
+        actionBar.setTitle(R.string.app_name);
         actionBar.setDisplayShowTitleEnabled(true);
 
+
+        // Set navigation buttons listener
         BottomNavigationView bottomNavigationMenu = findViewById(R.id.bottom_navigation_menu);
-        bottomNavigationMenu.setOnNavigationItemSelectedListener(navListener);
+        bottomNavigationMenu.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
+            @Override
+            public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+
+                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();
+                }
 
+                getSupportFragmentManager()
+                        .beginTransaction()
+                        .replace(R.id.mainFragment, selectedFragment)
+                        .commit();
 
-    }
+                return true;
 
-    private BottomNavigationView.OnNavigationItemSelectedListener navListener =
-            new BottomNavigationView.OnNavigationItemSelectedListener() {
-                @Override
-                public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-                    Fragment selectedFragment = new Fragment();
-
-                    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;
-                    }
-
-                    getSupportFragmentManager().beginTransaction().replace(R.id.mainFragment,
-                            selectedFragment).commit();
-
-                    return true;
-                }
-            };
+            }
+        });
+
+    }
 
 }
 

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

@@ -2,6 +2,7 @@ package uprrp.tania.fragments;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -12,15 +13,13 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatButton;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.InstanceIdResult;
 
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.researchstack.backbone.StorageAccess;
 import org.researchstack.backbone.answerformat.AnswerFormat;
 import org.researchstack.backbone.answerformat.ChoiceAnswerFormat;
@@ -36,13 +35,16 @@ import org.researchstack.backbone.ui.ViewTaskActivity;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
+import uprrp.tania.networking.SendAnswers;
+import uprrp.tania.models.AnsweredQuestionModel;
+import uprrp.tania.models.AnsweredAssessmentModel;
 import uprrp.tania.networking.FetchAssessment;
 import uprrp.tania.networking.FetchUserStatus;
 import uprrp.tania.models.AssessmentModel;
 import uprrp.tania.models.QuestionModel;
 import uprrp.tania.R;
-import uprrp.tania.SendAnswersToServer;
 import uprrp.tania.URLEventListener;
 import uprrp.tania.models.UserStatusModel;
 
@@ -54,18 +56,19 @@ public class AssessmentsFragment extends Fragment {
     private static final String SAMPLE_SURVEY = "sample_assessment";
 
     // Our variables
-    private final String TAG = "ASSESSMENTS FRAGMENT";
-    private String device_token;
-    private String id_subquestionnair;
+    private static final String TAG = "AssessmentsFragment";
+    private String DEVICE_TOKEN;
+    private String ASSESSMENT_ID;
+    private View thisFragment;
 
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         // Get reference for this fragment and other components
-        final View thisFragment = inflater.inflate(R.layout.fragment_assessments, container, false);
-        final AppCompatButton surveyButton = thisFragment.findViewById(R.id.surveyButton);
-        final Button refreshButton = thisFragment.findViewById(R.id.refreshButton); // TODO: check Button vs. AppCompatButton
+        this.thisFragment = inflater.inflate(R.layout.fragment_assessments, container, false);
+        final Button surveyButton = thisFragment.findViewById(R.id.surveyButton);
+        final Button refreshButton = thisFragment.findViewById(R.id.refreshButton);
 
         // Change all caps text to normal capitalization
         // TODO: this is a workaround I found, any other acceptable solution is welcome
@@ -73,32 +76,34 @@ public class AssessmentsFragment extends Fragment {
         refreshButton.setTransformationMethod(null);
 
         // Request to Firebase...
+        // TODO: Should we implement retry logic in onFailureListener?
         FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
             @Override
             public void onSuccess(InstanceIdResult instanceIdResult) {
 
-            // Get device's token
-            // IMPORTANT: must come first before setting any
-            device_token = instanceIdResult.getToken();
+                // Get device's token
+                // IMPORTANT: must come first before calling
+                // another function that uses the token
+                DEVICE_TOKEN = instanceIdResult.getToken();
 
-            // Add onClick listener to "Answer Survey" button
-            surveyButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    fetchAssessment();
-                }
-            });
+                // Add onClick listener to "Answer Survey" button
+                surveyButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        fetchAssessment();
+                    }
+                });
 
-            // Add onClick listener to "Refresh Status" button
-            refreshButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    fetchUserStatus(thisFragment);
-                }
-            });
+                // Add onClick listener to "Refresh Status" button
+                refreshButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        fetchUserStatus();
+                    }
+                });
 
-            // Fetch user status and assessment, if any
-            fetchUserStatus(thisFragment);
+                // Fetch user status and assessment, if any
+                fetchUserStatus();
 //            fetchAssessment();
 
             }
@@ -108,20 +113,20 @@ public class AssessmentsFragment extends Fragment {
 
     }
 
-    private void fetchUserStatus(View thisFragment) {
+    private void fetchUserStatus() {
 
         // Get text fields and initialize other stuff
-        final TextView statusTextView = thisFragment.findViewById(R.id.statusTextView);
-        final TextView nextSurveyTextView = thisFragment.findViewById(R.id.nextSurveyTextView);
-        final Button surveyButton = thisFragment.findViewById(R.id.surveyButton);
-        final Button refreshButton = thisFragment.findViewById(R.id.refreshButton);
+        final TextView statusTextView = this.thisFragment.findViewById(R.id.statusTextView);
+        final TextView nextSurveyTextView = this.thisFragment.findViewById(R.id.nextSurveyTextView);
+        final Button surveyButton = this.thisFragment.findViewById(R.id.surveyButton);
+        final Button refreshButton = this.thisFragment.findViewById(R.id.refreshButton);
 
         // Change UI to indicate loading is happening
-        statusTextView.setText(R.string.userStatusLoadingText);
+        statusTextView.setText(R.string.loadingText);
         nextSurveyTextView.setVisibility(View.GONE);
 
         // Define task
-        FetchUserStatus userStatusTask = (FetchUserStatus) new FetchUserStatus(new URLEventListener() {
+        FetchUserStatus userStatusTask = new FetchUserStatus(new URLEventListener() {
 
             @Override
             public void onSuccess(UserStatusModel userStatus) {
@@ -136,8 +141,6 @@ public class AssessmentsFragment extends Fragment {
                     refreshButton.setVisibility(View.GONE);
 
                     // Toggle "Answer" button visibility depending on survey availability
-                    // TODO: Decide whether to show the button regardless of anything,
-                    //  since this may be optional functionally, but important for UX
                     if(userStatus.surveyAvailable()) {
                         surveyButton.setVisibility(View.VISIBLE);
                     } else {
@@ -164,7 +167,7 @@ public class AssessmentsFragment extends Fragment {
         });
 
         // Start task
-        userStatusTask.execute(this.device_token);
+        userStatusTask.execute(this.DEVICE_TOKEN);
 
     }
 
@@ -178,21 +181,17 @@ public class AssessmentsFragment extends Fragment {
 
         // Fetch the assessment to be taken (if there is at least one available),
         // and launch the assessment (if the button is pressed)
-        FetchAssessment assessmentTask = (FetchAssessment) new FetchAssessment(new URLEventListener() {
+        FetchAssessment assessmentTask = new FetchAssessment(new URLEventListener() {
 
             @Override
             public void onSuccess(AssessmentModel assessment) {
-
-                // Stop progress dialog
                 progressDialog.dismiss();
-
-                // Launch survey or notify there are none available, accordingly
                 if(assessment.isEmpty()) {
+                    fetchUserStatus(); // update status to let user know if it already had expired by the time he clicked
                     Toast.makeText(getContext(), "There are no surveys at the moment!", Toast.LENGTH_LONG).show();
                 } else {
                     launchSurvey(assessment);
                 }
-
             }
 
             @Override
@@ -205,7 +204,7 @@ public class AssessmentsFragment extends Fragment {
         });
 
         // Start task
-        assessmentTask.execute(this.device_token);
+        assessmentTask.execute(this.DEVICE_TOKEN);
 
     }
 
@@ -218,96 +217,115 @@ public class AssessmentsFragment extends Fragment {
     }
 
     private void launchSurvey(AssessmentModel assessment) {
-        this.id_subquestionnair = assessment.getID();
-        List<Step> allSteps = this.prepareSurveySteps(assessment);
-        OrderedTask task = new OrderedTask(SAMPLE_SURVEY, allSteps);
+        this.ASSESSMENT_ID = assessment.getID();
+        List<Step> steps = this.prepareSurveySteps(assessment);
+        OrderedTask task = new OrderedTask(SAMPLE_SURVEY, steps);
         Intent intent = ViewTaskActivity.newIntent(getContext(), task);
         startActivityForResult(intent, REQUEST_SURVEY);
     }
 
     private void processSurveyResult(TaskResult result) {
+
+        // Save results to local database
         StorageAccess.getInstance().getAppDatabase().saveTaskResult(result);
 
+        // Load results
+        TaskResult taskResult = StorageAccess.getInstance()
+                .getAppDatabase()
+                .loadLatestTaskResult(SAMPLE_SURVEY);
+
+        // Prepare and send results
+        AnsweredAssessmentModel answeredAssessment = this.prepareAnsweredAssessment(taskResult);
+        this.sendSurveyInfo(answeredAssessment);
+
+    }
+
+    private void sendSurveyInfo(final AnsweredAssessmentModel answeredAssessment) {
+
         // Initiate progress dialog
         // TODO: find substitute for this deprecated dialog box
         final ProgressDialog progressDialog = ProgressDialog.show(getContext(),
                 "Sending Answers",
                 "This shouldn't take long");
 
-        try {
-            sendSurveyInfo();
-            progressDialog.dismiss();
-        } catch(Exception e) {
-            // TODO: prompt user to retry sending results
-            progressDialog.dismiss();
-            Toast.makeText(getContext(), "Couldn't send answers!", Toast.LENGTH_LONG).show();
-            Log.e("ERROR WHILE SENDING ANSWERS", e.toString());
-            e.printStackTrace();
-        }
-    }
-
-    private void sendSurveyInfo() {
-
-        // Load survey results
-        TaskResult taskResult = StorageAccess.getInstance()
-                .getAppDatabase()
-                .loadLatestTaskResult(SAMPLE_SURVEY);
+        // Send answers and prompt user if he wants to retry sending them if an error occurs
+        SendAnswers sendAnswersTask = new SendAnswers(new URLEventListener() {
 
-        // Serialize results into JSON
-        String resultsJSON = this.serializeSurveyResults(taskResult);
+           @Override public void onSuccess() {
+               progressDialog.dismiss();
+               Toast.makeText(getContext(), "Answers sent!", Toast.LENGTH_LONG).show();
+               fetchUserStatus();
+           }
 
-        // Send JSON
-        Log.d(TAG, "preparedJSON:" + resultsJSON);
-        new SendAnswersToServer().execute(resultsJSON);
+           @Override
+           public void onFailure(Exception e) {
+               Log.e("ERROR WHILE SENDING ANSWERS", e.toString());
+               e.printStackTrace();
+               progressDialog.dismiss();
+               promptRetrySend(answeredAssessment);
+           }
 
-    }
-
-    private String serializeSurveyResults(TaskResult taskResult) {
+        });
 
-        JSONObject surveyResults = new JSONObject();
 
-        try {
+        // Prepare results and start task
+       sendAnswersTask.execute(answeredAssessment);
+
+        // UNCOMMENT THIS FOR TESTING (REMEMBER TO COMMENT .execute() LINE)
+//        Handler handler = new Handler();
+//        handler.postDelayed(new Runnable() {
+//            public void run() {
+//                progressDialog.dismiss();
+//                if(true) { // Imitate success
+//                    Toast.makeText(getContext(), "Answers sent!", Toast.LENGTH_LONG).show();
+//                    fetchUserStatus();
+//                } else { // Imitate failure
+//                    promptRetrySend2(answeredAssessment);
+//                }
+//            }
+//        }, 5000);
+        // UNCOMMENT THIS FOR TESTING (REMEMBER TO COMMENT .execute() LINE)
 
-            surveyResults.put("os", "Android");
+    }
 
-            JSONObject data = new JSONObject();
-            data.put("id_subquestionnair", this.id_subquestionnair);
-            data.put("token", this.device_token);
+    private AnsweredAssessmentModel prepareAnsweredAssessment(TaskResult taskResult) {
 
-            // TODO: Try Gson.toJSON() to simplify this process
-            for (String id : taskResult.getResults().keySet()) {
-                JSONObject questions = new JSONObject();
-                StepResult stepResult = taskResult.getStepResult(id);
+        // Gather answered questions
+        ArrayList<AnsweredQuestionModel> answeredQuestions = new ArrayList<>();
+        for (String questionID : taskResult.getResults().keySet()) {
 
-                questions.accumulate("id_question", id);
-                questions.accumulate("start_datetime", taskResult.getStartDate().toString());
-                questions.accumulate("question_answer", stepResult.getResult().toString());
-                questions.accumulate("end_datetime", taskResult.getEndDate().toString());
-                data.accumulate("preguntas", questions.toString());
-            }
+            // Extract question info
+            // TODO: check if instead of getting the taskResult start/end times,
+            //  we should be getting the stepResult start/end times...
+            //  IF NOT: we should think about restructuring the JSON
+            //  because we're being highly redundant and inefficient
+            StepResult stepResult = taskResult.getStepResult(questionID);
+            String answer = stepResult.getResult().toString();
+            String startDatetime = taskResult.getStartDate().toString();
+            String endDatetime = taskResult.getEndDate().toString();
 
-            surveyResults.put("data", data.toString());
+            // Append question
+            AnsweredQuestionModel answeredQuestion = new AnsweredQuestionModel(questionID, answer, startDatetime, endDatetime);
+            answeredQuestions.add(answeredQuestion);
 
-        } catch (JSONException e) {
-            e.printStackTrace();
         }
 
-        return surveyResults.toString();
+        // Return answered assessment
+        return new AnsweredAssessmentModel(this.ASSESSMENT_ID, this.DEVICE_TOKEN, answeredQuestions);
 
     }
 
     private List<Step> prepareSurveySteps(AssessmentModel assessment) {
 
         // Initialize survey steps
-//        List<QuestionStep> taniaQuestions = new ArrayList<>();
-        List<Step> allSteps = new ArrayList<>();
+        List<Step> steps = new ArrayList<>();
 
         // Create instruction screen (add it to total steps)
         InstructionStep instructionStep = new InstructionStep(INSTRUCTION,
                 getString(R.string.app_name),
                 assessment.getDescription());
-        instructionStep.setStepTitle(R.string.survey);
-        allSteps.add(0, instructionStep);
+        instructionStep.setStepTitle(R.string.surveyToolbarText);
+        steps.add(0, instructionStep);
 
         // Prepare survey question by question
         List<QuestionModel> questions = assessment.getQuestions();
@@ -315,7 +333,7 @@ public class AssessmentsFragment extends Fragment {
         for(int i = 0; i < assessment.getQuestionCount(); i++) {
 
             QuestionModel question = questions.get(i);
-            Log.d("id_type", question.getType());
+            Log.d(TAG, "QuestionType:" + question.getType());
 
             if(question.getType().equals("SCALED")) {
 
@@ -336,35 +354,61 @@ public class AssessmentsFragment extends Fragment {
                 AnswerFormat multiFormat = new ChoiceAnswerFormat(AnswerFormat.ChoiceAnswerStyle.SingleChoice, choices);
 
                 // Set question step details
-                newQuestionStep.setStepTitle(R.string.survey);
+                newQuestionStep.setStepTitle(R.string.surveyToolbarText);
                 newQuestionStep.setTitle(question.getPremise());
                 newQuestionStep.setAnswerFormat(multiFormat);
                 newQuestionStep.setOptional(false);
 
                 // Add step to arrays
-//                taniaQuestions.add(i, newQuestionStep);
-                allSteps.add(newQuestionStep);
+                steps.add(newQuestionStep);
 
             } else if(question.getType().equals("OPEN")) {
 
                 // Create question step along with its choices
                 QuestionStep newQuestionStep = new QuestionStep(question.getID());
-                TextAnswerFormat format = new TextAnswerFormat();
+                TextAnswerFormat format = new TextAnswerFormat(100);
+                format.setIsMultipleLines(true);
 
                 // Set question step details
-                newQuestionStep.setStepTitle(R.string.survey);
+                newQuestionStep.setStepTitle(R.string.surveyToolbarText);
                 newQuestionStep.setTitle(question.getPremise());
                 newQuestionStep.setAnswerFormat(format);
                 newQuestionStep.setOptional(false);
 
                 // Add step to arrays
-//                taniaQuestions.add(i, newQuestionStep);
-                allSteps.add(newQuestionStep);
+                steps.add(newQuestionStep);
 
+            } else {
+                Log.wtf(TAG, "Neither OPEN nor SCALED if-statement has been reached");
             }
+
         }
 
-        return allSteps;
+        return steps;
+    }
+
+    private void promptRetrySend(final AnsweredAssessmentModel answeredAssessment) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(Objects.requireNonNull(getContext()));
+        builder.setCancelable(true);
+        builder.setTitle("ERROR");
+        builder.setMessage("Couldn't send answer!");
+        builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                Log.d(TAG, "Retrying answer send!");
+                sendSurveyInfo(answeredAssessment);
+            }
+        });
+        builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                Toast.makeText(getContext(), "Didn't send answers!", Toast.LENGTH_LONG).show();
+                fetchUserStatus();
+            }
+        });
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
     }
 
 }

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

@@ -1,8 +1,3 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
 package uprrp.tania.fragments;
 
 import android.graphics.Canvas;
@@ -30,19 +25,19 @@ import java.io.File;
 
 import uprrp.tania.R;
 
-
 public class ConsentFragment extends Fragment {
 
-    PDFView pdfView;
+    private static final String TAG = "ConsentFragment";
+    private PDFView pdfView;
 
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_consent, container, false);
 
-        pdfView = view.findViewById(R.id.pdf_viewer);
-        File consentFile = new File(Environment.getExternalStorageDirectory().getPath() + "/consent-tania-app.pdf");
-        pdfView.fromFile(consentFile)
+        this.pdfView = view.findViewById(R.id.pdf_viewer);
+        File consentFile = new File(Environment.getExternalStorageDirectory().getPath() + getString(R.string.consentFileName));
+        this.pdfView.fromFile(consentFile)
                 .password(null)
                 .defaultPage(0)
                 .enableSwipe(true)
@@ -77,12 +72,13 @@ public class ConsentFragment extends Fragment {
                     public boolean onTap(MotionEvent e) {
                         return true;
                     }
-                }).onRender(new OnRenderListener() {
-            @Override
-            public void onInitiallyRendered(int nbPages, float pageWidth, float pageHeight) {
-                pdfView.fitToWidth();
-            }
-        })
+                })
+                .onRender(new OnRenderListener() {
+                    @Override
+                    public void onInitiallyRendered(int nbPages, float pageWidth, float pageHeight) {
+                        pdfView.fitToWidth();
+                    }
+                })
                 .enableAnnotationRendering(true)
                 .invalidPageColor(Color.WHITE)
                 .load();
@@ -90,5 +86,4 @@ public class ConsentFragment extends Fragment {
         return view;
     }
 
-
 }

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

@@ -1,16 +1,17 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
 package uprrp.tania.fragments;
 
+import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -21,67 +22,133 @@ import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.InstanceIdResult;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.Objects;
 
 import uprrp.tania.R;
-import uprrp.tania.SendWithdrawalToServer;
+import uprrp.tania.URLEventListener;
+import uprrp.tania.activities.GettingStartedActivity;
+import uprrp.tania.networking.SendWithdrawal;
 
 public class WithdrawFragment extends Fragment {
 
-    private String device_token;
+    private static final String TAG = "WithdrawFragment";
+    private String DEVICE_TOKEN;
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+        // Get reference for this fragment and other components
         View view = inflater.inflate(R.layout.fragment_withdrawal, container, false);
+        final Button withdrawButton = view.findViewById(R.id.withdrawButton);
 
-        //Let's get the device's token
+        // Change all caps text to normal capitalization
+        // TODO: this is a workaround I found, any other acceptable solution is welcome
+        withdrawButton.setTransformationMethod(null);
+        withdrawButton.setText(R.string.loadingText);
+
+        // Get device's token and attach click listener once we have it
         FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
             @Override
             public void onSuccess(InstanceIdResult instanceIdResult) {
-                device_token = instanceIdResult.getToken();
+                DEVICE_TOKEN = instanceIdResult.getToken();
+                withdrawButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        promptConfirmation();
+                    }
+                });
+                withdrawButton.setText(R.string.withdrawButtonText);
             }
         });
 
-        Button withdrawButton = view.findViewById(R.id.withdrawButton);
-        withdrawButton.setTransformationMethod(null); // change all caps to normal
-        withdrawButton.setOnClickListener(new View.OnClickListener() {
+        return view;
+    }
+
+    private void promptConfirmation() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(Objects.requireNonNull(getContext()));
+        builder.setCancelable(true);
+        builder.setTitle("WITHDRAWING");
+        builder.setMessage("Are you absolutely sure you want to withdraw from the project?");
+        builder.setPositiveButton("Confirm", new DialogInterface.OnClickListener() {
             @Override
-            public void onClick(View v) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(Objects.requireNonNull(getContext()));
-                builder.setCancelable(true);
-                builder.setTitle("WITHDRAWING");
-                builder.setMessage("Are you absolutely sure you want to withdraw from the project?");
-                builder.setPositiveButton("Confirm",
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                try {
-                                    JSONObject withdrawToken = new JSONObject();
-                                    withdrawToken.put("token", device_token);
-                                    SendWithdrawalToServer sendWithdrawalToServer = new SendWithdrawalToServer(getContext());
-                                    sendWithdrawalToServer.execute(withdrawToken.toString());
-                                }
-                                catch (JSONException e){
-                                    e.getMessage();
-                                }
-
-                            }
-                        });
-                builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                    }
-                });
+            public void onClick(DialogInterface dialog, int which) {
+                sendWithdrawalRequest();
+            }
+        });
+        builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                Log.d(TAG, "Cancelled withdrawal!");
+            }
+        });
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    private void sendWithdrawalRequest() {
+
+        // Initiate progress dialog
+        // TODO: find substitute for this deprecated dialog box
+        final ProgressDialog progressDialog = ProgressDialog.show(getContext(),
+                "Withdrawing",
+                "This shouldn't take long");
+
+        // Send withdrawal request to server
+        SendWithdrawal sendWithdrawalTask = new SendWithdrawal(new URLEventListener() {
+            @Override
+            public void onSuccess() {
+
+                progressDialog.dismiss();
+                Context context = getContext();
+
+                // Change system preferences to begin in GettingStartedActivity by default
+                SharedPreferences prefs = context.getSharedPreferences("prefs", Context.MODE_PRIVATE);
+                SharedPreferences.Editor editor = prefs.edit();
+                editor.putBoolean("needsToRegister", true);
+                editor.apply();
+
+                // Start GettingStartedActivity with a success message
+                Intent intent = new Intent(context, GettingStartedActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                context.startActivity(intent);
+                Toast.makeText(context.getApplicationContext(), "Successfully withdrawn!", Toast.LENGTH_LONG).show();
 
-                AlertDialog dialog = builder.create();
-                dialog.show();
+            }
+
+            @Override
+            public void onFailure(Exception e) {
+                progressDialog.dismiss();
+                Toast.makeText(getContext(), "Oops! Something went wrong...", Toast.LENGTH_LONG).show();
+                Log.e(TAG, "Error occurred while sending withdrawal request to server...");
+                e.printStackTrace();
             }
         });
 
-        return view;
+        // Start task
+        sendWithdrawalTask.execute(DEVICE_TOKEN);
+
+        // UNCOMMENT THIS FOR TESTING (REMEMBER TO COMMENT .execute() LINE)
+        /*
+        Handler handler = new Handler();
+        handler.postDelayed(new Runnable() {
+            public void run() {
+                progressDialog.dismiss();
+                if(true) { // Imitate success
+                    Context context = getContext();
+                    Intent intent = new Intent(context, GettingStartedActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    context.startActivity(intent);
+                    Toast.makeText(context.getApplicationContext(), "Successfully withdrawn!", Toast.LENGTH_LONG).show();
+                } else { // Imitate failure
+                    Toast.makeText(getContext(), "Oops! Something went wrong...", Toast.LENGTH_LONG).show();
+                }
+            }
+        }, 5000);
+        */
+        // UNCOMMENT THIS FOR TESTING (REMEMBER TO COMMENT .execute() LINE)
+
     }
+
 }

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

@@ -0,0 +1,16 @@
+package uprrp.tania.models;
+
+import java.util.ArrayList;
+
+public class AnsweredAssessmentModel {
+    // NOTE these attribute must have the same names as the JSON fields we'll be sending to the server
+    private final String id_subquestionnair;
+    private final String token;
+    private final ArrayList<AnsweredQuestionModel> preguntas;
+
+    public AnsweredAssessmentModel(String id, String token, ArrayList<AnsweredQuestionModel> answeredQuestions) {
+        this.id_subquestionnair = id;
+        this.token = token;
+        this.preguntas = answeredQuestions;
+    }
+}

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

@@ -0,0 +1,16 @@
+package uprrp.tania.models;
+
+public class AnsweredQuestionModel {
+    // NOTE these attribute must have the same names as the JSON fields we'll be sending to the server
+    private final String id_question;
+    private final String question_answer;
+    private final String start_datetime;
+    private final String end_datetime;
+
+    public AnsweredQuestionModel(String id, String answer, String startDatetime, String endDatetime) {
+        this.id_question = id;
+        this.question_answer = answer;
+        this.start_datetime = startDatetime;
+        this.end_datetime = endDatetime;
+    }
+}

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

@@ -10,7 +10,7 @@ public class QuestionModel {
     private String premise;
     private String max_text;
     private String min_text;
-    private int max_value;
+    private int max_val;
 
     public String getID() {
         return this.id_question;
@@ -40,7 +40,7 @@ public class QuestionModel {
     }
 
     public int getMaxValue() {
-        return this.max_value;
+        return this.max_val;
     }
 
     public int getMinValue() {

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

@@ -41,6 +41,13 @@ public class UserStatusModel {
 
         // Format is DD:HH:MM (can be negative if survey can be answered)
         String[] parts = this.time_to_next.split(":");
+
+        // Input validation
+        if(parts[0].equals("") || parts[1].equals("") || parts[2].equals("")) {
+            Log.wtf(TAG, "Backend gave an invalid time_to_next: " + this.time_to_next);
+            return ".."; // forms ellipsis
+        }
+
         int days = Integer.parseInt(parts[0]);
         int hours = Integer.parseInt(parts[1]);
         int minutes = Integer.parseInt(parts[2]);

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

@@ -1,5 +1,6 @@
 package uprrp.tania.networking;
 
+import android.content.res.Resources;
 import android.os.AsyncTask;
 import android.util.Log;
 
@@ -18,14 +19,14 @@ import java.net.URL;
 
 import javax.net.ssl.HttpsURLConnection;
 
+import uprrp.tania.R;
 import uprrp.tania.URLEventListener;
 import uprrp.tania.models.AssessmentModel;
 import uprrp.tania.models.EmptyAssessmentModel;
 
 public class FetchAssessment extends AsyncTask<String, Void, JSONObject> {
 
-    private final String TAG = "FETCH ASSESSMENT";
-    private final StringBuilder data =  new StringBuilder();
+    private static final String TAG = "FetchAssessment";
     private final URLEventListener myCallBack;
 
     public FetchAssessment(URLEventListener callback) {
@@ -38,36 +39,43 @@ public class FetchAssessment extends AsyncTask<String, Void, JSONObject> {
 
         try {
 
-            String getMomentsBaseURL = "https://tania.uprrp.edu/getSubQ2.php?tk="; // TODO: extract URL into @string/getMomentsBaseURL
+            String getMomentsBaseURL = Resources.getSystem().getString(R.string.assessmentsBaseURL);
             URL url = new URL(getMomentsBaseURL + deviceToken);
             Log.d(TAG, "token:" + deviceToken); // log
             Log.d(TAG, "url:" + url.toString()); // log
             HttpsURLConnection httpsURLConnection = (HttpsURLConnection) url.openConnection();
             InputStream inputStream = httpsURLConnection.getInputStream();
             BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+            StringBuilder serverResponse =  new StringBuilder();
 
             String line = "";
             while (line != null) {
-                data.append(line);
+                serverResponse.append(line);
                 line = bufferedReader.readLine();
             }
 
-            Log.d(TAG, data.toString().substring(0, 10)); // log
-            if(data.toString().startsWith("Error:NoHa")) {
+            String response = serverResponse.toString();
+            Log.d(TAG, response.substring(0, 10)); // log
+            if(response.startsWith("Error:NoHa")) {
                 return new JSONObject("{}");
             } else {
-                return new JSONObject(data.toString());
+                return new JSONObject(response);
             }
 
         } catch (MalformedURLException e) {
+            Log.e(TAG, "Wrong URL used!");
             e.printStackTrace();
+            return null;
         } catch (IOException e) {
+            Log.e(TAG, "IOStream error occurred!");
             e.printStackTrace();
+            return null;
         } catch (JSONException e) {
+            Log.e(TAG, "Couldn't construct return JSON!");
             e.printStackTrace();
+            return null;
         }
 
-        return null;
     }
 
     @Override
@@ -79,7 +87,7 @@ public class FetchAssessment extends AsyncTask<String, Void, JSONObject> {
         }
 
         if(obj == null) {
-            this.myCallBack.onFailure(new Exception("An error occurred during FetchAssesment!"));
+            this.myCallBack.onFailure(new Exception("An error occurred during FetchAssessment!"));
             return;
         }
 

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

@@ -1,31 +1,33 @@
 package uprrp.tania.networking;
 
+import android.content.res.Resources;
 import android.os.AsyncTask;
 import android.util.Log;
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 
-import org.json.JSONException;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import javax.net.ssl.HttpsURLConnection;
+
+import uprrp.tania.R;
 import uprrp.tania.URLEventListener;
 import uprrp.tania.models.EmptyUserStatusModel;
 import uprrp.tania.models.UserStatusModel;
 
 public class FetchUserStatus extends AsyncTask<String, Void, JSONArray> {
 
-    private final String TAG = "FETCH USER STATUS";
-    private final StringBuilder data =  new StringBuilder();
+    private static final String TAG = "FetchUserStatus";
     private final URLEventListener myCallBack;
 
     public FetchUserStatus(URLEventListener callback) {
@@ -37,36 +39,44 @@ public class FetchUserStatus extends AsyncTask<String, Void, JSONArray> {
         String deviceToken = deviceTokenArray[0]; // array will only ever contain a single element
 
         try {
-            String userStatusBaseURL = "https://tania.uprrp.edu/status.php?tk=";  // TODO: extract URL into @string/userStatusBaseURL
+
+            String userStatusBaseURL = Resources.getSystem().getString(R.string.userStatusBaseURL);
             URL url = new URL(userStatusBaseURL + deviceToken);
             Log.d(TAG, "token:" + deviceToken); // log
             Log.d(TAG, "url:" + url.toString()); // log
-            HttpURLConnection httpURLConnection = (HttpURLConnection) url.openConnection();
+            HttpsURLConnection httpURLConnection = (HttpsURLConnection) url.openConnection();
             InputStream inputStream = httpURLConnection.getInputStream();
             BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+            StringBuilder serverResponse =  new StringBuilder();
 
             String line = "";
             while(line != null) {
-                data.append(line);
+                serverResponse.append(line);
                 line = bufferedReader.readLine();
             }
 
-            Log.d(TAG, "rawString:" + data.toString()); // log
-            if(data.toString().equals("no esta inscrito")) {
+            String response = serverResponse.toString();
+            Log.d(TAG, "rawString:" + response); // log
+            if(response.equals("no esta inscrito")) {
                 return new JSONArray("[]");
             } else {
-                return new JSONArray(data.toString());
+                return new JSONArray(response);
             }
 
         } catch (MalformedURLException e) {
+            Log.e(TAG, "Wrong URL used!");
             e.printStackTrace();
+            return null;
         } catch (IOException e) {
+            Log.e(TAG, "IOStream error occurred!");
             e.printStackTrace();
+            return null;
         } catch (JSONException e) {
+            Log.e(TAG, "Couldn't construct return JSON!");
             e.printStackTrace();
+            return null;
         }
 
-        return null;
     }
 
     @Override

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

@@ -0,0 +1,163 @@
+package uprrp.tania.networking;
+
+import android.content.res.Resources;
+import android.os.AsyncTask;
+import android.util.Log;
+
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLEncoder;
+
+import javax.net.ssl.HttpsURLConnection;
+
+import uprrp.tania.R;
+import uprrp.tania.URLEventListener;
+import uprrp.tania.models.AnsweredAssessmentModel;
+
+public class SendAnswers extends AsyncTask<AnsweredAssessmentModel, Void, String> {
+
+    private static final String TAG = "SendAnswers";
+    private final URLEventListener myCallback;
+
+    public SendAnswers(URLEventListener callback) {
+        this.myCallback = callback;
+    }
+
+    // TODO: instead of making a normal POST request with
+    //  the body data=<uglyJSON>, we should just send the JSON itself
+    //  This is adding unnecessary layers of complexity when decoding AND encoding
+    /*
+        uglyJSON Format:
+        {
+            "os": "Android",
+            "data": String (containing escaped serializedAssessmentJSON)
+        }
+
+        serializedAssessmentJSON Format:
+        {
+            "id_subquestionnair": String,
+            "token": String,
+            "preguntas": [
+                {
+                    "id_question": String,
+                    "start_datetime": String,
+                    "question_answer": String,
+                    "end_datetime": String
+                },
+                ...
+            ]
+        }
+
+        WE SHOULD BE INSTEAD SENDING SOMETHING LIKE:
+        {
+            "os": "Android",
+            "token" String,
+            "data": {
+                "id_subquestionnair": String,
+                "preguntas": [
+                    {
+                        "id_question": String,
+                        "start_datetime": String,
+                        "question_answer": String,
+                        "end_datetime": String
+                    },
+                    ...
+                ]
+            }
+        }
+     */
+    @Override
+    protected String doInBackground(AnsweredAssessmentModel... answeredAssessments) {
+
+        AnsweredAssessmentModel answeredAssessment = answeredAssessments[0]; // array will only ever contain a single element
+
+        try {
+
+            // Serialize answered assessment
+            GsonBuilder builder = new GsonBuilder();
+//            builder.setPrettyPrinting(); // the server doesn't like pretty printing...
+            String serializedAssessment = builder.create().toJson(answeredAssessment);
+            Log.d(TAG,"reconstructedJSON:\n" + serializedAssessment); // log
+
+            // Create wrapper json (a.k.a. uglyJSON)
+            JSONObject surveyResults = new JSONObject();
+            surveyResults.put("os", "Android");
+            surveyResults.put("data", serializedAssessment);
+
+            // Encode data
+            String encodedRequestBody = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(surveyResults.toString(), "UTF-8");
+
+            // Send POST data request
+            URL url = new URL(Resources.getSystem().getString(R.string.sendAnswersURL));
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
+            conn.setDoOutput(true);
+            OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
+            wr.write(encodedRequestBody);
+            wr.flush();
+
+            // Get the server response
+            BufferedReader serverReader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            StringBuilder serverResponse = new StringBuilder();
+
+            String line = "";
+            while(line != null) {
+                serverResponse.append(line);
+                line = serverReader.readLine();
+            }
+
+            String response = serverResponse.toString();
+            Log.d(TAG, "The server's response is: " + response);
+            if(response.startsWith("Success")) {
+                return response;
+            } else {
+                return null;
+            }
+
+
+        } catch (JsonSyntaxException e) {
+            Log.e(TAG, "Failed to JSONify AnsweredAssessment!");
+            e.printStackTrace();
+            return null;
+        } catch (JSONException e) {
+            Log.e(TAG, "Failed to put AnsweredAssessment to surveyResults!");
+            e.printStackTrace();
+            return null;
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Couldn't encode surveyResultsJSON!");
+            e.printStackTrace();
+            return null;
+        } catch(Exception e) {
+            Log.e(TAG,"Couldn't communicate with server while sending answers!" + e.getMessage());
+            e.printStackTrace();
+            return null;
+        }
+
+    }
+
+    @Override
+    protected void onPostExecute(String response) {
+
+        if(this.myCallback == null) {
+            this.myCallback.onFailure(new Exception("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/SendExperienceRegistration.java

@@ -0,0 +1,126 @@
+package uprrp.tania.networking;
+
+import android.content.res.Resources;
+import android.os.AsyncTask;
+import android.util.Log;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLEncoder;
+
+import javax.net.ssl.HttpsURLConnection;
+
+import uprrp.tania.R;
+import uprrp.tania.URLEventListener;
+
+public class SendExperienceRegistration extends AsyncTask<String, String, String> {
+
+    private static final String TAG = "SendActivateExperience";
+    private final URLEventListener myCallback;
+
+    public SendExperienceRegistration(URLEventListener callback) {
+        this.myCallback = callback;
+    }
+
+    // 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:
+        {
+            "token": String,
+            "id_experiencia": 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!");
+            return null;
+        }
+
+        try {
+
+            // Create JSON
+            JSONObject experienceRegistrationJSON = new JSONObject();
+            experienceRegistrationJSON.put("token", deviceToken);
+            experienceRegistrationJSON.put("id_experiencia", experienceID);
+            Log.d(TAG, "Prepared JSON: " + experienceRegistrationJSON.toString());
+
+            // Encode data
+            String encodedRequestBody = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(experienceRegistrationJSON.toString(), "UTF-8");
+
+            // Send POST data request
+            URL url = new URL(Resources.getSystem().getString(R.string.activateExperienceURL));
+            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();
+            }
+
+            // TODO: restrict double registration (maybe in backend?)
+            String response = serverResponse.toString();
+            Log.d(TAG, "The server's response is: " + response);
+            if(response.startsWith("Success")) {
+                return response;
+            } else {
+                return null;
+            }
+
+        } catch (JSONException e) {
+            Log.e(TAG, "Couldn't prepare experienceRegistrationJSON!");
+            e.printStackTrace();
+            return null;
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Couldn't encode experienceRegistrationJSON!");
+            e.printStackTrace();
+            return null;
+        } catch(Exception e) {
+            Log.e(TAG, "Couldn't communicate with server while activating experience!");
+            e.printStackTrace();
+            return null;
+        }
+
+    }
+
+    @Override
+    protected void onPostExecute(String response) {
+
+        if(this.myCallback == null) {
+            this.myCallback.onFailure(new Exception("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

@@ -0,0 +1,116 @@
+package uprrp.tania.networking;
+
+import android.content.res.Resources;
+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.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+import javax.net.ssl.HttpsURLConnection;
+
+import uprrp.tania.R;
+import uprrp.tania.URLEventListener;
+
+public class SendWithdrawal extends AsyncTask<String, String, String> {
+
+    private static final String TAG = "SendWithdrawal";
+    private final URLEventListener myCallback;
+
+    public SendWithdrawal(URLEventListener callback) {
+        this.myCallback = callback;
+    }
+
+    // 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:
+        {
+            "token": String
+        }
+    */
+    @Override
+    protected String doInBackground(String... deviceTokenArray) {
+
+        String deviceToken = deviceTokenArray[0]; // array will only ever contain one element
+
+        try {
+
+            // Create JSON
+            JSONObject withdrawJSON = new JSONObject();
+            withdrawJSON.put("token", deviceToken);
+            Log.d(TAG, "Prepared JSON: " + withdrawJSON.toString());
+
+            // Encode data
+            String encodedRequestBody = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(withdrawJSON.toString(), "UTF-8");
+
+            // Send POST data request
+            URL url = new URL(Resources.getSystem().getString(R.string.withdrawalURL));
+            HttpsURLConnection conn = (HttpsURLConnection) 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.startsWith("Success")) {
+                return response;
+            } else {
+                return null;
+            }
+
+        } catch (JSONException e){
+            Log.e(TAG, "Couldn't construct withdrawJSON!");
+            e.printStackTrace();
+            return null;
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Couldn't encode withdrawJSON!");
+            e.printStackTrace();
+            return null;
+        } catch (Exception e) {
+            Log.e(TAG, "Couldn't communicate with server during withdrawal!");
+            e.printStackTrace();
+            return null;
+        }
+
+    }
+
+    @Override
+    protected void onPostExecute(String response) {
+
+        if(this.myCallback == null) {
+            this.myCallback.onFailure(new Exception("Callback wasn't initialized first!"));
+            return;
+        }
+
+        if(response == null) {
+            this.myCallback.onFailure(new Exception("Error occurred during transaction!"));
+            return;
+        }
+
+        this.myCallback.onSuccess();
+
+    }
+}

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

@@ -59,7 +59,7 @@
         android:layout_marginStart="@dimen/horizontalMargin"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="@dimen/horizontalMargin"
-        android:text="@string/userStatusLoadingText"
+        android:text="@string/loadingText"
         android:textSize="@dimen/sectionDescriptionTextSize"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -1,6 +1,5 @@
 <resources>
     <string name="app_name">TANIA</string>
-    <string name="survey">TANIA ASSESSMENT</string>
     <string name="menu_data_cleared">La información ha sido borrada</string>
     <string name="user_name">Nombre de usuario:</string>
     <string name="date_consented">Fecha de consentimiento:</string>
@@ -24,9 +23,19 @@
 
     <!-- !!!!! POST-Víctor !!!!! -->
 
+    <!--  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>
+    <!--  General App Configurations  -->
+    <string name="surveyToolbarText">Assessment</string>
     <!--  Assessment Fragment  -->
     <string name="mainGreetingText">Hello! 👋</string>
-    <string name="userStatusLoadingText">Please wait a moment…</string>
+    <string name="loadingText">Please wait a moment…</string>
     <string name="userStatusErrorText">It seems we can\'t identify you… Please try again later.</string>
     <string name="refreshButtonText">Refresh Status</string>
     <string name="surveyButtonText">Answer Survey</string>
@@ -38,4 +47,5 @@
     <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="experienceRegistrationButtonText">Enter</string>
+    <string name="consentFileName">/consent-tania-app.pdf</string>
 </resources>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'com.google.gms:google-services:4.3.3'