Added device UUID to communicate with the server

Samba89 · Samba89 · commit a98ed6ad51f0 · 2022-08-19T11:30:26.000+01:00
diff --git a/app/src/main/java/uk/co/digitme/machinemonitoring/DataEntryActivity.java b/app/src/main/java/uk/co/digitme/machinemonitoring/DataEntryActivity.java
@@ -336,7 +336,7 @@ private void send(Boolean ignoreValidation) {
             RequestQueue queue = Volley.newRequestQueue(this);
             // The URL is sent by the requesting activity
             String url = dbHelper.getServerAddress() + getIntent().getStringExtra("url");
-
+            resultJson.put("device_uuid", dbHelper.getDeviceUuid());
             JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST,
                     url,
                     resultJson,
diff --git a/app/src/main/java/uk/co/digitme/machinemonitoring/Default/Workflow.java b/app/src/main/java/uk/co/digitme/machinemonitoring/Default/Workflow.java
@@ -72,15 +72,15 @@ protected Intent noUserFlow() throws JSONException {
         Log.d(TAG, "State: no user");
         Intent loginIntent = new Intent(context, LoginActivity.class);
         String machineText = "Could not get assigned machine";
-        String IP = "";
-        if (serverResponse.has("ip")) {
-            IP = serverResponse.getString("ip");
+        String tabletName = "";
+        if (serverResponse.has("device_name")) {
+            tabletName = serverResponse.getString("device_name");
         }
         if (serverResponse.has("machine")) {
             machineText = serverResponse.getString("machine");
         }
         loginIntent.putExtra("machineText", machineText);
-        loginIntent.putExtra("IP", IP);
+        loginIntent.putExtra("tabletName", tabletName);
         return loginIntent;
     }
 
diff --git a/app/src/main/java/uk/co/digitme/machinemonitoring/Helpers/DbHelper.java b/app/src/main/java/uk/co/digitme/machinemonitoring/Helpers/DbHelper.java
@@ -1,5 +1,6 @@
 package uk.co.digitme.machinemonitoring.Helpers;
 
+import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -14,6 +15,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.UUID;
 
 public class DbHelper extends SQLiteOpenHelper {
 
@@ -24,6 +26,7 @@ public class DbHelper extends SQLiteOpenHelper {
 
     public static final String COLUMN_ID = "ID";
     public static final String COLUMN_SERVER_ADDRESS = "SERVER_ADDRESS";
+    public static final String COLUMN_DEVICE_UUID = "DEVICE_UUID";
 
     public DbHelper(@Nullable Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
@@ -33,31 +36,29 @@ public DbHelper(@Nullable Context context) {
     public void onCreate(SQLiteDatabase db) {
         final String SQL_CREATE_TABLE = "CREATE TABLE IF NOT EXISTS SETTINGS (" +
                 COLUMN_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                COLUMN_SERVER_ADDRESS + " TEXT NOT NULL); ";
+                COLUMN_SERVER_ADDRESS + " TEXT NOT NULL, " +
+                COLUMN_DEVICE_UUID + " TEXT " +
+                "); ";
 
         db.execSQL(SQL_CREATE_TABLE);
 
         ContentValues cv = new ContentValues();
         cv.put(COLUMN_ID, 1);
         cv.put(COLUMN_SERVER_ADDRESS, DEFAULT_URL);
+        cv.put(COLUMN_DEVICE_UUID, UUID.randomUUID().toString());
 
         db.replace("SETTINGS", null ,cv);
         Log.d(TAG, "Saving server address: " + DEFAULT_URL);
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int i, int i1) {
-        String address = getServerAddress();
-
     }
 
+    @SuppressLint("Range")
     public String getServerAddress(){
         SQLiteDatabase db = getReadableDatabase();
 
-        final String SQL_GET_ADDRESS = "SELECT SERVER_ADDRESS FROM SETTINGS WHERE ID=1 Limit 1";
-        //Cursor cursor = db.rawQuery(SQL_GET_ADDRESS, null);
-        //Cursor cursor = db.query("SETTINGS", new String[] {"SERVER_ADDRESS"},
-        //        "ID=1", null, null, null, null);
         Cursor cursor = db.rawQuery("SELECT * FROM SETTINGS",null);
         if(cursor.moveToFirst()) {
             String address;
@@ -81,19 +82,16 @@ public void saveServerAddress(String address){
         cv.put(COLUMN_ID, 1);
         cv.put(COLUMN_SERVER_ADDRESS, address);
 
-        db.replace("SETTINGS", null ,cv);
+        db.update("SETTINGS", cv, "ID = ?", new String[] {"1"});
         Log.d(TAG, "Saving server address: " + address);
     }
 
+    @SuppressLint("Range")
     public URI getServerURI() throws URISyntaxException {
         SQLiteDatabase db = getReadableDatabase();
         String address;
         URI uri;
 
-        final String SQL_GET_ADDRESS = "SELECT SERVER_ADDRESS FROM SETTINGS WHERE ID=1 Limit 1";
-        //Cursor cursor = db.rawQuery(SQL_GET_ADDRESS, null);
-        //Cursor cursor = db.query("SETTINGS", new String[] {"SERVER_ADDRESS"},
-        //        "ID=1", null, null, null, null);
         Cursor cursor = db.rawQuery("SELECT * FROM SETTINGS",null);
         if(cursor.moveToFirst()) {
             try {
@@ -123,4 +121,25 @@ public URI getServerURI() throws URISyntaxException {
         }
         return new URI(scheme + uri.getHost() + port + "/api/activity-updates");
     }
+
+    @SuppressLint("Range")
+    public String getDeviceUuid() {
+        SQLiteDatabase db = getReadableDatabase();
+        String uuid;
+
+        Cursor cursor = db.rawQuery("SELECT * FROM SETTINGS",null);
+        if(cursor.moveToFirst()) {
+            try {
+                uuid = cursor.getString(cursor.getColumnIndex(COLUMN_DEVICE_UUID));
+                cursor.close();
+            } catch (CursorIndexOutOfBoundsException e) {
+                Log.e(TAG, "Failed to get uuid");
+                uuid = "";
+            }
+        } else {
+            Log.e(TAG, "Failed to get uuid");
+            uuid = "";
+        }
+        return uuid;
+    }
 }
diff --git a/app/src/main/java/uk/co/digitme/machinemonitoring/Helpers/LoggedInActivity.java b/app/src/main/java/uk/co/digitme/machinemonitoring/Helpers/LoggedInActivity.java
@@ -11,11 +11,11 @@
 
 import com.android.volley.Request;
 import com.android.volley.RequestQueue;
-import com.android.volley.Response;
-import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.Volley;
 
+import org.json.JSONObject;
+
 import uk.co.digitme.machinemonitoring.R;
 
 
@@ -47,17 +47,17 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 RequestQueue queue = Volley.newRequestQueue(this);
                 String url = dbHelper.getServerAddress() + "/android-logout";
 
+                JSONObject jsonBody = new JSONObject();
+                jsonBody.put("device_uuid", dbHelper.getDeviceUuid());
+
                 JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST,
                         url,
-                        null,
+                        jsonBody,
                         new EndActivityResponseListener(this),
-                        new Response.ErrorListener() {
-                            @Override
-                            public void onErrorResponse(VolleyError error) {
-                                Log.v("ErrorListener", String.valueOf(error));
-                                Toast.makeText(getApplicationContext(), String.valueOf(error), Toast.LENGTH_LONG).show();
-                                finish();
-                            }
+                        error -> {
+                            Log.v("ErrorListener", String.valueOf(error));
+                            Toast.makeText(getApplicationContext(), String.valueOf(error), Toast.LENGTH_LONG).show();
+                            finish();
                         });
 
                 queue.add(jsonObjectRequest);
diff --git a/app/src/main/java/uk/co/digitme/machinemonitoring/Helpers/ServerDiscovery.java b/app/src/main/java/uk/co/digitme/machinemonitoring/Helpers/ServerDiscovery.java
@@ -106,4 +106,5 @@ public static boolean findServer(Context context) {
         return false;
 
     }
+
 }
diff --git a/app/src/main/java/uk/co/digitme/machinemonitoring/JobActivityBase.java b/app/src/main/java/uk/co/digitme/machinemonitoring/JobActivityBase.java
@@ -195,6 +195,7 @@ public void updateActivity(int activityCodeId){
             RequestQueue queue = Volley.newRequestQueue(this);
             JSONObject jsonBody = new JSONObject();
 
+            jsonBody.put("device_uuid", dbHelper.getDeviceUuid());
             jsonBody.put("activity_code_id", activityCodeId);
             // Send the request. Don't listen for the response and ignore any failures, this isn't a critical update.
             JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST,
diff --git a/app/src/main/java/uk/co/digitme/machinemonitoring/LoginActivity.java b/app/src/main/java/uk/co/digitme/machinemonitoring/LoginActivity.java
@@ -49,8 +49,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         dbHelper = new DbHelper(getApplicationContext());
         setContentView(R.layout.activity_login);
-        String IP = getIntent().getStringExtra("IP");
-        Objects.requireNonNull(getSupportActionBar()).setTitle(IP + " - Log in");
+        String tabletName = getIntent().getStringExtra("tabletName");
+        Objects.requireNonNull(getSupportActionBar()).setTitle(tabletName + " - Log in");
 
         //Set up the custom keyboard
         CustomNumpadView cnv = findViewById(R.id.keyboard_view);
@@ -119,6 +119,7 @@ private void logIn() {
             JSONObject jsonBody = new JSONObject();
             jsonBody.put("user_id", userIdEditText.getText().toString());
             jsonBody.put("password", pinCodeEditText.getText().toString());
+            jsonBody.put("device_uuid", dbHelper.getDeviceUuid());
 
             JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST,
                     url,
diff --git a/app/src/main/java/uk/co/digitme/machinemonitoring/MainActivity.java b/app/src/main/java/uk/co/digitme/machinemonitoring/MainActivity.java
@@ -10,7 +10,6 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -49,6 +48,7 @@ public class MainActivity extends AppCompatActivity {
     TextView mStatusText;
     Button mRetryButton;
     Button mSetAddressButton;
+    Button mFindServerButton;
 
     DbHelper dbHelper;
     SharedPreferences prefs = null;
@@ -67,14 +67,28 @@ protected void onCreate(Bundle savedInstanceState) {
         // These will become visible after failing to connect.
         mStatusText = findViewById(R.id.main_activity_status);
         mRetryButton = findViewById(R.id.retry_button);
+        mFindServerButton = findViewById(R.id.find_server_button);
 
         // The retry button attempts to contact the server again.
         mRetryButton.setOnClickListener(new OnOneOffClickListener() {
             @Override
             public void onSingleClick(View v) {
-                checkState();
+                try {
+                    checkState();
+                } catch (Exception e) {
+                    showError(e.getMessage());
+                }
             }
         });
+
+        // The find server button tries to discover the server address automatically
+        mFindServerButton.setOnClickListener(new OnOneOffClickListener() {
+            @Override
+            public void onSingleClick(View v) {
+                    discoverServer();
+            }
+        });
+
         // The "set address" button opens a new activity allowing the user to change the server ip
         mSetAddressButton = findViewById(R.id.set_address_button);
         mSetAddressButton.setOnClickListener(v -> {
@@ -91,33 +105,52 @@ protected void onResume() {
             discoverServer();
             mStatusText.setVisibility(View.INVISIBLE);
             mRetryButton.setVisibility(View.INVISIBLE);
+            mFindServerButton.setVisibility(View.VISIBLE);
             mSetAddressButton.setVisibility(View.VISIBLE);
             prefs.edit().putBoolean("firstrun", false).apply();
         } else {
             // Hide the buttons by default. This stops them showing during transitions between activities
             mStatusText.setVisibility(View.INVISIBLE);
             mRetryButton.setVisibility(View.INVISIBLE);
             mSetAddressButton.setVisibility(View.INVISIBLE);
+            mFindServerButton.setVisibility(View.INVISIBLE);
             // When arriving at this page, immediately contact the server to see which screen the app
             // should be on, and start that activity
-            checkState();
+            try {
+                checkState();
+            } catch (Exception e) {
+                showError(e.getMessage());
+            }
         }
     }
 
 
-    private boolean discoverServer(){
+    @SuppressLint("SetTextI18n")
+    private void discoverServer() {
         mStatusText.setText("Searching for OEE Server...");
-        return findServer(getApplicationContext());
+        new Thread() {
+            public void run() {
+                    runOnUiThread(() -> {
+                        boolean success = findServer(getApplicationContext());
+                        if (success){
+                            checkState();
+                            mStatusText.setText("Server address found. Connecting...");
+                        } else {
+                            showError("Server discovery failed");
+                        }
+                    });
+            }
+        }.start();
+
     }
 
 
     private void showError(String errorText) {
-        if (!discoverServer()) {
-            mStatusText.setText(errorText);
-            mStatusText.setVisibility(View.VISIBLE);
-            mRetryButton.setVisibility(View.VISIBLE);
-            mSetAddressButton.setVisibility(View.VISIBLE);
-        }
+        mStatusText.setText(errorText);
+        mStatusText.setVisibility(View.VISIBLE);
+        mRetryButton.setVisibility(View.VISIBLE);
+        mFindServerButton.setVisibility(View.VISIBLE);
+        mSetAddressButton.setVisibility(View.VISIBLE);
     }
 
     /**
@@ -126,7 +159,7 @@ private void showError(String errorText) {
      */
     private void checkState() {
         RequestQueue queue = Volley.newRequestQueue(this);
-        String url = dbHelper.getServerAddress() + "/check-state";
+        String url = dbHelper.getServerAddress() + "/check-state?device_uuid=" + dbHelper.getDeviceUuid();
         @SuppressLint("SetTextI18n") JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.GET,
                 url,
                 null,
@@ -142,9 +175,9 @@ private void checkState() {
                 showError("Could not connect to network");
             } else if (error instanceof ServerError) {
                 showError("Could not connect to server");
+                showError(error.getMessage());
             }
             Log.v("ErrorListener", String.valueOf(error));
-            Toast.makeText(getApplicationContext(), String.valueOf(error), Toast.LENGTH_LONG).show();
         });
         queue.add(jsonObjectRequest);
     }
diff --git a/app/src/main/java/uk/co/digitme/machinemonitoring/Pausable/JobPausedActivity.java b/app/src/main/java/uk/co/digitme/machinemonitoring/Pausable/JobPausedActivity.java
@@ -117,6 +117,7 @@ private void resumeJob(){
             String url = dbHelper.getServerAddress() + "/pausable-resume-job";
             JSONObject jsonBody = new JSONObject();
 
+            jsonBody.put("device_uuid", dbHelper.getDeviceUuid());
             jsonBody.put("downtime_reason", activityCodeSpinner.getSelectedItem().toString());
             jsonBody.put("notes", mNotes.getText().toString());
 
diff --git a/app/src/main/java/uk/co/digitme/machinemonitoring/Pausable/PausableJobActivity.java b/app/src/main/java/uk/co/digitme/machinemonitoring/Pausable/PausableJobActivity.java
@@ -13,6 +13,8 @@
 import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.Volley;
 
+import org.json.JSONObject;
+
 import java.util.Objects;
 
 import uk.co.digitme.machinemonitoring.Default.ActivityCode;
@@ -63,10 +65,12 @@ private void pauseJob(){
         try {
             RequestQueue queue = Volley.newRequestQueue(this);
             String url = dbHelper.getServerAddress() + "/pausable-pause-job";
+            JSONObject jsonRequest = new JSONObject();
+            jsonRequest.put("device_uuid", dbHelper.getDeviceUuid());
 
             JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST,
                     url,
-                    null,
+                    jsonRequest,
                     new EndActivityResponseListener(this),
                     error -> {
                         Log.v("ErrorListener", String.valueOf(error));
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -25,13 +25,22 @@
         app:layout_constraintTop_toBottomOf="@+id/main_activity_status"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"/>
+    <Button
+        android:id="@+id/find_server_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/find_server_button_text"
+        android:visibility="invisible"
+        app:layout_constraintTop_toBottomOf="@+id/retry_button"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"/>
     <Button
         android:id="@+id/set_address_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/set_address_button_text"
         android:visibility="invisible"
-        app:layout_constraintTop_toBottomOf="@+id/retry_button"
+        app:layout_constraintTop_toBottomOf="@+id/find_server_button"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"/>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -72,15 +72,15 @@ protected Intent noUserFlow() throws JSONException {`
`72`	`72`	`Log.d(TAG, "State: no user");`
`73`	`73`	`Intent loginIntent = new Intent(context, LoginActivity.class);`
`74`	`74`	`String machineText = "Could not get assigned machine";`
`75`		`- String IP = "";`
`76`		`- if (serverResponse.has("ip")) {`
`77`		`- IP = serverResponse.getString("ip");`
	`75`	`+ String tabletName = "";`
	`76`	`+ if (serverResponse.has("device_name")) {`
	`77`	`+ tabletName = serverResponse.getString("device_name");`
`78`	`78`	`}`
`79`	`79`	`if (serverResponse.has("machine")) {`
`80`	`80`	`machineText = serverResponse.getString("machine");`
`81`	`81`	`}`
`82`	`82`	`loginIntent.putExtra("machineText", machineText);`
`83`		`- loginIntent.putExtra("IP", IP);`
	`83`	`+ loginIntent.putExtra("tabletName", tabletName);`
`84`	`84`	`return loginIntent;`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -106,4 +106,5 @@ public static boolean findServer(Context context) {`
`106`	`106`	`return false;`
`107`	`107`
`108`	`108`	`}`
	`109`	`+`
`109`	`110`	`}`