From 72ffeaddceafb9dd796854107675ddcaa80041d2 Mon Sep 17 00:00:00 2001 From: asda488 <39116917+asda488@users.noreply.github.com> Date: Sat, 30 Oct 2021 17:02:24 +0100 Subject: [PATCH] Remove Discord RPC checks for unsuitable devices (#5594) * Allow Discord RPC disabiling on ARM devices * Remove Discord RPC check --- .../com/unciv/app/desktop/DesktopLauncher.kt | 3 +- .../unciv/app/desktop/RaspberryPiDetector.kt | 61 ------------------- 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 desktop/src/com/unciv/app/desktop/RaspberryPiDetector.kt diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt index a3c694f7f1..b2080c7bda 100644 --- a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt +++ b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt @@ -51,8 +51,7 @@ internal object DesktopLauncher { val game = UncivGame(desktopParameters) - if (!RaspberryPiDetector.isRaspberryPi()) // No discord RPC for Raspberry Pi, see https://github.com/yairm210/Unciv/issues/1624 - tryActivateDiscord(game) + tryActivateDiscord(game) LwjglApplication(game, config) } diff --git a/desktop/src/com/unciv/app/desktop/RaspberryPiDetector.kt b/desktop/src/com/unciv/app/desktop/RaspberryPiDetector.kt deleted file mode 100644 index 81b9942da4..0000000000 --- a/desktop/src/com/unciv/app/desktop/RaspberryPiDetector.kt +++ /dev/null @@ -1,61 +0,0 @@ -package com.unciv.app.desktop - -import java.io.BufferedReader -import java.io.File -import java.io.FileInputStream -import java.io.InputStreamReader - -/** - * Raspberry PI helper class - * https://stackoverflow.com/questions/37053271/the-ideal-way-to-detect-a-raspberry-pi-from-java-jar - * @author wf - */ -object RaspberryPiDetector { - var debug = false - /** - * check if this java vm runs on a raspberry PI - * - * @return true if this is running on a Raspbian Linux - */ - fun isRaspberryPi(): Boolean { - val osRelease = osRelease() - return osRelease != null && osRelease.contains("Raspbian") - } - - /** - * read the first line from the given file - * - * @param file - * @return the first line - */ - private fun readFirstLine(file: File): String? { - var firstLine: String? = null - try { - if (file.canRead()) { - val fis = FileInputStream(file) - val bufferedReader = BufferedReader( - InputStreamReader(fis)) - firstLine = bufferedReader.readLine() - fis.close() - } - } catch (th: Throwable) { - if (debug) th.printStackTrace() - } - return firstLine - } - - /** - * get the operating System release - * - * @return the first line from /etc/os-release or null - */ - private fun osRelease(): String? { - val os = System.getProperty("os.name") - if (os.startsWith("Linux")) { - val osRelease = File("/etc", "os-release") - return readFirstLine(osRelease) - } - return null - } - -} \ No newline at end of file