fixed sync between mqtt and firebase

type: update
description: sync

Author: lozuwa

Diff for: camera_app_/app/src/main/AndroidManifest.xml

@@ -53,9 +53,12 @@
             android:name=".ui.LabomaticCamera.base.ManualAnalysisLandscapeActivity"
             android:label="ControllerAndCamera"/>
 
-        <activity android:name=".ui.LabomaticCamera.base.AutomaticAnalysisActivity">
+        <activity
+            android:name=".ui.LabomaticCamera.base.AutomaticAnalysisActivity"
+            android:label="AutomaticAnalysis"
+            android:configChanges="screenSize|orientation">
             <intent-filter>
-                <action android:name="android.intent.action.DEFAULT" />
+                <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

Diff for: camera_app_/app/src/main/java/ai/labomatic/data/model/NameSettings.java

@@ -8,6 +8,7 @@ public final class NameSettings {
     // Static setting names
     public static final String AUTOMATIC_START = "AutomaticStart";
     public static final String AUTOMATIC_UPLOAD = "AutomaticUpload";
+    public static final String IP_ADDRESS_MQTT = "IPAddress";
 
     public NameSettings(){
         // Nothing

Diff for: camera_app_/app/src/main/java/ai/labomatic/ui/LabomaticCamera/base/AutomaticAnalysisScreenFragment.java

@@ -6,6 +6,7 @@
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -85,6 +86,8 @@ public void onViewCreated(final View view, Bundle savedInstanceState) {
         // Initial states
         nameUserEditText.setText("");
         automaticAnalisisButton.setEnabled(true);
+        // Restart stage since this fragment is the entry point
+        publishMessage(Initializer.MACROS_TOPIC, Initializer.STAGE_RESTART_HOME);
     }
 
     @Override
@@ -161,9 +164,7 @@ public void publishMessage(String topic, String message) {
         }
     }
 
-    /**
-     * MQTT Receiver
-     * */
+    // MQTT receiver
     private MQTTServiceReceiver receiver =
             new MQTTServiceReceiver() {
         private static final String TAG = "Receiver";
@@ -194,7 +195,7 @@ public void onMessageArrived(Context context, String topic, byte[] payload) {
                 // If the handshake is authenticated, then we can continue.
                 handshakeWithListener = true;
                 // Always restart home (XY), when opening QR activity.
-                publishMessage(Initializer.MACROS_TOPIC, Initializer.STAGE_RESTART_HOME);
+                publishMessage(Initializer.MACROS_TOPIC, Initializer.STAGE_RESTART_INITIAL);
                 // Start barcode activity
                 Intent intent = new Intent(getActivity(), BarcodeCaptureActivity.class);
                 startActivity(intent);
@@ -264,4 +265,21 @@ public void run() {
         }
     }
 
+    /**
+     * Shows a snackbar on the UI thread.
+     * @param text String that contains the message to show
+     * */
+    private void showSnackbar(final String text){
+        final Activity activity = getActivity();
+        if (activity != null){
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    Snackbar.make(getActivity().findViewById(R.id.automatic_layout_container),
+                            text, Snackbar.LENGTH_LONG).show();
+                }
+            });
+        }
+    }
+
 }

Diff for: camera_app_/app/src/main/java/ai/labomatic/ui/LabomaticCamera/composer/AutomaticAnalysisFragment.java

@@ -3,6 +3,7 @@
 import android.Manifest;
 import android.app.Activity;
 //import android.app.Fragment;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.content.ComponentName;
 import android.content.Context;
@@ -389,8 +390,6 @@ public View onCreateView(LayoutInflater inflater,
     @Override
     public void onViewCreated(final View view, Bundle savedInstanceState) {
         getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        // Create presenter instance
-        //automaticAnalysisFragmentPresenter = new AutomaticAnalysisFragmentPresenter();
         // Databases
         clientsDB = new ClientsDatabaseHandler(getActivity().getApplicationContext());
         settingsDB = new SettingsDatabaseHandler(getActivity().getApplicationContext());
@@ -475,7 +474,6 @@ public void onDestroy(){
 
         @Override
         public void onSubscriptionSuccessful(Context context, String requestId, String topic) {
-            //MQTTServiceCommand.publish(context, "/cameraApp", payload);
         }
 
         @Override
@@ -530,14 +528,17 @@ else if (command.equals("requestService") && target.equals("autofocus") &&
                 intent.setComponent(new ComponentName("com.example.root.autofocus_app",
                         "com.example.root.autofocus_app.AutofocusActivity"));
                 startActivity(intent);
-            } else {
+            } else if (command.equals("keepalive")){
 
+            } else{
+                // Do nothing
             }
         }
 
         @Override
         public void onConnectionSuccessful(Context context, String requestId) {
-            Log.i(TAG, "Connected!");
+            Log.i(TAG, "Connected from AutomaticAnalysis fragment!");
+            showSnackbar("MQTT Connected");
         }
 
         @Override
@@ -1000,6 +1001,23 @@ public void run() {
         }
     }
 
+    /**
+     * Shows a snackbar on the UI thread.
+     * @param text String that contains the message to show
+     * */
+    private void showSnackbar(final String text){
+        final Activity activity = getActivity();
+        if (activity != null){
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    Snackbar.make(getActivity().findViewById(R.id.automatic_layout_container),
+                            text, Snackbar.LENGTH_LONG).show();
+                }
+            });
+        }
+    }
+
     public void finishFragment(){
         getActivity().finish();
     }

