This commit is contained in:
Paul Schaub 2019-08-04 22:36:30 +02:00
parent fbb0a0e978
commit 513bf2bab0
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
13 changed files with 625 additions and 5 deletions

View file

@ -0,0 +1,101 @@
package org.mercury_im.messenger.core;
import org.jivesoftware.smackx.caps.cache.EntityCapsPersistentCache;
import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
import org.mercury_im.messenger.persistence.model.EntityCapsFeatureModel;
import org.mercury_im.messenger.persistence.model.EntityCapsIdentityModel;
import org.mercury_im.messenger.persistence.repository.EntityCapsRepository;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
import io.reactivex.functions.Consumer;
import io.reactivex.internal.observers.ConsumerSingleObserver;
import io.reactivex.schedulers.Schedulers;
public class EntityCapsStore implements EntityCapsPersistentCache {
private final EntityCapsRepository entityCapsRepository;
private final Map<String, DiscoverInfo> discoverInfoMap = new HashMap<>();
@Inject
public EntityCapsStore(EntityCapsRepository repository) {
this.entityCapsRepository = repository;
}
private void populateFromDatabase() {
discoverInfoMap.clear();
entityCapsRepository.getAllFeatures()
.subscribeOn(Schedulers.io())
.observeOn(Schedulers.computation())
.zipWith(entityCapsRepository.getAllIdentities().)
.subscribe((Consumer<List<? extends EntityCapsFeatureModel>>) features -> {
entityCapsRepository.getAllIdentities()
.subscribeOn(Schedulers.io())
.observeOn(Schedulers.computation())
.subscribe((ConsumerSingleObserver<List<? extends EntityCapsIdentityModel>>) identities -> {
for (EntityCapsFeatureModel f : features) {
DiscoverInfo di = discoverInfoMap.get(f.getNodeVer());
if (di == null) {
di = new DiscoverInfo();
discoverInfoMap.put(f.getNodeVer(), di);
}
di.addFeature(f.getVar());
}
for (EntityCapsIdentityModel i : identities) {
DiscoverInfo di = discoverInfoMap.get(i.getNodeVer());
if (di == null) {
di = new DiscoverInfo();
discoverInfoMap.put(i.getNodeVer(), di);
}
di.addIdentity(new DiscoverInfo.Identity(i.getCategory(), i.getName(), i.getType()));
}
});
});
}
@Override
public void addDiscoverInfoByNodePersistent(String nodeVer, DiscoverInfo info) {
discoverInfoMap.put(nodeVer, info);
List<EntityCapsIdentityModel> identities = new ArrayList<>();
for (DiscoverInfo.Identity i : info.getIdentities()) {
EntityCapsIdentityModel identity = entityCapsRepository.newEntityCapsIdentityModel();
identity.setCategory(i.getCategory());
identity.setType(i.getType());
identity.setName(i.getName());
identity.setLanguage(i.getLanguage());
identity.setNodeVer(info.getNode());
identities.add(identity);
}
entityCapsRepository.insertIdentities(identities);
List<EntityCapsFeatureModel> features = new ArrayList<>();
for (DiscoverInfo.Feature f : info.getFeatures()) {
EntityCapsFeatureModel feature = entityCapsRepository.newEntityCapsFeatureModel();
feature.setVar(f.getVar());
feature.setNodeVer(info.getNode());
features.add(feature);
}
entityCapsRepository.insertFeatures(features);
}
@Override
public DiscoverInfo lookup(String nodeVer) {
return discoverInfoMap.get(nodeVer);
}
@Override
public void emptyCache() {
discoverInfoMap.clear();
}
}

View file

