mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-15 08:29:24 +00:00
Code Issues Releases Wiki Activity

Revert "Abusive behavior"

Browse source 
This reverts commit fde123cba2.
This commit is contained in:
M66B 2022-07-27 07:41:04 +02:00
parent 0603df1e55
commit ad30ee65ce
3 changed files with 2 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -90,7 +90,6 @@ import android.text.Spanned;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.format.DateUtils;
import android.text.method.LinkMovementMethod;
import android.text.style.BackgroundColorSpan;
import android.text.style.ForegroundColorSpan;
import android.text.style.RelativeSizeSpan;
@ -265,7 +264,6 @@ public class FragmentMessages extends FragmentBase
private TextView tvAirplane;
private TextView tvNotifications;
private TextView tvSupport;
private TextView tvCancelled;
private ImageButton ibHintSupport;
private ImageButton ibHintSwipe;
private ImageButton ibHintSelect;
@ -552,7 +550,6 @@ public class FragmentMessages extends FragmentBase
tvAirplane = view.findViewById(R.id.tvAirplane);
tvNotifications = view.findViewById(R.id.tvNotifications);
tvSupport = view.findViewById(R.id.tvSupport);
tvCancelled = view.findViewById(R.id.tvCancelled);
ibHintSupport = view.findViewById(R.id.ibHintSupport);
ibHintSwipe = view.findViewById(R.id.ibHintSwipe);
ibHintSelect = view.findViewById(R.id.ibHintSelect);
@ -648,9 +645,6 @@ public class FragmentMessages extends FragmentBase
}
});
//tvCancelled.setVisibility(BuildConfig.DEBUG ? View.GONE : View.VISIBLE);
tvCancelled.setMovementMethod(LinkMovementMethod.getInstance());
ibHintSupport.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

24
app/src/main/res/layout/fragment_messages.xml
View file

@ -68,7 +68,7 @@
<TextView
android:id="@+id/tvSupport"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="6dp"
@ -86,26 +86,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSupport" />
<TextView
android:id="@+id/tvCancelled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="6dp"
android:text="@string/app_cancelled"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/vSeparatorSupport" />
<View
android:id="@+id/vSeparatorCancelled"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/colorSeparator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvCancelled" />
<TextView
android:id="@+id/tvHintSupport"
android:layout_width="0dp"
@ -117,7 +97,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toStartOf="@+id/ibHintSupport"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorCancelled" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorSupport" />
<ImageButton
android:id="@+id/ibHintSupport"

4
app/src/main/res/values/strings.xml
View file

@ -14,10 +14,6 @@
<string name="app_cake">Insufficient storage space left</string>
<string name="app_updated">Last update: %1$s</string>
<string name="app_download">Downloaded from: %1$s</string>
<string name="app_cancelled">
I\'m sorry, but I have been forced to stop this project due to <a href="https://email.faircode.eu/status/">abusive behavior by Google</a>.
You can continue to use the app for now, but given the situation, there is no point in putting effort into this app anymore.
</string>
<string name="channel_service">Monitor</string>
<string name="channel_send">Send</string>