Diff for: camera_app_/app/src/main/java/ai/labomatic/ui/Login/LoginActivity.java

@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.graphics.drawable.AnimationDrawable;
@@ -23,7 +24,9 @@
 import ai.labomatic.data.local.UsersDatabaseHandler;
 
 import ai.labomatic.R;
+import ai.labomatic.ui.BarcodeReader.BarcodeCaptureActivity;
 import ai.labomatic.ui.NavigationMenu;
+import ai.labomatic.util.Initializer;
 
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
@@ -32,6 +35,8 @@
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.FirebaseUser;
 
+import net.igenius.mqttservice.MQTTServiceReceiver;
+
 import java.util.List;
 
 /**
@@ -64,6 +69,10 @@ public class LoginActivity extends Activity {
     // Firebase
     private FirebaseAuth mAuth;
 
+    // Authentication states
+    private boolean firebaseAuthentication = false;
+    private boolean mqttAuthentication = false;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -223,11 +232,18 @@ public void onStart(){
             anim.start();
     }
 
+    @Override
+    public void onResume(){
+        super.onResume();
+        receiver.register(this);
+    }
+
     @Override
     public void onPause(){
         super.onPause();
         if (anim != null && anim.isRunning())
             anim.stop();
+        receiver.unregister(this);
     }
 
     public boolean validatePassword(String password){
@@ -325,10 +341,10 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                             // Sign in success, update UI with the signed-in user's information
                             Log.i(TAG, "signInWithEmail:success");
                             FirebaseUser user = mAuth.getCurrentUser();
-                            progressDialog.dismiss();
-                            Intent menuActivity = new Intent(LoginActivity.this,
-                                    NavigationMenu.class);
-                            startActivity(menuActivity);
+                            // Change firebase auth variable to true
+                            firebaseAuthentication = true;
+                            // try to start the next activity
+                            validateConnections();
                         } else {
                             // If sign in fails, display a message to the user.
                             Log.e(TAG, "signInWithEmail:failure", task.getException());
@@ -355,15 +371,15 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                             FirebaseUser user = mAuth.getCurrentUser();
                             // Save in local database
                             db.createUser(new User(email, password));
-                            // Kill progressDialog
-                            progressDialog.dismiss();
+                            // If creating user was successful, then sign in
+                            firebaseSignInWithEmailAndPassword(email+emailExtension, password);
                         } else {
                             if (task.getException() instanceof FirebaseAuthUserCollisionException) {
                                 showToast("User with this email already exist.");
                                 // Save in local database
                                 db.createUser(new User(email, password));
-                                // Kill progressDialog
-                                progressDialog.dismiss();
+                                // User already exists, so save in db and sign in
+                                firebaseSignInWithEmailAndPassword(email+emailExtension, password);
                             } else {
                                 // If sign in fails, display a message to the user.
                                 Log.e(TAG, "createUserWithEmail:failure", task.getException());
@@ -377,6 +393,64 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                 });
     }
 
+    /**
+     * Check mqtt and firebase are connected and start the next activity.
+     * */
+    public void validateConnections(){
+        if (mqttAuthentication == true && firebaseAuthentication == true){
+            // If both variables are set to true, then start the next activity
+            progressDialog.dismiss();
+            Intent intent = new Intent(LoginActivity.this, NavigationMenu.class);
+            startActivity(intent);
+        } else{
+            Log.i(TAG, "both services are not connected yet");
+        }
+    }
+
+    // MQTT receiver
+    private MQTTServiceReceiver receiver =
+            new MQTTServiceReceiver() {
+                private static final String TAG = "Receiver";
+                @Override
+                public void onSubscriptionSuccessful(Context context, String requestId, String topic) {
+                    Log.i(TAG, "Subscribed to " + topic);
+                }
+                @Override
+                public void onSubscriptionError(Context context, String requestId, String topic, Exception exception) {
+                    Log.i(TAG, "Can't subscribe to " + topic, exception);
+                }
+                @Override
+                public void onPublishSuccessful(Context context, String requestId, String topic) {
+                    Log.i(TAG, "Successfully published on topic: " + topic);
+                }
+                @Override
+                public void onMessageArrived(Context context, String topic, byte[] payload) {
+                    Log.i(TAG, "New message on " + topic + ":  " + new String(payload));
+                }
+
+                @Override
+                public void onConnectionSuccessful(Context context, String requestId) {
+                    // Feedback
+                    showToast("Connected");
+                    Log.i(TAG, "Connected!");
+                    // Change mqtt auth variable to true
+                    mqttAuthentication = true;
+                    // Try to move to the next activity
+                    validateConnections();
+                }
+
+                @Override
+                public void onException(Context context, String requestId, Exception exception) {
+                    exception.printStackTrace();
+                    Log.i(TAG, requestId + " exception");
+                }
+
+                @Override
+                public void onConnectionStatus(Context context, boolean connected) {
+
+                }
+            };
+
     public void showToast(String message){
         Toast.makeText(LoginActivity.this, message, Toast.LENGTH_SHORT).show();
     }