Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-14 04:53:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added/improved hint

Browse Source
This commit is contained in:
M66B
2019-09-26 11:43:30 +02:00
parent 340a6e9e6c
commit 6eafb61415
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@@ -42,6 +42,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -161,8 +162,7 @@ public class FragmentSetup extends FragmentBase {
public void onClick(View v) {
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), btnQuick);
popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_gmail, 1, R.string.title_setup_gmail)
.setEnabled(Helper.hasValidFingerprint(getContext()));
popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_gmail, 1, R.string.title_setup_gmail);
popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_other, 2, R.string.title_setup_other);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@@ -171,7 +171,10 @@ public class FragmentSetup extends FragmentBase {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
switch (item.getItemId()) {
case R.string.title_setup_gmail:
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_GMAIL));
if (Helper.hasValidFingerprint(getContext()))
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_GMAIL));
else
ToastEx.makeText(getContext(), R.string.title_setup_gmail_support, Toast.LENGTH_LONG).show();
return true;
case R.string.title_setup_other:
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP));

3
app/src/main/res/values/strings.xml
View File

@@ -137,6 +137,7 @@
<string name="title_setup_wizard">Wizard</string>
<string name="title_setup_gmail" translatable="false">Gmail</string>
<string name="title_setup_other">Other provider</string>
<string name="title_setup_gmail_support">Authorizing Google accounts will work in official versions only because Android checks the app signature</string>
<string name="title_setup_gmail_rationale">Please grant permissions to select an account and read your name</string>
<string name="title_setup_select_account">Select account</string>
<string name="title_setup_instructions">Setup instructions</string>
@@ -318,7 +319,7 @@
<string name="title_advanced_poll_hint">Synchronizing periodically will compare local and remote messages each and every time, which is an expensive operation possibly resulting in extra battery usage, especially when there are a lot of messages to synchronize. Always synchronizing will avoid this by continuous monitoring for changes only.</string>
<string name="title_advanced_schedule_hint">Tap on a time to set a time</string>
<string name="title_advanced_check_mx">Check sender email addresses on synchronizing messages</string>
<string name="title_advanced_unseen_hint">Some providers don\'t support this properly, which, for example, may result in all messages being synchronized</string>
<string name="title_advanced_unseen_hint">Some providers don\'t support this properly, which may cause synchronizing none or all messages</string>
<string name="title_advanced_sync_kept_hint">This will transfer extra data and consume extra battery power, especially if a lot of messages are stored on the device</string>
<string name="title_advanced_sync_folders_hint">Disabling this will reduce data and battery usage somewhat, but will disable updating the list of folders too</string>
<string name="title_advanced_sync_delay_hint">This will slow down synchronizing messages</string>