mirror of https://github.com/M66B/FairEmail.git
Drop drafts folder requirement
This commit is contained in:
parent
f6a2d3c59c
commit
750bf3299f
|
@ -807,8 +807,6 @@ public class FragmentAccount extends FragmentBase {
|
||||||
throw new IllegalArgumentException(context.getString(R.string.title_no_password));
|
throw new IllegalArgumentException(context.getString(R.string.title_no_password));
|
||||||
if (TextUtils.isEmpty(interval))
|
if (TextUtils.isEmpty(interval))
|
||||||
interval = "19";
|
interval = "19";
|
||||||
if (synchronize && drafts == null)
|
|
||||||
throw new IllegalArgumentException(context.getString(R.string.title_no_drafts));
|
|
||||||
|
|
||||||
if (TextUtils.isEmpty(realm))
|
if (TextUtils.isEmpty(realm))
|
||||||
realm = null;
|
realm = null;
|
||||||
|
|
|
@ -541,6 +541,16 @@
|
||||||
app:layout_constraintStart_toEndOf="@id/barrier_folders"
|
app:layout_constraintStart_toEndOf="@id/barrier_folders"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvIdle" />
|
app:layout_constraintTop_toBottomOf="@id/tvIdle" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvDraftsRemark"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/title_drafts_required"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textStyle="italic"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/spDrafts" />
|
||||||
|
|
||||||
<Spinner
|
<Spinner
|
||||||
android:id="@+id/spSent"
|
android:id="@+id/spSent"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
@ -549,7 +559,7 @@
|
||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="12dp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@id/barrier_folders"
|
app:layout_constraintStart_toEndOf="@id/barrier_folders"
|
||||||
app:layout_constraintTop_toBottomOf="@id/spDrafts" />
|
app:layout_constraintTop_toBottomOf="@id/tvDraftsRemark" />
|
||||||
|
|
||||||
<Spinner
|
<Spinner
|
||||||
android:id="@+id/spAll"
|
android:id="@+id/spAll"
|
||||||
|
@ -679,6 +689,6 @@
|
||||||
android:id="@+id/grpFolders"
|
android:id="@+id/grpFolders"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
app:constraint_referenced_ids="tvDrafts,spDrafts,tvSent,spSent,tvAll,spAll,tvTrash,spTrash,tvJunk,spJunk,vSeparatorSwipe,tvLeft,spLeft,tvRight,spRight" />
|
app:constraint_referenced_ids="tvDrafts,spDrafts,tvDraftsRemark,tvSent,spSent,tvAll,spAll,tvTrash,spTrash,tvJunk,spJunk,vSeparatorSwipe,tvLeft,spLeft,tvRight,spRight" />
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
|
@ -232,10 +232,10 @@
|
||||||
<string name="title_no_user">User name missing</string>
|
<string name="title_no_user">User name missing</string>
|
||||||
<string name="title_no_password">Password missing</string>
|
<string name="title_no_password">Password missing</string>
|
||||||
<string name="title_no_inbox">Inbox not found</string>
|
<string name="title_no_inbox">Inbox not found</string>
|
||||||
<string name="title_no_drafts">No drafts folder selected</string>
|
|
||||||
<string name="title_no_primary_drafts">No primary account or no drafts folder</string>
|
<string name="title_no_primary_drafts">No primary account or no drafts folder</string>
|
||||||
<string name="title_no_idle">This provider does not support push messages. This will delay reception of new messages and increase battery usage.</string>
|
<string name="title_no_idle">This provider does not support push messages. This will delay reception of new messages and increase battery usage.</string>
|
||||||
<string name="title_no_sync">Synchronization errors since %1$s</string>
|
<string name="title_no_sync">Synchronization errors since %1$s</string>
|
||||||
|
<string name="title_drafts_required">A drafts folder is required to send messages</string>
|
||||||
<string name="title_account_delete">Delete this account permanently?</string>
|
<string name="title_account_delete">Delete this account permanently?</string>
|
||||||
<string name="title_identity_delete">Delete this identity permanently?</string>
|
<string name="title_identity_delete">Delete this identity permanently?</string>
|
||||||
<string name="title_pop">POP is not supported</string>
|
<string name="title_pop">POP is not supported</string>
|
||||||
|
|
Loading…
Reference in New Issue