msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added unsubscribe button

Browse Source
pull/162/head
M66B 5 years ago
parent da265bcc86
commit d9d601ef4a
9 changed files with 1945 additions and 7 deletions
Show Stats Download Patch File Download Diff File

1854
app/schemas/eu.faircode.email.DB/100.json
View File

File diff suppressed because it is too large Load Diff

14
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -304,6 +304,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private ImageButton ibFull;
private ImageButton ibImages;
private ImageButton ibUnsubscribe;
private ImageButton ibDecrypt;
private TextView tvBody;
@ -447,6 +448,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull = vsBody.findViewById(R.id.ibFull);
ibImages = vsBody.findViewById(R.id.ibImages);
ibUnsubscribe = vsBody.findViewById(R.id.ibUnsubscribe);
ibDecrypt = vsBody.findViewById(R.id.ibDecrypt);
tvBody = vsBody.findViewById(R.id.tvBody);
@ -516,6 +518,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull.setOnClickListener(this);
ibImages.setOnClickListener(this);
ibUnsubscribe.setOnClickListener(this);
ibDecrypt.setOnClickListener(this);
tvBody.setOnTouchListener(this);
@ -566,6 +569,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull.setOnClickListener(null);
ibImages.setOnClickListener(null);
ibUnsubscribe.setOnClickListener(null);
ibDecrypt.setOnClickListener(null);
tvBody.setOnTouchListener(null);
@ -910,6 +914,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull.setVisibility(View.GONE);
ibImages.setVisibility(View.GONE);
ibUnsubscribe.setVisibility(View.GONE);
ibDecrypt.setVisibility(View.GONE);
tvBody.setVisibility(View.GONE);
@ -978,6 +983,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull.setVisibility(View.GONE);
ibImages.setVisibility(View.GONE);
ibUnsubscribe.setVisibility(message.unsubscribe == null ? View.GONE : View.VISIBLE);
if (textSize != 0) {
float size = properties.getSize(message.id, textSize);
@ -1512,6 +1518,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
case R.id.ibImages:
onShowImages(message);
break;
case R.id.ibUnsubscribe:
onActionUnsubscribe(message);
break;
case R.id.ibDecrypt:
onActionDecrypt(message);
break;
@ -2101,6 +2110,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}.execute(context, owner, args, "show:images");
}
private void onActionUnsubscribe(TupleMessageEx message) {
Uri uri = Uri.parse(message.unsubscribe);
onOpenLink(uri, context.getString(R.string.title_legend_show_unsubscribe));
}
private void onActionDecrypt(TupleMessageEx message) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(

1
app/src/main/java/eu/faircode/email/Core.java
Unescape View File

@ -1477,6 +1477,7 @@ class Core {
message.bcc = helper.getBcc();
message.reply = helper.getReply();
message.list_post = helper.getListPost();
message.unsubscribe = helper.getListUnsubscribe();
message.subject = helper.getSubject();
message.size = helper.getSize();
message.content = false;

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

@ -58,7 +58,7 @@ import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory;
// https://developer.android.com/topic/libraries/architecture/room.html
@Database(
version = 99,
version = 100,
entities = {
EntityIdentity.class,
EntityAccount.class,
@ -999,6 +999,13 @@ public abstract class DB extends RoomDatabase {
db.execSQL("ALTER TABLE `message` ADD COLUMN `signature` INTEGER NOT NULL DEFAULT 1");
}
})
.addMigrations(new Migration(99, 100) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase db) {
Log.i("DB migration from version " + startVersion + " to " + endVersion);
db.execSQL("ALTER TABLE `message` ADD COLUMN `unsubscribe` TEXT");
}
})
.build();
}

1
app/src/main/java/eu/faircode/email/EntityMessage.java
Unescape View File

