mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactoring

This commit is contained in:
M66B 2022-04-14 07:57:34 +02:00
parent ff3f9df450
commit d914c3054a
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/AdapterContact.java
View File

@ -45,7 +45,6 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.PopupMenu;
import androidx.core.content.pm.ShortcutInfoCompat;
import androidx.core.content.pm.ShortcutManagerCompat;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
@ -308,7 +307,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
private void onActionPin() {
ShortcutInfoCompat.Builder builder = Shortcuts.getShortcut(context, contact);
ShortcutManagerCompat.requestPinShortcut(context, builder.build(), null);
Shortcuts.requestPinShortcut(context, builder.build());
}
private void onActionEdit() {

3
app/src/main/java/eu/faircode/email/AdapterFolder.java
View File

@ -54,7 +54,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu;
import androidx.constraintlayout.widget.Group;
import androidx.core.content.pm.ShortcutInfoCompat;
import androidx.core.content.pm.ShortcutManagerCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.Lifecycle;
@ -1142,7 +1141,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
private void onActionPinFolder() {
ShortcutInfoCompat.Builder builder = Shortcuts.getShortcut(context, folder);
ShortcutManagerCompat.requestPinShortcut(context, builder.build(), null);
Shortcuts.requestPinShortcut(context, builder.build());
}
private void onActionDeleteFolder() {

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

@ -119,7 +119,6 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Group;
import androidx.core.content.FileProvider;
import androidx.core.content.pm.ShortcutInfoCompat;
import androidx.core.content.pm.ShortcutManagerCompat;
import androidx.core.graphics.ColorUtils;
import androidx.core.view.MenuCompat;
import androidx.fragment.app.Fragment;
@ -4627,7 +4626,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
try {
ShortcutInfoCompat.Builder builder =
Shortcuts.getShortcut(context, (InternetAddress) message.from[0]);
ShortcutManagerCompat.requestPinShortcut(context, builder.build(), null);
Shortcuts.requestPinShortcut(context, builder.build());
} catch (Throwable ex) {
Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
}
@ -6307,7 +6306,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
protected void onExecuted(Bundle args, ContactInfo[] contactInfo) {
ShortcutInfoCompat.Builder builder =
Shortcuts.getShortcut(context, message, contactInfo);
ShortcutManagerCompat.requestPinShortcut(context, builder.build(), null);
Shortcuts.requestPinShortcut(context, builder.build());
}
@Override
@ -6889,7 +6888,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
this.colorControlNormal = Helper.resolveColor(context, R.attr.colorControlNormal);
this.hasWebView = Helper.hasWebView(context);
this.pin = ShortcutManagerCompat.isRequestPinShortcutSupported(context);
this.pin = Shortcuts.can(context);
this.contacts = Helper.hasPermission(context, Manifest.permission.READ_CONTACTS);
this.textSize = Helper.getTextSize(context, zoom);

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

@ -119,9 +119,9 @@ class Shortcuts {
List<String> remove = new ArrayList<>();
if (BuildConfig.DEBUG && false)
ShortcutManagerCompat.removeAllDynamicShortcuts(context);
ShortcutManagerCompat.removeAllDynamicShortcuts(context.getApplicationContext());
List<ShortcutInfoCompat> existing = ShortcutManagerCompat.getDynamicShortcuts(context);
List<ShortcutInfoCompat> existing = ShortcutManagerCompat.getDynamicShortcuts(context.getApplicationContext());
for (ShortcutInfoCompat shortcut : shortcuts) {
boolean exists = false;
@ -153,11 +153,11 @@ class Shortcuts {
" remove=" + remove.size());
if (remove.size() > 0)
ShortcutManagerCompat.removeDynamicShortcuts(context, remove);
ShortcutManagerCompat.removeDynamicShortcuts(context.getApplicationContext(), remove);
for (ShortcutInfoCompat shortcut : add) {
Log.i("Push shortcut id=" + shortcut.getId());
ShortcutManagerCompat.pushDynamicShortcut(context, shortcut);
ShortcutManagerCompat.pushDynamicShortcut(context.getApplicationContext(), shortcut);
}
}
@ -346,6 +346,10 @@ class Shortcuts {
}
static boolean can(Context context) {
return ShortcutManagerCompat.isRequestPinShortcutSupported(context);
return ShortcutManagerCompat.isRequestPinShortcutSupported(context.getApplicationContext());
}
static void requestPinShortcut(Context context, ShortcutInfoCompat info){
ShortcutManagerCompat.requestPinShortcut(context.getApplicationContext(), info, null);
}
}