refactoring

Author: mageddo

build.gradle

@@ -27,7 +27,7 @@ shadowJar {
 // System.setProperty("logFileName", "linux-bluetooth-connection-fix")
 
  manifest {
- attributes("Main-Class": "com.mageddo.bluetoothfix.Main")
+ attributes("Main-Class": "com.mageddo.linux.bluetoothfix.Main")
  }
 
  mergeServiceFiles()

src/main/java/com/mageddo/linux/bluetoothfix/BluetoothConnector.java

@@ -14,7 +14,7 @@ public class BluetoothConnector {
  public static final int BLUETOOTH_POWER_ON_DELAY = 1000;
  private final int timeoutSecs = 10;
 
- public void connect(String deviceId, String sudoPassword) {
+ public void connect(String deviceId) {
 
  if (this.isSoundDeviceConfigured(deviceId)) {
  log.info("status=bluetooth-device-already-configured-and-working, deviceId={}", deviceId);
@@ -36,7 +36,7 @@ public void connect(String deviceId, String sudoPassword) {
  }
  }
 
- this.restartService(sudoPassword);
+ this.restartService();
  status = this.connect0(deviceId);
 
  log.debug(
@@ -67,14 +67,11 @@ boolean disconnect(String deviceId) {
  }
  }
 
- CommandLines.Result restartService(String sudoPassword) {
+ CommandLines.Result restartService() {
  final CommandLine cmd = new CommandLine("/bin/sh")
  .addArguments(new String[]{
  "-c",
- String.format(
- "echo %s | /usr/bin/sudo -S systemctl restart bluetooth.service",
- sudoPassword
- )
+ "systemctl restart bluetooth.service",
  }, false);
  final CommandLines.Result result = CommandLines.exec(cmd)
  .checkExecution();

src/main/java/com/mageddo/linux/bluetoothfix/Linux.java

@@ -0,0 +1,17 @@
+package com.mageddo.linux.bluetoothfix;
+
+import com.sun.security.auth.module.UnixSystem;
+
+public class Linux {
+
+ private Linux() {
+ }
+
+ public static long findUserId() {
+ return new UnixSystem().getUid();
+ }
+
+ public static boolean runningAsRoot() {
+ return findUserId() == 0;
+ }
+}

src/main/java/com/mageddo/linux/bluetoothfix/Main.java

@@ -2,19 +2,15 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.swing.*;
-
 @Slf4j
 public class Main {
  public static void main(String[] args) {
- new BluetoothConnector().connect("94:DB:56:F5:78:41", askForPassword());
- }
 
- static String askForPassword() {
- return JOptionPane.showInputDialog(
-  null, "Sudo password to restart bluetooth service",
-  "Sudo Password", JOptionPane.QUESTION_MESSAGE
- );
+  if (!Linux.runningAsRoot()) {
+  log.warn("you need to run as root due to restart bluetooth service, exiting...");
+ System.exit(1);
+ }
+ new BluetoothConnector().connect("94:DB:56:F5:78:41");
  }
 
 }