diff --git a/app/release/app-release-3.6.2d.apk b/app/release/app-release-3.6.2d.apk new file mode 100644 index 0000000..3d0f688 Binary files /dev/null and b/app/release/app-release-3.6.2d.apk differ diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 3c13337..3d0f688 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/app-release-3.6.2c.apk b/app/release/old_versions/app-release-3.6.2c.apk similarity index 100% rename from app/release/app-release-3.6.2c.apk rename to app/release/old_versions/app-release-3.6.2c.apk diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 77f9bca..36ac7d0 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 85, - "versionName": "3.6.2c", + "versionCode": 86, + "versionName": "3.6.2d", "outputFile": "app-release.apk" } ] diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8f2ccf7..c98a597 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="86" + android:versionName="3.6.2d"> diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java index ffa01d6..5438a87 100644 --- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java @@ -398,7 +398,7 @@ public class MainActivity extends AppCompatActivity { if (mUtil.isServerRunning()) { tv = (TextView) findViewById(R.id.serverStatusTv); if (mConnection.mBound) - tv.setText(getString(R.string.ServerRunningOK) + mConnection.mSdServer.mSdDataSourceName + " " +getString(R.string.DataSource)); + tv.setText(getString(R.string.ServerRunningOK) +" : " +getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName); tv.setBackgroundColor(okColour); tv.setTextColor(okTextColour); tv = (TextView) findViewById(R.id.serverIpTv); diff --git a/app/src/main/res/xml/seizure_detector_prefs.xml b/app/src/main/res/xml/seizure_detector_prefs.xml index 49058d0..4af80aa 100644 --- a/app/src/main/res/xml/seizure_detector_prefs.xml +++ b/app/src/main/res/xml/seizure_detector_prefs.xml @@ -2,7 +2,7 @@ - +