Skip to content

moved to create services only when enabled #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kalynstricklin merged 1 commit into from
Jul 7, 2026
Merged

moved to create services only when enabled #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 51 additions & 51 deletions sensorhub-android-app/src/org/sensorhub/android/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,57 +303,6 @@ public boolean verify(String arg0, SSLSession arg1) {
serverConfig.autoStart = true;
sensorhubConfig.add(serverConfig);

// SOS Service
SOSServiceConfig sosConfig = new SOSServiceConfig();
sosConfig.moduleClass = SOSService.class.getCanonicalName();
sosConfig.id = "SOS_SERVICE";
sosConfig.name = "SOS Service";
sosConfig.autoStart = true;
sosConfig.enableTransactional = true;
sosConfig.exposedResources = new ObsSystemDatabaseViewConfig();

// Connected Systems Service
ConSysApiServiceConfig conSysApiService = new ConSysApiServiceConfig();
conSysApiService.moduleClass = ConSysApiService.class.getCanonicalName();
conSysApiService.id = "CON_SYS_SERVICE";
conSysApiService.name = "Connected Systems API Service";
conSysApiService.autoStart = true;
conSysApiService.enableTransactional = true;
conSysApiService.exposedResources = new ObsSystemDatabaseViewConfig();

// Discovery Service
DiscoveryServiceConfig discoveryServiceConfig = new DiscoveryServiceConfig();
discoveryServiceConfig.moduleClass = DiscoveryService.class.getCanonicalName();
discoveryServiceConfig.id = "DISCOVERY_SERVICE";
discoveryServiceConfig.name= "Discovery Service";
discoveryServiceConfig.autoStart = true;

File outFile = new File(getApplicationContext().getFilesDir(), "rules.txt");
String rulesLink = prefs.getString("rules_link", "");
FutureTask<Void> downloadTask = new java.util.concurrent.FutureTask<>(() -> {
URL rulesUrl = new URL(rulesLink);
HttpURLConnection conn = (HttpURLConnection) rulesUrl.openConnection();
conn.setInstanceFollowRedirects(true);
try (InputStream in = conn.getInputStream();
OutputStream out = new FileOutputStream(outFile)) {
byte[] buffer = new byte[1024];
int len;
while ((len = in.read(buffer)) > 0) {
out.write(buffer, 0, len);
}
} finally {
conn.disconnect();
}
return null;
});
new Thread(downloadTask).start();
try {
downloadTask.get();
} catch (Exception e) {
Log.e("OSH - Discovery", "Failed to download rules file", e);
}
discoveryServiceConfig.rulesFilePath = outFile.getAbsolutePath();

sensorhubConfig.add(sensorsConfig);

// TruPulse sensor
Expand Down Expand Up @@ -526,12 +475,63 @@ public boolean verify(String arg0, SSLSession arg1) {

//---------- SERVICES ---------------------
if (isApiServiceEnabled) {
// Connected Systems Service
ConSysApiServiceConfig conSysApiService = new ConSysApiServiceConfig();
conSysApiService.moduleClass = ConSysApiService.class.getCanonicalName();
conSysApiService.id = "CON_SYS_SERVICE";
conSysApiService.name = "Connected Systems API Service";
conSysApiService.autoStart = true;
conSysApiService.enableTransactional = true;
conSysApiService.exposedResources = new ObsSystemDatabaseViewConfig();

sensorhubConfig.add(conSysApiService);
}
if (isSosServiceEnabled) {
// SOS Service
SOSServiceConfig sosConfig = new SOSServiceConfig();
sosConfig.moduleClass = SOSService.class.getCanonicalName();
sosConfig.id = "SOS_SERVICE";
sosConfig.name = "SOS Service";
sosConfig.autoStart = true;
sosConfig.enableTransactional = true;
sosConfig.exposedResources = new ObsSystemDatabaseViewConfig();

sensorhubConfig.add(sosConfig);
}
if (isDiscoveryServiceEnabled) {
// Discovery Service
DiscoveryServiceConfig discoveryServiceConfig = new DiscoveryServiceConfig();
discoveryServiceConfig.moduleClass = DiscoveryService.class.getCanonicalName();
discoveryServiceConfig.id = "DISCOVERY_SERVICE";
discoveryServiceConfig.name= "Discovery Service";
discoveryServiceConfig.autoStart = true;

File outFile = new File(getApplicationContext().getFilesDir(), "rules.txt");
String rulesLink = prefs.getString("rules_link", "");
FutureTask<Void> downloadTask = new java.util.concurrent.FutureTask<>(() -> {
URL rulesUrl = new URL(rulesLink);
HttpURLConnection conn = (HttpURLConnection) rulesUrl.openConnection();
conn.setInstanceFollowRedirects(true);
try (InputStream in = conn.getInputStream();
OutputStream out = new FileOutputStream(outFile)) {
byte[] buffer = new byte[1024];
int len;
while ((len = in.read(buffer)) > 0) {
out.write(buffer, 0, len);
}
} finally {
conn.disconnect();
}
return null;
});
new Thread(downloadTask).start();
try {
downloadTask.get();
} catch (Exception e) {
Log.e("OSH - Discovery", "Failed to download rules file", e);
}
discoveryServiceConfig.rulesFilePath = outFile.getAbsolutePath();

sensorhubConfig.add(discoveryServiceConfig);
}
}
Expand Down
Loading