diff --git a/app/release/app-release-4.1.3k.apk b/app/release/app-release-4.1.3l.apk similarity index 68% rename from app/release/app-release-4.1.3k.apk rename to app/release/app-release-4.1.3l.apk index 63ff77f..259bb2c 100644 Binary files a/app/release/app-release-4.1.3k.apk and b/app/release/app-release-4.1.3l.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9af7325..b08eaf2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="uk.org.openseizuredetector" android:versionCode="115" - android:versionName="4.1.3k"> + android:versionName="4.1.3l"> diff --git a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java index 97c0328..ad74128 100644 --- a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java @@ -105,12 +105,7 @@ public class LogManagerControlActivity extends AppCompatActivity { Button authBtn = (Button) findViewById(R.id.auth_button); authBtn.setOnClickListener(onAuth); - //Button pruneBtn = - // (Button) findViewById(R.id.pruneDatabaseBtn); - //pruneBtn.setOnClickListener(onPruneBtn); - //Button reportSeizureBtn = - // (Button) findViewById(R.id.reportSeizureBtn); - //reportSeizureBtn.setOnClickListener(onReportSeizureBtn); + Button remoteDbBtn = (Button) findViewById(R.id.refresh_button); remoteDbBtn.setOnClickListener(onRefreshBtn); @@ -555,17 +550,16 @@ public class LogManagerControlActivity extends AppCompatActivity { Log.v(TAG, "onPruneBtn"); // Confirmation dialog based on: https://stackoverflow.com/a/12213536/2104584 AlertDialog.Builder builder = new AlertDialog.Builder(mContext); - builder.setTitle("Prune Database"); - builder.setMessage(String.format("This will remove all data from the database that is more than %d days old." - + "\nThis can NOT be undone.\nAre you sure?", mLm.mDataRetentionPeriod)); - builder.setPositiveButton("YES", new DialogInterface.OnClickListener() { + builder.setTitle(R.string.prune_database_title); + builder.setMessage(String.format(getString(R.string.prune_database_dialog_msg) , mLm.mDataRetentionPeriod)); + builder.setPositiveButton(R.string.yes_button_title, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { mLm.pruneLocalDb(); dialog.dismiss(); } }); - builder.setNegativeButton("NO", new DialogInterface.OnClickListener() { + builder.setNegativeButton(R.string.no_button_title, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java index a0a52ea..e0bf5f2 100644 --- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java @@ -1078,7 +1078,7 @@ public class MainActivity extends AppCompatActivity { dialog.cancel(); } }); - builder.setPositiveButton("Privacy Policy", new DialogInterface.OnClickListener() { + builder.setPositiveButton(R.string.privacy_policy_button_title, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); String url = OsdUtil.PRIVACY_POLICY_URL; @@ -1088,7 +1088,7 @@ public class MainActivity extends AppCompatActivity { dialog.cancel(); } }); - builder.setNegativeButton("Data Sharing", new DialogInterface.OnClickListener() { + builder.setNegativeButton(R.string.data_sharing_button_title, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); String url = OsdUtil.DATA_SHARING_URL; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a5f8b44..85d2449 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -479,4 +479,10 @@ SmsTimer.onFinish - mLocationFinder is null - this should not happen! - Please report this issue! Error Creating Remote Event Error uploading event - date is null + Prune Database + This will remove all data from the database that is more than %d days old.\nThis can NOT be undone.\nAre you sure? + YES + NO + Privacy Policy + Data Sharing