Updated FetchUserStatus to adapt for backend changes. Moved Intent.startActivity(GettingStarted) back to MainActivity. Substituted FirebaseInstanceId for GlobalValues instance.

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

@@ -1,8 +1,6 @@
 package uprrp.tania;
 
 import android.app.Application;
-import android.content.Intent;
-import android.content.SharedPreferences;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -24,8 +22,6 @@ import org.researchstack.backbone.storage.file.PinCodeConfig;
 import org.researchstack.backbone.storage.file.SimpleFileAccess;
 import org.researchstack.backbone.storage.file.UnencryptedProvider;
 
-import uprrp.tania.activities.GettingStartedActivity;
-
 public class App extends Application {
 
     private static final String TAG = "App";
@@ -51,40 +47,37 @@ public class App extends Application {
 
         StorageAccess.getInstance().init(pinCodeConfig, encryptionProvider, fileAccess, database);
 
-        // We need to know if the user has already registered, otherwise they need to do that first
-        SharedPreferences prefs = getSharedPreferences("prefs", MODE_PRIVATE);
-        boolean needsToRegister = prefs.getBoolean("needsToRegister", true);
-        if(needsToRegister) {
-            Intent needsRegisterIntent = new Intent(this, GettingStartedActivity.class);
-            startActivity(needsRegisterIntent);
-        }
-
-        // Enable notifications
-        CognitoCachingCredentialsProvider credentialsProvider = new CognitoCachingCredentialsProvider(
-                getApplicationContext(),
-                getString(R.string.identityPoolID), // Identity pool ID
-                Regions.US_EAST_1 // Region
-        );
-        SNSRegister snsRegister = new SNSRegister(credentialsProvider);
-        snsRegister.execute();
-
-        // Get device token (store globally
-        FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
-            @Override
-            public void onSuccess(InstanceIdResult instanceIdResult) {
-                String token = instanceIdResult.getToken();
-                GlobalValues.getInstance().setDeviceToken(token);
-                Log.d(TAG, "Got token: " + GlobalValues.getInstance().getDeviceToken());
-            }
-        }).addOnFailureListener(new OnFailureListener() {
-            @Override
-            public void onFailure(@NonNull Exception e) {
-                GlobalValues.getInstance().setDeviceToken(null);
-                Toast.makeText(getApplicationContext(), "Couldn't retrieve token!", Toast.LENGTH_LONG).show();
-                Log.e(TAG, "Error occurred while retrieving token...");
-                e.printStackTrace();
-            }
-        });
+        // Get device token
+        FirebaseInstanceId.getInstance().getInstanceId()
+                .addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
+                    @Override
+                    public void onSuccess(InstanceIdResult instanceIdResult) {
+
+                        // Store token globally
+                        String token = instanceIdResult.getToken();
+                        GlobalValues.getInstance().setDeviceToken(token);
+                        Log.d(TAG, "Got token: " + GlobalValues.getInstance().getDeviceToken());
+
+                        // Enable notifications (NEEDS TOKEN TO BE GLOBALLY AVAILABLE)
+                        CognitoCachingCredentialsProvider credentialsProvider = new CognitoCachingCredentialsProvider(
+                                getApplicationContext(),
+                                getString(R.string.identityPoolID), // Identity pool ID
+                                Regions.US_EAST_1 // Region
+                        );
+                        SNSRegister snsRegister = new SNSRegister(credentialsProvider);
+                        snsRegister.execute();
+
+                    }
+                })
+                .addOnFailureListener(new OnFailureListener() {
+                    @Override
+                    public void onFailure(@NonNull Exception e) {
+                        GlobalValues.getInstance().setDeviceToken(null);
+                        Toast.makeText(getApplicationContext(), "Couldn't retrieve token!", Toast.LENGTH_LONG).show();
+                        Log.e(TAG, "Error occurred while retrieving token...");
+                        e.printStackTrace();
+                    }
+                });
 
     }
 }

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

@@ -1,6 +1,7 @@
 package uprrp.tania;
 
 import android.os.AsyncTask;
+
 import com.amazonaws.auth.CognitoCachingCredentialsProvider;
 import com.amazonaws.services.sns.AmazonSNSClient;
 import com.amazonaws.services.sns.model.CreatePlatformEndpointRequest;
