Merge pull request #4 from mightytry/3-names

Version 0.9.0

Author: mightytry

.idea/misc.xml

@@ -9,8 +9,8 @@ android {
         applicationId "com.example.picturetopc"
         minSdk 29
         targetSdk 32
-        versionCode 2
-        versionName "0.8.0"
+        versionCode 3
+        versionName "v0.9.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/build.gradle

@@ -99,7 +99,7 @@ void bindPreview(@NonNull ProcessCameraProvider cameraProvider) {
 
         preview.setSurfaceProvider(view.getSurfaceProvider());
 
-        androidx.camera.core.Camera camera = cameraProvider.bindToLifecycle((LifecycleOwner)this, cameraSelector, preview, imageCapture);
+        androidx.camera.core.Camera camera = cameraProvider.bindToLifecycle(this, cameraSelector, preview, imageCapture);
     }
 
     private void startCamera() {

app/src/main/java/com/example/picturetopc/Camera.java

@@ -1,11 +1,17 @@
 package com.example.picturetopc;
 
 import android.graphics.Bitmap;
+import android.os.Debug;
+import android.util.Log;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import org.w3c.dom.Text;
 
 import java.io.ByteArrayOutputStream;
+import java.io.Console;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -20,17 +26,19 @@
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Stream;
 
-class ConnHanlder extends Thread {
+class ConnHandler extends Thread {
     MulticastSocket socket;
 
     InetAddress ip;
     int port;
 
+    EditText name;
     EditText code;
 
 
-    public ConnHanlder(String _ip, int _port, EditText _code) throws IOException {
+    public ConnHandler(String _ip, int _port, EditText _name, EditText _code) throws IOException {
         socket = new MulticastSocket();
         ip = InetAddress.getByName(_ip);
         socket.joinGroup(ip);
@@ -39,6 +47,7 @@ public ConnHanlder(String _ip, int _port, EditText _code) throws IOException {
 
         port = _port;
 
+        name = _name;
         code = _code;
     }
 
@@ -55,7 +64,7 @@ public void run() {
             String msg = null;
 
 
-            msg = "{\"code\": \"" + code.getText().toString() + "\", \"ip\": \"" + "0" + "\", \"port\":" + 42069 + "}";
+            msg = "{\"name\": \"" + name.getText().toString() + "\", \"code\": \"" + code.getText().toString() + "\", \"port\":" + 42069 + "}";
 
 
             DatagramPacket msgPacket = new DatagramPacket(msg.getBytes(), msg.getBytes().length, this.ip, this.port);
@@ -77,22 +86,21 @@ class ConnListener extends Thread
     ProgressBar progressBar;
     List<Connection> connections;
 
-    Button button;
+    TextView connText;
 
-    public ConnListener(ProgressBar _progressBar, Button _button) throws IOException{
+    public ConnListener(ProgressBar _progressBar, TextView conntext) throws IOException{
         socket = new ServerSocket(42069);
         progressBar = _progressBar;
 
         connections = new ArrayList<>();
 
-        button = _button;
+        connText = conntext;
     }
 
     public void run(){
         while (socket != null){
             try {
                 connections.add(new Connection(socket.accept(), this));
-                button.setText("Connected: " + connections.size());
             } catch (IOException e) {
                 run();
                 return;
@@ -102,7 +110,18 @@ public void run(){
 
     public void Disconnect(Connection connection) {
         connections.remove(connection);
-        button.setText("Connected: " + connections.size());
+        ChangeConnections();
+    }
+
+    public void ChangeConnections(){
+        String[] text = new String[connections.size()];
+
+        for (int i = 0; i<text.length; i++){
+            text[i] = ("• " + connections.get(i).Name);
+        }
+
+        connText.setText(String.join("\n", text));
+
     }
 
     public void SendAll(Bitmap pic) {
@@ -125,10 +144,32 @@ public void DisconnectAll() {
         socket = null;
     }
 }
+class ConnReader extends Thread{
+    Connection Listener;
+
+    public ConnReader(Connection listener){
+        Listener = listener;
+    }
+
+    public void run() {
+        while (true){
+            //Get name
+            byte[] bytes = new byte[1024];
+            try {
+                Listener.Input.read(bytes);
+            } catch (IOException e) {
+                break;
+            }
+            if (bytes[0] == 0) continue;
+            Listener.Name = new String(bytes, StandardCharsets.UTF_8).trim();
+            break;
+        }
+        Listener.ConnListener.ChangeConnections();
+    }
+}
 
 class ConnSender extends Thread {
     Connection Listener;
-
     List<byte[]> Sendable;
 
     public ConnSender(Connection listener){
@@ -148,14 +189,13 @@ private void SendAll() {
             try {
                 sleep(100);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                return;
             }
             return;
         }
 
         int size = 1024;
         byte[] send = Sendable.remove(0);
-        byte[] sdata = new byte[size];
 
         Listener.ConnListener.progressBar.setMax(send.length);
         try {
@@ -166,7 +206,6 @@ private void SendAll() {
             }
         } catch (IOException e) {
             Listener.Disconnect();
-            return;
         }
     }
     public void KeepAlive(){
@@ -216,19 +255,21 @@ class Connection {
     InputStream Input;
     OutputStream Output;
 
-    //ConnReader Reader;
+    ConnReader Reader;
     ConnSender Sender;
 
     ConnTimeout Timeout;
 
+    public String Name;
+
 
 
     ConnListener ConnListener;
     boolean Stop;
 
     public Connection(Socket socket, ConnListener connListener) throws SocketException {
         Socket = socket;
-        socket.setSoTimeout(1*1000);
+        socket.setSoTimeout(1000);
         ConnListener = connListener;
 
         Stop = false;
@@ -241,12 +282,13 @@ public Connection(Socket socket, ConnListener connListener) throws SocketExcepti
             return;
         }
 
-        //Reader = new ConnReader(this);
+
+        Reader = new ConnReader(this);
         Sender = new ConnSender(this);
 
         Timeout = new ConnTimeout(Sender);
 
-        //Reader.start();
+        Reader.start();
         Sender.start();
 
         Timeout.start();
@@ -259,7 +301,7 @@ public void Send(Bitmap bmp){
     public void Disconnect() {
         try {
             Socket.close();}
-        catch (IOException e)
+        catch (IOException ignored)
         {}
         Stop = true;
 

app/src/main/java/com/example/picturetopc/Connection.java

@@ -19,7 +19,7 @@ public class DownloadBroadcast extends BroadcastReceiver {
     private final Executor backgroundExecutor = Executors.newSingleThreadExecutor();
 
     public long downloadID;
-    private DownloadManager downloadManager;
+    private final DownloadManager downloadManager;
 
     public DownloadBroadcast(DownloadManager downloadmanager ,long id){
         downloadID = id;