From 8d2e4ced34e95495c31db230da93580da120e8ab Mon Sep 17 00:00:00 2001 From: stom79 Date: Wed, 1 Nov 2017 13:58:12 +0100 Subject: [PATCH] Changes delay between translations --- .../mastodon/activities/TootActivity.java | 19 ++++++++++++++----- .../gouv/etalab/mastodon/helper/Helper.java | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index da2f389cf..0f80c42db 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -776,11 +776,12 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc return true; String dateString = sharedpreferences.getString(Helper.LAST_TRANSLATION_TIME, null); if( dateString != null){ - Date date = Helper.stringToDate(getApplicationContext(), dateString); - Date dateCompare = new Date( System.currentTimeMillis() + (TimeUnit.SECONDS.toMillis(Helper.SECONDES_BETWEEN_TRANSLATE))); - if( date.before(dateCompare)) - Toast.makeText(getApplicationContext(),R.string.please_wait,Toast.LENGTH_SHORT).show(); + Date dateCompare = Helper.stringToDate(getApplicationContext(), dateString); + Date date = new Date(); + if( date.before(dateCompare)) { + Toast.makeText(getApplicationContext(), R.string.please_wait, Toast.LENGTH_SHORT).show(); return true; + } } picker.setListener(new CountryPickerListener() { @SuppressLint("InflateParams") @@ -793,8 +794,16 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc popup_trans = getLayoutInflater().inflate( R.layout.popup_translate, null ); transAlert.setView(popup_trans); SharedPreferences.Editor editor = sharedpreferences.edit(); - editor.putString(Helper.LAST_TRANSLATION_TIME, Helper.dateToString(getApplicationContext(), new Date())); + editor.putString(Helper.LAST_TRANSLATION_TIME, Helper.dateToString(getApplicationContext(), new Date( System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(Helper.SECONDES_BETWEEN_TRANSLATE)))); editor.apply(); + TextView yandex_translate = popup_trans.findViewById(R.id.yandex_translate); + yandex_translate.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://translate.yandex.com/")); + startActivity(browserIntent); + } + }); new Translate(getApplicationContext(), Helper.targetField.CW, locale, TootActivity.this).privacy(toot_cw_content.getText().toString()); new Translate(getApplicationContext(), Helper.targetField.STATUS, locale, TootActivity.this).privacy(toot_content.getText().toString()); transAlert.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index 227d5fea7..481446233 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -256,7 +256,7 @@ public class Helper { //Translate wait time public static final String LAST_TRANSLATION_TIME = "last_translation_time"; - public static final int SECONDES_BETWEEN_TRANSLATE = 60; + public static final int SECONDES_BETWEEN_TRANSLATE = 30; //Intent public static final String INTENT_ACTION = "intent_action";