@@ -10,7 +11,6 @@ import com.amazonaws.services.sns.model.GetEndpointAttributesResult;
 import com.amazonaws.services.sns.model.InvalidParameterException;
 import com.amazonaws.services.sns.model.NotFoundException;
 import com.amazonaws.services.sns.model.SetEndpointAttributesRequest;
-import com.google.firebase.iid.FirebaseInstanceId;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -19,6 +19,7 @@ import java.util.regex.Pattern;
 
 public class SNSRegister extends AsyncTask <String, Void, String> {
 
+    private static final String TAG = "SNSRegister";
     AmazonSNSClient client;
     String arnStorage = null;
 
@@ -34,7 +35,7 @@ public class SNSRegister extends AsyncTask <String, Void, String> {
     @Override
     protected String doInBackground(String... strings) {
         String endpointArn = retrieveEndpointArn();
-        String token = FirebaseInstanceId.getInstance().getToken();
+        String token = GlobalValues.getInstance().getDeviceToken(); // FirebaseInstanceId.getInstance().getToken()
 
         boolean updateNeeded = false;
         boolean createNeeded = (null == endpointArn);

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

@@ -1,8 +1,3 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
 package uprrp.tania.activities;
 
 import android.Manifest;
@@ -20,11 +15,6 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.amazonaws.auth.CognitoCachingCredentialsProvider;
-import com.amazonaws.regions.Regions;
-import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.InstanceIdResult;
 import com.itextpdf.text.BadElementException;
 import com.itextpdf.text.BaseColor;
 import com.itextpdf.text.Chunk;
@@ -59,11 +49,10 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
 
+import uprrp.tania.GlobalValues;
 import uprrp.tania.R;
-import uprrp.tania.SNSRegister;
 import uprrp.tania.SendConsentForm;
 
-
 public class GettingStartedActivity extends AppCompatActivity {
 
     private static final int REQUEST_CONSENT = 0;
@@ -74,7 +63,6 @@ public class GettingStartedActivity extends AppCompatActivity {
     public static final String NAME = "name";
     public static final String CONSENT = "consent";
     public static final String SIGNATURE = "signature";
-    public String device_token;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -85,25 +73,6 @@ public class GettingStartedActivity extends AppCompatActivity {
         String[] permissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
         requestPermissions(permissions, 1);
 
-        //////////////////// Let's get NOTIFICATIONS //////////////////////////
-        FirebaseInstanceId.getInstance().getInstanceId()
-                .addOnSuccessListener(GettingStartedActivity.this, new OnSuccessListener<InstanceIdResult>() {
-                    @Override
-                    public void onSuccess(InstanceIdResult instanceIdResult) {
-                        device_token = instanceIdResult.getToken();
-                    }
-                });
-
-        CognitoCachingCredentialsProvider credentialsProvider = new CognitoCachingCredentialsProvider(
-                getApplicationContext(),
-                "us-east-1:574094cd-0784-4e26-bd14-4fa72ae63579", // Identity pool ID
-                Regions.US_EAST_1 // Region
-        );
-
-        SNSRegister snsRegister = new SNSRegister(credentialsProvider);
-        snsRegister.execute();
-        ////////////////////////////////////////////////////////////////
-
         Button createAccount = findViewById(R.id.buttonCreateAccount);
         Button loginAccount = findViewById(R.id.buttonRecoverAccount);
 
@@ -180,7 +149,7 @@ public class GettingStartedActivity extends AppCompatActivity {
                 try {
                     signature.put("signaturePDFBase64", consentFormBase64);
                     signature.put("signatureDate", signatureDate);
-                    signature.put("token", FirebaseInstanceId.getInstance().getToken());
+                    signature.put("token", GlobalValues.getInstance().getDeviceToken()); // FirebaseInstanceId.getInstance().getToken()
 
                 } catch (JSONException e) {
                     e.printStackTrace();

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

@@ -12,15 +12,13 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
-import androidx.appcompat.app.AppCompatActivity;
 
-import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.InstanceIdResult;
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import uprrp.tania.GlobalValues;
 import uprrp.tania.R;
 import uprrp.tania.SendLoginToServer;
 
@@ -28,21 +26,12 @@ import uprrp.tania.SendLoginToServer;
 public class LoginActivity extends AppCompatActivity {
 
     private JSONObject recoverAccount = new JSONObject();
-    private String device_token;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
 
-        //Let's get the device's token
-        FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
-            @Override
-            public void onSuccess(InstanceIdResult instanceIdResult) {
-                device_token = instanceIdResult.getToken();
-            }
-        });
-
         final EditText emailText = findViewById(R.id.emailTextRecover);
         final EditText passwordText = findViewById(R.id.passwordTextRecover);
 
@@ -56,7 +45,7 @@ public class LoginActivity extends AppCompatActivity {
                     if (!emailText.getText().toString().equals("")&& !passwordText.getText().toString().equals("")) {
                         recoverAccount.put("email", emailText.getText());
                         recoverAccount.put("password", passwordText.getText());
-                        recoverAccount.put("token", device_token);
+                        recoverAccount.put("token", GlobalValues.getInstance().getDeviceToken());
 
                         //Log.d("LOGIN ACCOUNT JSON", recoverAccount.toString());
                         new SendLoginToServer(getApplicationContext()).execute(recoverAccount.toString());

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

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

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

@@ -21,22 +21,19 @@ import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-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.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 = "Cognito";
-    private String device_token;
+    private static final String TAG = "RegisterActivity";
     private JSONObject registrationInfo = new JSONObject();
     private DatePickerDialog.OnDateSetListener mDateSetListener;
     private String name;
@@ -46,14 +43,6 @@ public class RegisterActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_registration);
 
-        // Get device's token
-        FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
-            @Override
-            public void onSuccess(InstanceIdResult instanceIdResult) {
-                device_token = instanceIdResult.getToken();
-            }
-        });
-
         final EditText nameEditText = findViewById(R.id.nameEditText);
 
         final TextView birthDateText = findViewById(R.id.birthDateText);
@@ -132,7 +121,7 @@ public class RegisterActivity extends AppCompatActivity {
                         } else if (noJob.isChecked()) {
                             registrationInfo.put("hasJob", "No job");
                         }
-                        registrationInfo.put("token", device_token);
+                        registrationInfo.put("token", GlobalValues.getInstance().getDeviceToken());
                     } else {
                         Toast.makeText(RegisterActivity.this, "All the fields are needed to complete registration.", Toast.LENGTH_LONG).show();
                     }

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

@@ -17,32 +17,20 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.InstanceIdResult;
-
 import org.json.JSONObject;
 
+import uprrp.tania.GlobalValues;
 import uprrp.tania.R;
 import uprrp.tania.SendResetPasswordToServer;
 
 public class ResetPasswordActivity extends AppCompatActivity {
 
-    String device_token;
     String forgotPasswordKey;
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_reset_password);
 
-        //Let's get the device's token
-        FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
-            @Override
-            public void onSuccess(InstanceIdResult instanceIdResult) {
-                device_token = instanceIdResult.getToken();
-            }
-        });
-
         Intent intent = getIntent();
         if(Intent.ACTION_VIEW.equals(intent.getAction())){
             Uri uri = intent.getData();
@@ -62,7 +50,7 @@ public class ResetPasswordActivity extends AppCompatActivity {
             public void onClick(View v) {
                 try {
                     if (newPassword.getText().toString().equals(confirmPassword.getText().toString())){
-                        resetPasswordJSON.put("token", device_token);
+                        resetPasswordJSON.put("token", GlobalValues.getInstance().getDeviceToken());
                         resetPasswordJSON.put("password", newPassword.getText().toString());
                         resetPasswordJSON.put("forgotPasswordKey", forgotPasswordKey);
 

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

@@ -55,7 +55,7 @@ public class FetchUserStatus extends AsyncTask<String, Void, JSONArray> {
 
             String response = serverResponse.toString();
             Log.d(TAG, "rawString:" + response); // log
-            if(response.equals("no esta inscrito")) {
+            if(response.contains("No joda")) { // no esta inscrito
                 return new JSONArray("[]");
             } else {
                 return new JSONArray(response);