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

Removed undo send

Browse Source
pull/196/head
M66B 5 years ago
parent 77653d298b
commit c717573886
7 changed files with 1 additions and 58 deletions
Show Stats Download Patch File Download Diff File

1
app/src/fdroid/AndroidManifest.xml
Unescape View File

@ -12,7 +12,6 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="com.android.vending.BILLING" />

1
app/src/github/AndroidManifest.xml
Unescape View File

@ -12,7 +12,6 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="com.android.vending.BILLING" />

1
app/src/main/AndroidManifest.xml
Unescape View File

@ -12,7 +12,6 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="com.android.vending.BILLING" />

44
app/src/main/java/eu/faircode/email/ActivityView.java
Unescape View File

@ -136,7 +136,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
static final String ACTION_EDIT_RULES = BuildConfig.APPLICATION_ID + ".EDIT_RULES";
static final String ACTION_EDIT_RULE = BuildConfig.APPLICATION_ID + ".EDIT_RULE";
static final String ACTION_NEW_MESSAGE = BuildConfig.APPLICATION_ID + ".NEW_MESSAGE";
static final String ACTION_UNDO_SEND = BuildConfig.APPLICATION_ID + ".UNDO_SEND";
private static final long UNDO_SEND_DELAY = 7000; // milliseconds
private static final int UPDATE_TIMEOUT = 15 * 1000; // milliseconds
@ -160,7 +159,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
IntentFilter iff = new IntentFilter();
iff.addAction(ACTION_NEW_MESSAGE);
iff.addAction(ACTION_UNDO_SEND);
lbm.registerReceiver(creceiver, iff);
if (savedInstanceState != null)
@ -1291,8 +1289,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
String action = intent.getAction();
if (ACTION_NEW_MESSAGE.equals(action))
onNewMessage(intent);
else if (ACTION_UNDO_SEND.equals(action))
onUndoSend(intent);
}
};
@ -1315,46 +1311,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
updatedFolders.add(-1L);
}
private void onUndoSend(Intent intent) {
long id = intent.getLongExtra("id", -1);
int delayed = intent.getIntExtra("delayed", 0);
long scheduled = intent.getLongExtra("scheduled", 0);
long now = new Date().getTime();
Log.i("Undo send delay=" + UNDO_SEND_DELAY +
" delayed=" + delayed +
" scheduled=" + new Date(scheduled) +
" now=" + new Date(now));
if (delayed * 1000L < UNDO_SEND_DELAY * 2 || scheduled - now < UNDO_SEND_DELAY * 2)
return;
SimpleTask<Long> task = new SimpleTask<Long>() {
@Override
protected Long onExecute(Context context, Bundle args) {
long id = args.getLong("id");
return ActivityCompose.undoSend(id, context);
}
@Override
protected void onExecuted(Bundle args, Long id) {
if (id == null)
return;
startActivity(
new Intent(ActivityView.this, ActivityCompose.class)
.putExtra("action", "edit")
.putExtra("id", id));
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getSupportFragmentManager(), ex, !(ex instanceof IllegalArgumentException));
}
};
undo(UNDO_SEND_DELAY, getString(R.string.title_sending), intent.getExtras(), null, task);
}
private BroadcastReceiver receiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {

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

@ -463,7 +463,7 @@ public class EntityMessage implements Serializable {
am.cancel(pi);
} else {
Log.i("Set snooze id=" + id + " wakeup=" + new Date(wakeup));
AlarmManagerCompat.setExactAndAllowWhileIdle(am, AlarmManager.RTC_WAKEUP, wakeup, pi);
AlarmManagerCompat.setAndAllowWhileIdle(am, AlarmManager.RTC_WAKEUP, wakeup, pi);
}
}

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

@ -107,7 +107,6 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Observer;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.preference.PreferenceManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -5019,14 +5018,6 @@ public class FragmentCompose extends FragmentBase {
else {
Log.i("Delayed send id=" + draft.id + " at " + new Date(draft.ui_snoozed));
EntityMessage.snooze(context, draft.id, draft.ui_snoozed);
Intent undo = new Intent(ActivityView.ACTION_UNDO_SEND);
undo.putExtra("id", draft.id);
undo.putExtra("delayed", send_delayed);
undo.putExtra("scheduled", draft.ui_snoozed);
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(undo);
}
return draft;

1
app/src/play/AndroidManifest.xml
Unescape View File

@ -12,7 +12,6 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="com.android.vending.BILLING" />

Write Preview
Loading…
Cancel
Save