@ -108,6 +108,7 @@ public class EntityMessage implements Serializable {
public Address[] bcc;
public Address[] reply;
public Address[] list_post;
public String unsubscribe;
public String headers;
public Boolean raw;
public String subject;

48
app/src/main/java/eu/faircode/email/MessageHelper.java
Unescape View File

@ -22,6 +22,7 @@ package eu.faircode.email;
import android.content.Context;
import android.content.SharedPreferences;
import android.net.MailTo;
import android.net.Uri;
import android.text.TextUtils;
import android.webkit.MimeTypeMap;
@ -548,19 +549,20 @@ public class MessageHelper {
return null;
list = MimeUtility.unfold(list);
list = decodeMime(list);
// List-Post: NO (posting not allowed on this list)
if (list != null && list.startsWith("NO"))
return null;
// https://www.ietf.org/rfc/rfc2368.txt
for (String _to : list.split(",")) {
String to = _to.trim();
int lt = to.indexOf("<");
int gt = to.lastIndexOf(">");
for (String entry : list.split(",")) {
entry = entry.trim();
int lt = entry.indexOf("<");
int gt = entry.lastIndexOf(">");
if (lt >= 0 && gt > lt)
try {
MailTo mailto = MailTo.parse(to.substring(lt + 1, gt));
MailTo mailto = MailTo.parse(entry.substring(lt + 1, gt));
if (mailto.getTo() != null)
return new Address[]{new InternetAddress(mailto.getTo().split(",")[0])};
} catch (android.net.ParseException ex) {
@ -576,6 +578,42 @@ public class MessageHelper {
}
}
String getListUnsubscribe() throws MessagingException {
String list;
try {
// https://www.ietf.org/rfc/rfc2369.txt
list = imessage.getHeader("List-Unsubscribe", null);
if (list == null)
return null;
list = MimeUtility.unfold(list);
list = decodeMime(list);
if (list != null && list.startsWith("NO"))
return null;
for (String entry : list.split(",")) {
entry = entry.trim();
int lt = entry.indexOf("<");
int gt = entry.lastIndexOf(">");
if (lt >= 0 && gt > lt) {
String unsubscribe = entry.substring(lt + 1, gt);
Uri uri = Uri.parse(unsubscribe);
String scheme = uri.getScheme();
if ("mailto".equals(scheme) ||
"http".equals(scheme) || "https".equals(scheme))
return unsubscribe;
}
}
Log.w(new IllegalArgumentException("List-Unsubscribe: " + list));
return null;
} catch (AddressException ex) {
Log.w(ex);
return null;
}
}
String getSubject() throws MessagingException {
String subject = imessage.getHeader("Subject", null);
if (subject == null)

10
app/src/main/res/drawable/baseline_unsubscribe_24.xml
Unescape View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M18.5,13c-1.93,0 -3.5,1.57 -3.5,3.5s1.57,3.5 3.5,3.5 3.5,-1.57 3.5,-3.5 -1.57,-3.5 -3.5,-3.5zM20.5,17h-4v-1h4v1zM13.55,17c-0.02,-0.17 -0.05,-0.33 -0.05,-0.5 0,-2.76 2.24,-5 5,-5 0.92,0 1.76,0.26 2.5,0.69L21,5c0,-1.1 -0.9,-2 -2,-2L5,3c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h8.55zM12,10.5L5,7L5,5l7,3.5L19,5v2l-7,3.5z"/>
</vector>

14
app/src/main/res/layout/include_message_navigation.xml
Unescape View File

@ -26,10 +26,22 @@
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_decrypt"
android:tint="@color/bottomnav_foreground"
app:layout_constraintEnd_toStartOf="@+id/ibImages"
app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
app:layout_constraintTop_toBottomOf="@id/bnvActions"
app:srcCompat="@drawable/baseline_no_encryption_24" />
<ImageButton
android:id="@+id/ibUnsubscribe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_show_unsubscribe"
android:tint="@color/bottomnav_foreground"
app:layout_constraintEnd_toStartOf="@+id/ibImages"
app:layout_constraintTop_toBottomOf="@id/bnvActions"
app:srcCompat="@drawable/baseline_unsubscribe_24" />
<ImageButton
android:id="@+id/ibImages"
android:layout_width="wrap_content"

1
app/src/main/res/values/strings.xml
Unescape View File

@ -742,6 +742,7 @@
<string name="title_legend_expander">Expander</string>
<string name="title_legend_avatar">Avatar</string>
<string name="title_legend_show_quotes">Show quotes</string>
<string name="title_legend_show_unsubscribe">Unsubscribe from list</string>
<string name="title_legend_show_images">Show images</string>
<string name="title_legend_show_full">Show fullscreen</string>
<string name="title_legend_edit">Edit</string>

Write Preview
Loading…
Cancel
Save