gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed (I hope) crash during server restart reported during testing, plus minor UI errors corrections.

Browse Source
This commit is contained in:
Graham Jones
2020-11-08 19:09:01 +00:00
parent 8a7bf9627c
commit 3c1d9d10a8
10 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/release/app-release-3.6.1j.apk Normal file
View File

Binary file not shown.

BIN
app/release/app-release.apk
View File

Binary file not shown.

4
app/release/output-metadata.json
View File

@@ -11,8 +11,8 @@
"type": "SINGLE", "type": "SINGLE",
"filters": [], "filters": [],
"properties": [], "properties": [],
"versionCode": 81, "versionCode": 82,
"versionName": "3.6.1h", "versionName": "3.6.1j",
"enabled": true, "enabled": true,
"outputFile": "app-release.apk" "outputFile": "app-release.apk"
} }

4
app/src/main/AndroidManifest.xml
View File

@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="uk.org.openseizuredetector" package="uk.org.openseizuredetector"
android:versionCode="81" android:versionCode="82"
android:versionName="3.6.1h"> android:versionName="3.6.1j">
<!-- android:allowBackup="false" --> <!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

4
app/src/main/java/uk/org/openseizuredetector/LocationFinder.java
View File

@@ -1,5 +1,6 @@
package uk.org.openseizuredetector; package uk.org.openseizuredetector;
/** /**
*/ */
@@ -43,8 +44,9 @@ public class LocationFinder implements LocationListener
public void destroy() { public void destroy() {
// Cancel location updates // Cancel location updates
if (mLocationManager != null) {
mLocationManager.removeUpdates(this); mLocationManager.removeUpdates(this);
}
// cancel the timeout timer // cancel the timeout timer
if (mTimeoutTimer != null) { if (mTimeoutTimer != null) {
mTimeoutTimer.cancel(); mTimeoutTimer.cancel();

2
app/src/main/java/uk/org/openseizuredetector/MainActivity.java
View File

@@ -594,7 +594,7 @@ public class MainActivity extends AppCompatActivity {
tv.setTextColor(warnTextColour); tv.setTextColor(warnTextColour);
tv = (TextView) findViewById(R.id.appTv); tv = (TextView) findViewById(R.id.appTv);
tv.setText(R.string.WatchApp+" ----"); tv.setText(getString(R.string.WatchApp)+" ----");
tv.setBackgroundColor(warnColour); tv.setBackgroundColor(warnColour);
tv.setTextColor(warnTextColour); tv.setTextColor(warnTextColour);

1
app/src/main/java/uk/org/openseizuredetector/SdServer.java
View File

@@ -388,6 +388,7 @@ public class SdServer extends Service implements SdDataReceiver {
// Stop the location finder. // Stop the location finder.
if (mLocationFinder != null) { if (mLocationFinder != null) {
mLocationFinder.destroy(); mLocationFinder.destroy();
mLocationFinder = null;
} }

2
app/src/main/res/values-de/strings.xml
View File

@@ -109,7 +109,7 @@
<string name="no_wifi_connection">Network State Changed - no Wifi Connection</string> <string name="no_wifi_connection">Network State Changed - no Wifi Connection</string>
<string name="no_active_network">Network State Changed - No Active Network</string> <string name="no_active_network">Network State Changed - No Active Network</string>
<string name="problem_parsing_preferences">Problem Parsing Preferences - Something won\'t work - Please go back to Settings and correct it!</string> <string name="problem_parsing_preferences">Problem Parsing Preferences - Something won\'t work - Please go back to Settings and correct it!</string>
<string name="send_sms_last_location">\"Send SMS - last location is \"</string> <string name="send_sms_last_location">"Send SMS - last location is "</string>
<string name="failed_to_send_sms">ERROR: FAILED TO SEND SMS MESSAGE</string> <string name="failed_to_send_sms">ERROR: FAILED TO SEND SMS MESSAGE</string>
<string name="sms_alarms_disabled">SMS Alarms Disabled - not doing anything!</string> <string name="sms_alarms_disabled">SMS Alarms Disabled - not doing anything!</string>
</resources> </resources>

BIN
app/src/main/res/values-ru/strings.xml
View File

Binary file not shown.

4
app/src/main/res/values-sv/strings.xml
View File

@@ -42,7 +42,7 @@
<string name="Mute">Stäng av</string> <string name="Mute">Stäng av</string>
<string name="Alarm">**LARM**</string> <string name="Alarm">**LARM**</string>
<string name="Fall">**FALL**</string> <string name="Fall">**FALL**</string>
<string name="HR_Equals">\"Puls = \"</string> <string name="HR_Equals">"Puls = "</string>
<string name="HRAlarmOff">Pulslarm Av</string> <string name="HRAlarmOff">Pulslarm Av</string>
<string name="WatchAppOK">Smartklocka app OK</string> <string name="WatchAppOK">Smartklocka app OK</string>
<string name="WatchAppNotRunning">Smartklocka app AV</string> <string name="WatchAppNotRunning">Smartklocka app AV</string>
@@ -123,7 +123,7 @@
<string name="no_wifi_connection">Nätverksstatus ändrad - ingen uppkoppling</string> <string name="no_wifi_connection">Nätverksstatus ändrad - ingen uppkoppling</string>
<string name="no_active_network">Nätverksstatus ändrad - inga aktiva nätverk</string> <string name="no_active_network">Nätverksstatus ändrad - inga aktiva nätverk</string>
<string name="problem_parsing_preferences">Något gick fel! Problem med inställningarna - justera dessa.</string> <string name="problem_parsing_preferences">Något gick fel! Problem med inställningarna - justera dessa.</string>
<string name="send_sms_last_location">\"Sänd SMS - senast kända plats är \"</string> <string name="send_sms_last_location">"Sänd SMS - senast kända plats är "</string>
<string name="failed_to_send_sms">ERROR: SMS ej sänt</string> <string name="failed_to_send_sms">ERROR: SMS ej sänt</string>
<string name="sms_alarms_disabled">SMS-larm avstängt- ingen åtgärd!</string> <string name="sms_alarms_disabled">SMS-larm avstängt- ingen åtgärd!</string>