Skip to content

Commit

Permalink
Release expression conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
M66B committed Jan 29, 2025
1 parent 790d092 commit 9be86e4
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 24 deletions.
8 changes: 1 addition & 7 deletions FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -2901,7 +2901,7 @@ to be able to match [unfolded headers](https://tools.ietf.org/html/rfc2822#secti

**Expressions**

Since version 1.2174 it is possible to use expression conditions, which is [experimental](#faq125) for now.
Since version 1.2174 it is possible to use expression conditions.

Please [see here](https://ezylang.github.io/EvalEx/references/references.html) about which constants, operators and functions are available.

Expand Down Expand Up @@ -4291,12 +4291,6 @@ Composing messages using [Markdown](https://en.wikipedia.org/wiki/Markdown) can

<br />

*Rule expression condition (1.2174+)*

See [this FAQ](#faq71)

<br />

*Fast forward to (1.2226+)*

Show (fast) *Forward to* in the answer menu, with addresses recently used for forwarding messages (if any).
Expand Down
7 changes: 0 additions & 7 deletions app/src/main/java/eu/faircode/email/FragmentRule.java
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ public class FragmentRule extends FragmentBase {
private ContentLoadingProgressBar pbWait;

private Group grpReady;
private Group grpExpression;
private Group grpAge;
private Group grpSnooze;
private Group grpFlag;
Expand Down Expand Up @@ -401,7 +400,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
pbWait = view.findViewById(R.id.pbWait);

grpReady = view.findViewById(R.id.grpReady);
grpExpression = view.findViewById(R.id.grpExpression);
grpAge = view.findViewById(R.id.grpAge);
grpSnooze = view.findViewById(R.id.grpSnooze);
grpFlag = view.findViewById(R.id.grpFlag);
Expand Down Expand Up @@ -946,7 +944,6 @@ public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
tvFolder.setText(null);
bottom_navigation.setVisibility(View.GONE);
grpReady.setVisibility(View.GONE);
grpExpression.setVisibility(View.GONE);
grpAge.setVisibility(View.GONE);
grpSnooze.setVisibility(View.GONE);
grpFlag.setVisibility(View.GONE);
Expand Down Expand Up @@ -1532,10 +1529,6 @@ protected void onExecuted(Bundle args, TupleRuleEx rule) {
if (action != null)
showActionParameters(action.type);
}

SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean experiments = prefs.getBoolean("experiments", false);
grpExpression.setVisibility(experiments ? View.VISIBLE : View.GONE);
} catch (Throwable ex) {
Log.e(ex);
} finally {
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/layout/fragment_rule.xml
Original file line number Diff line number Diff line change
Expand Up @@ -876,12 +876,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvExpression" />

<androidx.constraintlayout.widget.Group
android:id="@+id/grpExpression"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvAndExpression,vSeparatorExpression,tvExpression,etExpression" />

<TextView
android:id="@+id/tvAction"
android:layout_width="wrap_content"
Expand Down
5 changes: 1 addition & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1583,7 +1583,7 @@ <h2>
<p>Note that <a href="https://developer.android.com/reference/java/util/regex/Pattern#DOTALL">dot all mode</a> is enabled to be able to match <a href="https://tools.ietf.org/html/rfc2822#section-3.2.3">unfolded headers</a>.</p>
<p><br /></p>
<p><strong>Expressions</strong></p>
<p>Since version 1.2174 it is possible to use expression conditions, which is <a href="#faq125">experimental</a> for now.</p>
<p>Since version 1.2174 it is possible to use expression conditions.</p>
<p>Please <a href="https://ezylang.github.io/EvalEx/references/references.html">see here</a> about which constants, operators and functions are available.</p>
<p>The following extra variables are available:</p>
<ul>
Expand Down Expand Up @@ -2237,9 +2237,6 @@ <h2>
<p><em>Markdown (1.2061+)</em></p>
<p>Composing messages using <a href="https://en.wikipedia.org/wiki/Markdown">Markdown</a> can be enabled via the three-dots overflow menu of the message editor.</p>
<p><br /></p>
<p><em>Rule expression condition (1.2174+)</em></p>
<p>See <a href="#faq71">this FAQ</a></p>
<p><br /></p>
<p><em>Fast forward to (1.2226+)</em></p>
<p>Show (fast) <em>Forward to</em> in the answer menu, with addresses recently used for forwarding messages (if any). You can show the answer menu by tapping on the answer button at the bottom right of an opened/expanded message.</p>
<p><br /></p>
Expand Down

0 comments on commit 9be86e4

Please sign in to comment.