@ -2,7 +2,7 @@
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "6f81947a36983067c387ec3ce77eb1cc",
"identityHash": "e1e6ce9276bb4e2a97b5e2bfc25272c1",
"entities": [
{
"tableName": "contacts",
@ -389,7 +389,7 @@
"notNull": true
},
{
"fieldPath": "sha1sum",
"fieldPath": "sha1Sum",
"columnName": "sha1sum",
"affinity": "TEXT",
"notNull": false
@ -438,12 +438,142 @@
]
}
]
},
{
"tableName": "caps_identities",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`pk_caps_identity_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `category` TEXT, `type` TEXT, `name` TEXT, `nodeVer` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "pk_caps_identity_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "category",
"columnName": "category",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "nodeVer",
"columnName": "nodeVer",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"pk_caps_identity_id"
],
"autoGenerate": true
},
"indices": [
{
"name": "index_caps_identities_pk_caps_identity_id",
"unique": false,
"columnNames": [
"pk_caps_identity_id"
],
"createSql": "CREATE INDEX `index_caps_identities_pk_caps_identity_id` ON `${TABLE_NAME}` (`pk_caps_identity_id`)"
},
{
"name": "index_caps_identities_nodeVer",
"unique": false,
"columnNames": [
"nodeVer"
],
"createSql": "CREATE INDEX `index_caps_identities_nodeVer` ON `${TABLE_NAME}` (`nodeVer`)"
},
{
"name": "index_caps_identities_nodeVer_category_type_name",
"unique": true,
"columnNames": [
"nodeVer",
"category",
"type",
"name"
],
"createSql": "CREATE UNIQUE INDEX `index_caps_identities_nodeVer_category_type_name` ON `${TABLE_NAME}` (`nodeVer`, `category`, `type`, `name`)"
}
],
"foreignKeys": []
},
{
"tableName": "caps_features",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`pk_caps_feature_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `var` TEXT, `nodeVer` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "pk_caps_feature_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "var",
"columnName": "var",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "nodeVer",
"columnName": "nodeVer",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"pk_caps_feature_id"
],
"autoGenerate": true
},
"indices": [
{
"name": "index_caps_features_pk_caps_feature_id",
"unique": false,
"columnNames": [
"pk_caps_feature_id"
],
"createSql": "CREATE INDEX `index_caps_features_pk_caps_feature_id` ON `${TABLE_NAME}` (`pk_caps_feature_id`)"
},
{
"name": "index_caps_features_nodeVer",
"unique": false,
"columnNames": [
"nodeVer"
],
"createSql": "CREATE INDEX `index_caps_features_nodeVer` ON `${TABLE_NAME}` (`nodeVer`)"
},
{
"name": "index_caps_features_nodeVer_var",
"unique": true,
"columnNames": [
"nodeVer",
"var"
],
"createSql": "CREATE UNIQUE INDEX `index_caps_features_nodeVer_var` ON `${TABLE_NAME}` (`nodeVer`, `var`)"
}
],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '6f81947a36983067c387ec3ce77eb1cc')"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e1e6ce9276bb4e2a97b5e2bfc25272c1')"
]
}
}

View file

