From 5624130e2ce366747e9a3be2b140c6746f567f48 Mon Sep 17 00:00:00 2001 From: VanitasVitae Date: Fri, 30 Oct 2015 17:43:07 +0100 Subject: [PATCH] Translated some strings, commented some methods in MainActivity --- .../enigmandroid/MainActivity.java | 36 ++++++++++++++++--- app/src/main/res/values-de/strings.xml | 3 +- app/src/main/res/values/dialog_whats_new.xml | 10 ------ app/src/main/res/values/strings.xml | 9 +++++ 4 files changed, 43 insertions(+), 15 deletions(-) delete mode 100644 app/src/main/res/values/dialog_whats_new.xml diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java b/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java index 0081a35..a13a52d 100755 --- a/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java +++ b/app/src/main/java/de/vanitasvitae/enigmandroid/MainActivity.java @@ -202,6 +202,9 @@ public class MainActivity extends Activity layoutContainer.doCrypto(); } + /** + * Start an intent to share the configuration as QR-Code via Barcode Scanner + */ private void shareConfigurationAsQR() { IntentIntegrator QRIntegrator = new IntentIntegrator(this); @@ -211,6 +214,9 @@ public class MainActivity extends Activity QRIntegrator.shareText(encoded_state); } + /** + * Start an intent to share the configuration as text + */ private void shareConfigurationAsText() { Intent sendIntent = new Intent(); @@ -221,17 +227,26 @@ public class MainActivity extends Activity startActivity(Intent.createChooser(sendIntent, getResources().getText(R.string.send_to))); } + /** + * Start the barcode app to scan a barcode for configuration + */ private void receiveConfigurationQR() { IntentIntegrator integrator = new IntentIntegrator(this); integrator.initiateScan(); } + /** + * Show a dialog to restore a configuration + */ private void receiveConfigurationText() { new PassphraseDialogBuilder().showDialog(); } + /** + * Check, whether the app has been updated + */ private void handleVersionUpdate() { int currentVersionNumber = 0; @@ -250,6 +265,11 @@ public class MainActivity extends Activity } + /** + * Show a dialog that informs the user about the latest important changes in the app + * The dialog appears whenever the app starts after an update or after data has been + * deleted + */ private void showWhatsNewDialog() { PackageInfo pInfo = null; @@ -314,6 +334,10 @@ public class MainActivity extends Activity }).show(); } + /** + * Show a dialog where the user can choose between sharing the configuration via QR-code or + * via string (intent or copy-to-clipboard) + */ private void showShareConfigurationDialog() { final String configuration = APP_ID+"/"+layoutContainer.getEnigma().getEncodedState().toString(16); @@ -345,7 +369,7 @@ public class MainActivity extends Activity builder.setTitle(R.string.dialog_title_share_configuration) .setView(shareView).setCancelable(true); final Dialog d = builder.create(); - Button one = (Button) shareView.findViewById(R.id.dialog_two_options_2); + Button one = (Button) shareView.findViewById(R.id.dialog_two_options_1); one.setText(R.string.dialog_share_qr); one.setOnClickListener(new View.OnClickListener() { @@ -356,7 +380,7 @@ public class MainActivity extends Activity d.dismiss(); } }); - Button two = (Button) shareView.findViewById(R.id.dialog_two_options_1); + Button two = (Button) shareView.findViewById(R.id.dialog_two_options_2); two.setText(R.string.dialog_share_code); two.setOnClickListener(new View.OnClickListener() { @@ -370,6 +394,10 @@ public class MainActivity extends Activity d.show(); } + /** + * Show a dialog, where the user can choose between scanning QR-code and entering a string to + * restore the encoded configuration + */ private void showReceiveConfigurationDialog() { final View shareView = View.inflate(this, R.layout.dialog_two_options, null); @@ -377,7 +405,7 @@ public class MainActivity extends Activity builder.setTitle(R.string.dialog_title_restore_configuration) .setView(shareView).setCancelable(true); final Dialog d = builder.create(); - Button one = (Button) shareView.findViewById(R.id.dialog_two_options_2); + Button one = (Button) shareView.findViewById(R.id.dialog_two_options_1); one.setText(R.string.dialog_restore_qr); one.setOnClickListener(new View.OnClickListener() { @@ -388,7 +416,7 @@ public class MainActivity extends Activity d.dismiss(); } }); - Button two = (Button) shareView.findViewById(R.id.dialog_two_options_1); + Button two = (Button) shareView.findViewById(R.id.dialog_two_options_2); two.setText(R.string.dialog_restore_code); two.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 025c5f9..f9836ca 100755 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -49,7 +49,8 @@ Keine Änderungen. Enigma zurückgesetzt. Enigma auf zufällige Konfiguration gesetzt. - Was ist neu? In Zwischenablage kopiert + Was ist neu? + diff --git a/app/src/main/res/values/dialog_whats_new.xml b/app/src/main/res/values/dialog_whats_new.xml deleted file mode 100644 index 5464fdc..0000000 --- a/app/src/main/res/values/dialog_whats_new.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - What\'s new? - %1$s: - - - This is some information about the release\n - - Please send me a mail, if you read this, because I probably forgot to change this :)\n - - lol\n - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3fe3734..0e2b268 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -48,6 +48,15 @@ Enigma set to random configuration. Copied to clipboard + What\'s new? + %1$s: + + - This splash screen! + \n- Protocol-versioning to ensure compatibility to upcoming releases/new functions\n + Unfortunately we had to break backwards compatibility to older versions :/ + \n- Enigma KD\n + + %1$s:%2$s