This commit is contained in:
Mark Qvist 2022-07-06 12:20:41 +02:00
parent 1471876f89
commit 163df580c0

View File

@ -72,8 +72,7 @@ class SidebandCore():
self.app_dir = plyer.storagepath.get_application_dir() self.app_dir = plyer.storagepath.get_application_dir()
self.rns_configdir = None self.rns_configdir = None
# TODO: Reset if RNS.vendor.platformutils.get_platform() == "android":
if RNS.vendor.platformutils.get_platform() == "android" or True:
self.app_dir = self.app_dir+"/io.unsigned.sideband/files/" self.app_dir = self.app_dir+"/io.unsigned.sideband/files/"
self.rns_configdir = self.app_dir+"/app_storage/reticulum" self.rns_configdir = self.app_dir+"/app_storage/reticulum"
@ -98,8 +97,7 @@ class SidebandCore():
# Initialise Reticulum configuration # Initialise Reticulum configuration
# TODO: Reset if RNS.vendor.platformutils.get_platform() == "android":
if RNS.vendor.platformutils.get_platform() == "android" or True:
try: try:
self.rns_configdir = self.app_dir+"/app_storage/reticulum" self.rns_configdir = self.app_dir+"/app_storage/reticulum"
if not os.path.isdir(self.rns_configdir): if not os.path.isdir(self.rns_configdir):
@ -702,7 +700,7 @@ class SidebandCore():
self.reticulum = RNS.Reticulum(configdir=self.rns_configdir) self.reticulum = RNS.Reticulum(configdir=self.rns_configdir)
RNS.log("Reticulum started, activating LXMF...") RNS.log("Reticulum started, activating LXMF...")
if RNS.vendor.platformutils.get_platform() == "android" or True: if RNS.vendor.platformutils.get_platform() == "android":
if not self.reticulum.is_connected_to_shared_instance: if not self.reticulum.is_connected_to_shared_instance:
RNS.log("Running as master or standalone instance, adding interfaces") RNS.log("Running as master or standalone instance, adding interfaces")
@ -1009,7 +1007,6 @@ instance_control_port = 37429
panic_on_interface_error = No panic_on_interface_error = No
[logging] [logging]
# TODO: Reset to 3 loglevel = 3
loglevel = 6
""".encode("utf-8") """.encode("utf-8")