@ -9,17 +9,22 @@ import androidx.room.RoomDatabase;
import androidx.room.migration.Migration;
import androidx.sqlite.db.SupportSQLiteDatabase;
import org.mercury_im.messenger.persistence.model.EntityCapsIdentityModel;
import org.mercury_im.messenger.persistence.room.dao.AccountDao;
import org.mercury_im.messenger.persistence.room.dao.AvatarDao;
import org.mercury_im.messenger.persistence.room.dao.ChatDao;
import org.mercury_im.messenger.persistence.room.dao.ContactDao;
import org.mercury_im.messenger.persistence.room.dao.ContactAttributesDao;
import org.mercury_im.messenger.persistence.room.dao.EntityCapsFeatureDao;
import org.mercury_im.messenger.persistence.room.dao.EntityCapsIdentityDao;
import org.mercury_im.messenger.persistence.room.dao.EntityDao;
import org.mercury_im.messenger.persistence.room.dao.MessageDao;
import org.mercury_im.messenger.persistence.room.model.RoomAccountModel;
import org.mercury_im.messenger.persistence.room.model.RoomAvatarModel;
import org.mercury_im.messenger.persistence.room.model.RoomChatModel;
import org.mercury_im.messenger.persistence.room.model.RoomContactAttributes;
import org.mercury_im.messenger.persistence.room.model.RoomEntityCapsFeatureModel;
import org.mercury_im.messenger.persistence.room.model.RoomEntityCapsIdentityModel;
import org.mercury_im.messenger.persistence.room.model.RoomEntityModel;
import org.mercury_im.messenger.persistence.room.model.RoomMessageModel;
@ -30,7 +35,9 @@ import org.mercury_im.messenger.persistence.room.model.RoomMessageModel;
RoomChatModel.class,
RoomMessageModel.class,
RoomEntityModel.class,
RoomAvatarModel.class
RoomAvatarModel.class,
RoomEntityCapsIdentityModel.class,
RoomEntityCapsFeatureModel.class
})
public abstract class AppDatabase extends RoomDatabase {
@ -59,4 +66,8 @@ public abstract class AppDatabase extends RoomDatabase {
public abstract ContactDao contactDao();
public abstract AvatarDao avatarDao();
public abstract EntityCapsIdentityDao capsIdentityDao();
public abstract EntityCapsFeatureDao capsFeatureDao();
}

View file

@ -7,6 +7,8 @@ import org.mercury_im.messenger.persistence.room.dao.AvatarDao;
import org.mercury_im.messenger.persistence.room.dao.ChatDao;
import org.mercury_im.messenger.persistence.room.dao.ContactDao;
import org.mercury_im.messenger.persistence.room.dao.ContactAttributesDao;
import org.mercury_im.messenger.persistence.room.dao.EntityCapsFeatureDao;
import org.mercury_im.messenger.persistence.room.dao.EntityCapsIdentityDao;
import org.mercury_im.messenger.persistence.room.dao.EntityDao;
import org.mercury_im.messenger.persistence.room.dao.MessageDao;
@ -76,4 +78,16 @@ public class RoomModule {
AvatarDao providerAvatarDao() {
return mAppDatabase.avatarDao();
}
@Singleton
@Provides
EntityCapsIdentityDao provideEntityCapsIdentityDao() {
return mAppDatabase.capsIdentityDao();
}
@Singleton
@Provides
EntityCapsFeatureDao providerEntityCapsFeatureDao() {
return mAppDatabase.capsFeatureDao();
}
}

View file

@ -1,11 +1,11 @@
package org.mercury_im.messenger.persistence.room;
import org.mercury_im.messenger.persistence.model.AccountModel;
import org.mercury_im.messenger.persistence.repository.AccountRepository;
import org.mercury_im.messenger.persistence.repository.AvatarRepository;
import org.mercury_im.messenger.persistence.repository.ChatRepository;
import org.mercury_im.messenger.persistence.repository.ContactAttributesRepository;
import org.mercury_im.messenger.persistence.repository.ContactRepository;
import org.mercury_im.messenger.persistence.repository.EntityCapsRepository;
import org.mercury_im.messenger.persistence.repository.EntityRepository;
import org.mercury_im.messenger.persistence.repository.MessageRepository;
import org.mercury_im.messenger.persistence.room.dao.AccountDao;
@ -13,6 +13,8 @@ import org.mercury_im.messenger.persistence.room.dao.AvatarDao;
import org.mercury_im.messenger.persistence.room.dao.ChatDao;
import org.mercury_im.messenger.persistence.room.dao.ContactAttributesDao;
import org.mercury_im.messenger.persistence.room.dao.ContactDao;
import org.mercury_im.messenger.persistence.room.dao.EntityCapsFeatureDao;
import org.mercury_im.messenger.persistence.room.dao.EntityCapsIdentityDao;
import org.mercury_im.messenger.persistence.room.dao.EntityDao;
import org.mercury_im.messenger.persistence.room.dao.MessageDao;
import org.mercury_im.messenger.persistence.room.repository.IAccountRepository;
@ -20,6 +22,7 @@ import org.mercury_im.messenger.persistence.room.repository.IAvatarRepository;
import org.mercury_im.messenger.persistence.room.repository.IChatRepository;
import org.mercury_im.messenger.persistence.room.repository.IContactAttributesRepository;
import org.mercury_im.messenger.persistence.room.repository.IContactRepository;
import org.mercury_im.messenger.persistence.room.repository.IEntityCapsRepository;
import org.mercury_im.messenger.persistence.room.repository.IEntityRepository;
import org.mercury_im.messenger.persistence.room.repository.IMessageRepository;
@ -72,4 +75,11 @@ public class RoomRepositoryModule {
AvatarRepository provideAvatarRepository(AvatarDao avatarDao) {
return new IAvatarRepository(avatarDao);
}
@Singleton
@Provides
EntityCapsRepository providerEntityCapsRepository(EntityCapsIdentityDao identityDao,
EntityCapsFeatureDao featureDao) {
return new IEntityCapsRepository(identityDao, featureDao);
}
}

View file

@ -0,0 +1,26 @@
package org.mercury_im.messenger.persistence.room.dao;
import androidx.annotation.WorkerThread;
import androidx.room.Dao;
import androidx.room.Insert;
import androidx.room.Query;
import org.mercury_im.messenger.persistence.room.model.RoomEntityCapsFeatureModel;
import java.util.List;
import io.reactivex.Completable;
import io.reactivex.Single;
import static androidx.room.OnConflictStrategy.IGNORE;
@Dao
@WorkerThread
public interface EntityCapsFeatureDao extends BaseDao<RoomEntityCapsFeatureModel> {
@Query("SELECT * FROM caps_features ORDER BY nodeVer")
Single<List<RoomEntityCapsFeatureModel>> getAllFeatures();
@Insert(onConflict = IGNORE)
Completable insert(List<RoomEntityCapsFeatureModel> features);
}

View file

@ -0,0 +1,26 @@
package org.mercury_im.messenger.persistence.room.dao;
import androidx.annotation.WorkerThread;
import androidx.room.Dao;
import androidx.room.Insert;
import androidx.room.Query;
import org.mercury_im.messenger.persistence.room.model.RoomEntityCapsIdentityModel;
import java.util.List;
import io.reactivex.Completable;
import io.reactivex.Single;
import static androidx.room.OnConflictStrategy.IGNORE;
@Dao
@WorkerThread
public interface EntityCapsIdentityDao extends BaseDao<RoomEntityCapsIdentityModel> {
@Query("SELECT * FROM caps_identities ORDER BY nodeVer")
Single<List<RoomEntityCapsIdentityModel>> getAllIdentities();
@Insert(onConflict = IGNORE)
Completable insert(List<RoomEntityCapsIdentityModel> identities);
}

View file

@ -0,0 +1,70 @@
package org.mercury_im.messenger.persistence.room.model;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.Index;
import androidx.room.PrimaryKey;
import org.mercury_im.messenger.persistence.model.EntityCapsFeatureModel;
import static org.mercury_im.messenger.persistence.room.model.RoomEntityCapsFeatureModel.KEY_ID;
import static org.mercury_im.messenger.persistence.room.model.RoomEntityCapsFeatureModel.KEY_NODE_VER;
import static org.mercury_im.messenger.persistence.room.model.RoomEntityCapsFeatureModel.KEY_VAR;
import static org.mercury_im.messenger.persistence.room.model.RoomEntityCapsFeatureModel.TABLE;
@Entity(tableName = TABLE,
indices = {
@Index(KEY_ID),
@Index(KEY_NODE_VER),
@Index(value = {
KEY_NODE_VER,
KEY_VAR},
unique = true)
})
public class RoomEntityCapsFeatureModel implements EntityCapsFeatureModel {
public static final String TABLE = "caps_features";
public static final String KEY_ID ="pk_caps_feature_id";
public static final String KEY_VAR = "var";
public static final String KEY_NODE_VER = "nodeVer";
@PrimaryKey(autoGenerate = true)
@ColumnInfo(name = KEY_ID)
private long id;
@ColumnInfo(name = KEY_VAR)
private String var;
@ColumnInfo(name = KEY_NODE_VER)
private String nodeVer;
@Override
public long getId() {
return id;
}
@Override
public void setId(long id) {
this.id = id;
}
@Override
public String getVar() {
return var;
}
@Override
public void setVar(String var) {
this.var = var;
}
@Override
public String getNodeVer() {
return nodeVer;
}
@Override
public void setNodeVer(String nodeVer) {
this.nodeVer = nodeVer;
}
}

View file

@ -0,0 +1,103 @@
package org.mercury_im.messenger.persistence.room.model;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.Index;
import androidx.room.PrimaryKey;
import org.mercury_im.messenger.persistence.model.EntityCapsIdentityModel;
import static org.mercury_im.messenger.persistence.room.model.RoomEntityCapsIdentityModel.KEY_CATEGORY;
import static org.mercury_im.messenger.persistence.room.model.RoomEntityCapsIdentityModel.KEY_ID;
import static org.mercury_im.messenger.persistence.room.model.RoomEntityCapsIdentityModel.KEY_NAME;
import static org.mercury_im.messenger.persistence.room.model.RoomEntityCapsIdentityModel.KEY_NODE_VER;
import static org.mercury_im.messenger.persistence.room.model.RoomEntityCapsIdentityModel.KEY_TYPE;
import static org.mercury_im.messenger.persistence.room.model.RoomEntityCapsIdentityModel.TABLE;
@Entity(tableName = TABLE,
indices = {
@Index(KEY_ID),
@Index(KEY_NODE_VER),
@Index(value = {
KEY_NODE_VER,
KEY_CATEGORY,
KEY_TYPE,
KEY_NAME},
unique = true)
})
public class RoomEntityCapsIdentityModel implements EntityCapsIdentityModel {
public static final String TABLE = "caps_identities";
public static final String KEY_ID = "pk_caps_identity_id";
public static final String KEY_CATEGORY = "category";
public static final String KEY_TYPE = "type";
public static final String KEY_NAME = "name";
public static final String KEY_NODE_VER = "nodeVer";
@PrimaryKey(autoGenerate = true)
@ColumnInfo(name = KEY_ID)
private long id;
@ColumnInfo(name = KEY_CATEGORY)
private String category;
@ColumnInfo(name = KEY_TYPE)
private String type;
@ColumnInfo(name = KEY_NAME)
private String name;
@ColumnInfo(name = KEY_NODE_VER)
private String nodeVer;
@Override
public long getId() {
return id;
}
@Override
public void setId(long id) {
this.id = id;
}
@Override
public String getCategory() {
return category;
}
@Override
public void setCategory(String category) {
this.category = category;
}
@Override
public String getType() {
return type;
}
@Override
public void setType(String type) {
this.type = type;
}
@Override
public String getName() {
return name;
}
@Override
public void setName(String name) {
this.name = name;
}
@Override
public String getNodeVer() {
return nodeVer;
}
@Override
public void setNodeVer(String nodeVer) {
this.nodeVer = nodeVer;
}
}

View file

@ -0,0 +1,59 @@
package org.mercury_im.messenger.persistence.room.repository;
import org.mercury_im.messenger.persistence.repository.EntityCapsRepository;
import org.mercury_im.messenger.persistence.room.dao.EntityCapsFeatureDao;
import org.mercury_im.messenger.persistence.room.dao.EntityCapsIdentityDao;
import org.mercury_im.messenger.persistence.room.model.RoomEntityCapsFeatureModel;
import org.mercury_im.messenger.persistence.room.model.RoomEntityCapsIdentityModel;
import java.util.List;
import javax.inject.Inject;
import io.reactivex.Completable;
import io.reactivex.Single;
public class IEntityCapsRepository implements EntityCapsRepository<RoomEntityCapsIdentityModel,
RoomEntityCapsFeatureModel> {
private final EntityCapsIdentityDao identityDao;
private final EntityCapsFeatureDao featureDao;
@Inject
public IEntityCapsRepository(EntityCapsIdentityDao identityDao,
EntityCapsFeatureDao featureDao) {
this.identityDao = identityDao;
this.featureDao = featureDao;
}
@Override
public RoomEntityCapsIdentityModel newEntityCapsIdentityModel() {
return new RoomEntityCapsIdentityModel();
}
@Override
public RoomEntityCapsFeatureModel newEntityCapsFeatureModel() {
return new RoomEntityCapsFeatureModel();
}
@Override
public Single<List<RoomEntityCapsFeatureModel>> getAllFeatures() {
return featureDao.getAllFeatures();
}
@Override
public Completable insertFeatures(List<RoomEntityCapsFeatureModel> features) {
return featureDao.insert(features);
}
@Override
public Single<List<RoomEntityCapsIdentityModel>> getAllIdentities() {
return identityDao.getAllIdentities();
}
@Override
public Completable insertIdentities(List<RoomEntityCapsIdentityModel> identities) {
return identityDao.insert(identities);
}
}

View file

@ -0,0 +1,16 @@
package org.mercury_im.messenger.persistence.model;
public interface EntityCapsFeatureModel {
long getId();
void setId(long id);
String getVar();
void setVar(String var);
String getNodeVer();
void setNodeVer(String nodeVer);
}

View file

@ -0,0 +1,28 @@
package org.mercury_im.messenger.persistence.model;
public interface EntityCapsIdentityModel {
long getId();
void setId(long id);
String getCategory();
void setCategory(String category);
String getType();
void setType(String type);
String getName();
void setName(String name);
String getLanguage();
void setLanguage(String lang);
String getNodeVer();
void setNodeVer(String nodeVer);
}

View file

@ -0,0 +1,26 @@
package org.mercury_im.messenger.persistence.repository;
import org.mercury_im.messenger.persistence.model.EntityCapsFeatureModel;
import org.mercury_im.messenger.persistence.model.EntityCapsIdentityModel;
import java.util.List;
import io.reactivex.Completable;
import io.reactivex.Single;
public interface EntityCapsRepository<
I extends EntityCapsIdentityModel,
F extends EntityCapsFeatureModel> {
I newEntityCapsIdentityModel();
F newEntityCapsFeatureModel();
Single<List<F>> getAllFeatures();
Completable insertFeatures(List<F> features);
Single<List<I>> getAllIdentities();
Completable insertIdentities(List<I> identities);
}