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

Use local database for frequently used contacts

Browse Source
pull/153/head
M66B 6 years ago
parent 0b10f00368
commit 843cd61e51
2 changed files with 33 additions and 59 deletions
Show Stats Download Patch File Download Diff File

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

@ -33,7 +33,6 @@ import android.content.SharedPreferences;
import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager; import android.content.pm.ShortcutManager;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.drawable.Icon; import android.graphics.drawable.Icon;
@ -798,64 +797,34 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
" manifest=" + sm.getManifestShortcuts().size()); " manifest=" + sm.getManifestShortcuts().size());
List<ShortcutInfo> shortcuts = new ArrayList<>(); List<ShortcutInfo> shortcuts = new ArrayList<>();
if (count > 0) {
if (hasPermission(Manifest.permission.READ_CONTACTS)) { DB db = DB.getInstance(context);
// https://developer.android.com/guide/topics/providers/contacts-provider#ObsoleteData List<EntityContact> frequently = db.contact().getFrequentlyContacted(count);
try (Cursor cursor = getContentResolver().query( for (EntityContact contact : frequently) {
ContactsContract.CommonDataKinds.Email.CONTENT_URI, Intent intent = new Intent(context, ActivityCompose.class);
new String[]{ intent.setAction(Intent.ACTION_SEND);
ContactsContract.RawContacts._ID, intent.setData(Uri.parse("mailto:" + contact.email));
ContactsContract.Contacts.LOOKUP_KEY,
ContactsContract.Contacts.DISPLAY_NAME, Icon icon = null;
ContactsContract.CommonDataKinds.Email.DATA, if (contact.avatar != null &&
ContactsContract.Contacts.STARRED, Helper.hasPermission(context, Manifest.permission.READ_CONTACTS)) {
ContactsContract.Contacts.TIMES_CONTACTED, // Create icon from bitmap because launcher might not have contacts permission
ContactsContract.Contacts.LAST_TIME_CONTACTED InputStream is = ContactsContract.Contacts.openContactPhotoInputStream(
}, getContentResolver(), Uri.parse(contact.avatar));
ContactsContract.CommonDataKinds.Email.DATA + " <> ''", Bitmap bitmap = BitmapFactory.decodeStream(is);
null, if (bitmap != null)
ContactsContract.Contacts.STARRED + " DESC" + icon = Icon.createWithBitmap(bitmap);
", " + ContactsContract.Contacts.TIMES_CONTACTED + " DESC" + }
", " + ContactsContract.Contacts.LAST_TIME_CONTACTED + " DESC")) { if (icon == null)
while (cursor != null && cursor.moveToNext() && shortcuts.size() < count) icon = Icon.createWithResource(context, R.drawable.ic_shortcut_email);
try {
long id = cursor.getLong(cursor.getColumnIndex(ContactsContract.RawContacts._ID)); shortcuts.add(
String name = cursor.getString(cursor.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME)); new ShortcutInfo.Builder(context, Long.toString(contact.id))
String email = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.DATA)); .setIcon(icon)
int starred = cursor.getInt(cursor.getColumnIndex(ContactsContract.Contacts.STARRED)); .setRank(shortcuts.size() + 1)
int times = cursor.getInt(cursor.getColumnIndex(ContactsContract.Contacts.TIMES_CONTACTED)); .setShortLabel(contact.name == null ? contact.email : contact.name)
long last = cursor.getLong(cursor.getColumnIndex(ContactsContract.Contacts.LAST_TIME_CONTACTED)); .setIntent(intent)
.build());
Log.i("Shortcut id=" + id + " email=" + email +
" starred=" + starred + " times=" + times + " last=" + last);
if (starred == 0 && times == 0 && last == 0)
continue;
Uri uri = ContactsContract.Contacts.getLookupUri(
cursor.getLong(cursor.getColumnIndex(ContactsContract.RawContacts._ID)),
cursor.getString(cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY)));
InputStream is = ContactsContract.Contacts.openContactPhotoInputStream(
getContentResolver(), uri);
Bitmap bitmap = BitmapFactory.decodeStream(is);
Icon icon = (bitmap == null
? Icon.createWithResource(context, R.drawable.ic_shortcut_email)
: Icon.createWithBitmap(bitmap));
Intent intent = new Intent(context, ActivityCompose.class);
intent.setAction(Intent.ACTION_SEND);
intent.setData(Uri.parse("mailto:" + email));
shortcuts.add(
new ShortcutInfo.Builder(context, Long.toString(id))
.setIcon(icon)
.setRank(shortcuts.size() + 1)
.setShortLabel(name)
.setIntent(intent)
.build());
} catch (Throwable ex) {
Log.e(ex);
}
} }
} }

5
app/src/main/java/eu/faircode/email/DaoContact.java
Unescape View File

@ -38,6 +38,11 @@ public interface DaoContact {
" ORDER BY times_contacted DESC, last_contacted DESC") " ORDER BY times_contacted DESC, last_contacted DESC")
LiveData<List<EntityContact>> liveContacts(); LiveData<List<EntityContact>> liveContacts();
@Query("SELECT * FROM contact" +
" ORDER BY times_contacted DESC, last_contacted DESC" +
" LIMIT :count")
List<EntityContact> getFrequentlyContacted(int count);
@Query("SELECT *" + @Query("SELECT *" +
" FROM contact" + " FROM contact" +
" WHERE email = :email" + " WHERE email = :email" +

Write Preview
Loading…
Cancel
Save