Check email action; only allow checking email from inbox and when authenticated
This commit is contained in:
@@ -63,6 +63,7 @@ public class EmailListFragment extends AuthenticatedListFragment implements
|
|||||||
private EmailFolder mFolder;
|
private EmailFolder mFolder;
|
||||||
|
|
||||||
private MenuItem mNewEmail;
|
private MenuItem mNewEmail;
|
||||||
|
private MenuItem mCheckEmail;
|
||||||
|
|
||||||
// The Controller which provides CHOICE_MODE_MULTIPLE_MODAL-like functionality
|
// The Controller which provides CHOICE_MODE_MULTIPLE_MODAL-like functionality
|
||||||
private MultiSelectionUtil.Controller mMultiSelectController;
|
private MultiSelectionUtil.Controller mMultiSelectController;
|
||||||
@@ -211,12 +212,17 @@ public class EmailListFragment extends AuthenticatedListFragment implements
|
|||||||
super.onCreateOptionsMenu(menu, inflater);
|
super.onCreateOptionsMenu(menu, inflater);
|
||||||
inflater.inflate(R.menu.email_list, menu);
|
inflater.inflate(R.menu.email_list, menu);
|
||||||
mNewEmail = menu.findItem(R.id.action_new_email);
|
mNewEmail = menu.findItem(R.id.action_new_email);
|
||||||
|
mCheckEmail = menu.findItem(R.id.action_check_email);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPrepareOptionsMenu(Menu menu) {
|
public void onPrepareOptionsMenu(Menu menu) {
|
||||||
super.onPrepareOptionsMenu(menu);
|
super.onPrepareOptionsMenu(menu);
|
||||||
mNewEmail.setVisible(!I2PBote.getInstance().isPasswordRequired());
|
boolean passwordRequired = I2PBote.getInstance().isPasswordRequired();
|
||||||
|
mNewEmail.setVisible(!passwordRequired);
|
||||||
|
mCheckEmail.setVisible(mSwipeRefreshLayout != null && !passwordRequired);
|
||||||
|
if (mSwipeRefreshLayout != null)
|
||||||
|
mSwipeRefreshLayout.setEnabled(!passwordRequired);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -226,6 +232,13 @@ public class EmailListFragment extends AuthenticatedListFragment implements
|
|||||||
startNewEmail();
|
startNewEmail();
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
case R.id.action_check_email:
|
||||||
|
if (!mSwipeRefreshLayout.isRefreshing()) {
|
||||||
|
mSwipeRefreshLayout.setRefreshing(true);
|
||||||
|
onRefresh();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,4 +8,9 @@
|
|||||||
android:title="@string/action_new_email"
|
android:title="@string/action_new_email"
|
||||||
i2pandroid:showAsAction="ifRoom"/>
|
i2pandroid:showAsAction="ifRoom"/>
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_check_email"
|
||||||
|
android:title="@string/check_email"
|
||||||
|
i2pandroid:showAsAction="never"/>
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
@@ -43,9 +43,7 @@
|
|||||||
<string name="action_stop_bote">Disconnect from network</string>
|
<string name="action_stop_bote">Disconnect from network</string>
|
||||||
<string name="action_settings">Settings</string>
|
<string name="action_settings">Settings</string>
|
||||||
<string name="start_i2p_android">It appears that I2P Android is not running. Would you like to start it?</string>
|
<string name="start_i2p_android">It appears that I2P Android is not running. Would you like to start it?</string>
|
||||||
<string name="pull_text">Pull to check email</string>
|
<string name="check_email">Check email</string>
|
||||||
<string name="refreshing_text">Checking email…</string>
|
|
||||||
<string name="release_text">Let go to check email</string>
|
|
||||||
<!-- Argument is a number -->
|
<!-- Argument is a number -->
|
||||||
<string name="incomplete_emails">%s incomplete emails</string>
|
<string name="incomplete_emails">%s incomplete emails</string>
|
||||||
<!-- Argument is a number -->
|
<!-- Argument is a number -->
|
||||||
|
|||||||
Reference in New Issue
Block a user