Merge pull request #7 from alyssaruth/logger-4

Logger 4
alyssaruth · Dec 7, 2023 · a00c075 · a00c075
2 parents f2cb16e + aab25c2
commit a00c075
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 530 deletions.
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
 dependencies {
     implementation("com.jgoodies:jgoodies-forms:1.6.0")
     implementation("com.miglayout:miglayout-swing:5.2")
-    implementation("javax.mail:javax.mail-api:1.6.2")
     implementation(project(":core"))
 }
 

diff --git a/client/src/main/java/object/EntropyClientDebugExtension.java b/client/src/main/java/object/EntropyClientDebugExtension.java
diff --git a/client/src/main/java/online/util/DesktopEntropyClient.java b/client/src/main/java/online/util/DesktopEntropyClient.java
@@ -3,21 +3,14 @@
 import online.screen.ConnectingDialog;
 import online.screen.EntropyLobby;
 import screen.ScreenCache;
-import util.AbstractDesktopClient;
-import util.ClientEmailer;
-import util.DialogUtil;
-import util.MessageSender;
-import util.MessageSenderParams;
-import util.UpdateChecker;
+import util.*;
 
 public class DesktopEntropyClient extends AbstractDesktopClient
 {
 	@Override
 	public void init()
 	{
 		super.init();
-
-		ClientEmailer.setObfuscationVersion(ENTROPY_VERSION_NUMBER);
 	}
 
 	@Override

diff --git a/client/src/main/java/screen/BugReportDialog.java b/client/src/main/java/screen/BugReportDialog.java
@@ -108,18 +108,7 @@ private boolean valid()
 
 	private void sendReport()
 	{
-		String description = "BUG REPORT: " +  descriptionField.getText();
-		String replication = textPaneReplicationSteps.getText();
-
-		if (Debug.sendBugReport(description, replication))
-		{
-			DialogUtil.showInfo("Bug report submitted.");
-			dispose();
-		}
-		else
-		{
-			DialogUtil.showInfo("Unable to send bug report. Please check your internet connection and try again.");
-		}
+		DialogUtil.showError("This feature is not yet implemented.");
 	}
 
 	@Override

diff --git a/client/src/main/java/screen/MainScreen.java b/client/src/main/java/screen/MainScreen.java
@@ -682,11 +682,7 @@ public String processCommand(String command)
 			}
 		}
 
-		if (command.equals("sendlogs"))
-		{
-			Debug.sendContentsAsEmailInSeparateThread("Manual logs (" + OnlineConstants.ENTROPY_VERSION_NUMBER + ")", true, null);
-		}
-		else if (command.equals("simulator"))
+		if (command.equals("simulator"))
 		{
 			SimulationDialog dialog = ScreenCache.getSimulationDialog();
 			dialog.initVariables();

diff --git a/client/src/main/java/util/AbstractDesktopClient.java b/client/src/main/java/util/AbstractDesktopClient.java
@@ -1,7 +1,5 @@
 package util;
 
-import javax.swing.JOptionPane;
-
 public abstract class AbstractDesktopClient extends AbstractClient
 											implements CoreRegistry
 {
@@ -10,7 +8,5 @@ public void init()
 	{
 		EncryptionUtil.setBase64Interface(new Base64Desktop());
 		MessageUtil.generatePublicKey();
-
-		ClientEmailer.tryToSendUnsentLogs();
 	}
 }
diff --git a/client/src/main/java/util/ClientEmailer.java b/client/src/main/java/util/ClientEmailer.java
diff --git a/client/src/main/java/util/CpuStrategies.java b/client/src/main/java/util/CpuStrategies.java
@@ -1,14 +1,12 @@
 package util;
 
+import object.*;
+
 import java.util.ArrayList;
 import java.util.Random;
 import java.util.Vector;
 
-import object.ApiStrategy;
-import object.Bid;
-import object.EntropyBid;
-import object.Player;
-import object.VectropyBid;
+import static utils.InjectedThings.logger;
 
 public class CpuStrategies
 {
@@ -86,13 +84,10 @@ public static Bid processOpponentTurn(StrategyParms parms, Player opponent)
 				String strategyStr = opponent.getStrategy();
 				ApiUtil.saveStrategyErrorAndUnsetStrategies(ApiUtil.getApiStrategy(strategyStr), msg);
 				DialogUtil.showError(msg);
-				Debug.append("API bid failed validation: " + error);
 			}
 			else
 			{
-				Debug.stackTrace("Error validating bid: " + error);
-				Debug.append("Bid was " + bid);
-				Debug.append("Strategy: " + opponent.getStrategy());
+				logger.error("invalidBid", "Error validating bid [" + bid + "]. Error: " + error);
 			}
 
 			return null;