mirror of
https://github.com/M66B/FairEmail.git
synced 2026-01-04 03:43:55 +01:00
Added certificate table
This commit is contained in:
1975
app/schemas/eu.faircode.email.DB/117.json
Normal file
1975
app/schemas/eu.faircode.email.DB/117.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -56,7 +56,7 @@ import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory;
|
||||
// https://developer.android.com/topic/libraries/architecture/room.html
|
||||
|
||||
@Database(
|
||||
version = 116,
|
||||
version = 117,
|
||||
entities = {
|
||||
EntityIdentity.class,
|
||||
EntityAccount.class,
|
||||
@@ -65,6 +65,7 @@ import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory;
|
||||
EntityAttachment.class,
|
||||
EntityOperation.class,
|
||||
EntityContact.class,
|
||||
EntityCertificate.class,
|
||||
EntityAnswer.class,
|
||||
EntityRule.class,
|
||||
EntityLog.class
|
||||
@@ -89,6 +90,8 @@ public abstract class DB extends RoomDatabase {
|
||||
|
||||
public abstract DaoContact contact();
|
||||
|
||||
public abstract DaoCertificate certificate();
|
||||
|
||||
public abstract DaoAnswer answer();
|
||||
|
||||
public abstract DaoRule rule();
|
||||
@@ -1095,7 +1098,7 @@ public abstract class DB extends RoomDatabase {
|
||||
", `message` INTEGER NOT NULL" +
|
||||
", `sequence` INTEGER NOT NULL" +
|
||||
", `reference` INTEGER NOT NULL" +
|
||||
", FOREIGN KEY(`message`) REFERENCES `message`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )");
|
||||
", FOREIGN KEY(`message`) REFERENCES `message`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE)");
|
||||
db.execSQL("CREATE INDEX IF NOT EXISTS `index_revision_message` ON `revision` (`message`)");
|
||||
db.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS `index_revision_message_sequence` ON `revision` (`message`, `sequence`)");
|
||||
}
|
||||
@@ -1124,6 +1127,19 @@ public abstract class DB extends RoomDatabase {
|
||||
db.execSQL("ALTER TABLE `account` ADD COLUMN `use_date` INTEGER NOT NULL DEFAULT 0");
|
||||
}
|
||||
})
|
||||
.addMigrations(new Migration(116, 117) {
|
||||
@Override
|
||||
public void migrate(@NonNull SupportSQLiteDatabase db) {
|
||||
Log.i("DB migration from version " + startVersion + " to " + endVersion);
|
||||
db.execSQL("CREATE TABLE IF NOT EXISTS `certificate`" +
|
||||
" (`id` INTEGER PRIMARY KEY AUTOINCREMENT" +
|
||||
", `subject` TEXT NOT NULL" +
|
||||
", `email` TEXT" +
|
||||
", `data` TEXT NOT NULL)");
|
||||
db.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS `index_certificate_subject` ON `certificate` (`subject`)");
|
||||
db.execSQL("CREATE INDEX IF NOT EXISTS `index_certificate_email` ON `certificate` (`email`)");
|
||||
}
|
||||
})
|
||||
.build();
|
||||
}
|
||||
|
||||
|
||||
41
app/src/main/java/eu/faircode/email/DaoCertificate.java
Normal file
41
app/src/main/java/eu/faircode/email/DaoCertificate.java
Normal file
@@ -0,0 +1,41 @@
|
||||
package eu.faircode.email;
|
||||
|
||||
/*
|
||||
This file is part of FairEmail.
|
||||
|
||||
FairEmail is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
FairEmail is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with FairEmail. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Copyright 2018-2019 by Marcel Bokhorst (M66B)
|
||||
*/
|
||||
|
||||
import androidx.lifecycle.LiveData;
|
||||
import androidx.room.Dao;
|
||||
import androidx.room.Insert;
|
||||
import androidx.room.Query;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Dao
|
||||
public interface DaoCertificate {
|
||||
@Query("SELECT * FROM certificate" +
|
||||
" ORDER BY subject DESC")
|
||||
LiveData<List<EntityCertificate>> liveCertificates();
|
||||
|
||||
@Query("SELECT * FROM certificate" +
|
||||
" WHERE subject = :subject")
|
||||
EntityCertificate getCertificate(String subject);
|
||||
|
||||
@Insert
|
||||
long insertCertificate(EntityCertificate certificate);
|
||||
}
|
||||
59
app/src/main/java/eu/faircode/email/EntityCertificate.java
Normal file
59
app/src/main/java/eu/faircode/email/EntityCertificate.java
Normal file
@@ -0,0 +1,59 @@
|
||||
package eu.faircode.email;
|
||||
|
||||
/*
|
||||
This file is part of FairEmail.
|
||||
|
||||
FairEmail is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
FairEmail is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with FairEmail. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Copyright 2018-2019 by Marcel Bokhorst (M66B)
|
||||
*/
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.room.Entity;
|
||||
import androidx.room.Index;
|
||||
import androidx.room.PrimaryKey;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
@Entity(
|
||||
tableName = EntityCertificate.TABLE_NAME,
|
||||
foreignKeys = {
|
||||
},
|
||||
indices = {
|
||||
@Index(value = {"subject"}, unique = true),
|
||||
@Index(value = {"email"}),
|
||||
}
|
||||
)
|
||||
public class EntityCertificate {
|
||||
static final String TABLE_NAME = "certificate";
|
||||
|
||||
@PrimaryKey(autoGenerate = true)
|
||||
public Long id;
|
||||
@NonNull
|
||||
public String subject;
|
||||
public String email;
|
||||
@NonNull
|
||||
public String data;
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (obj instanceof EntityCertificate) {
|
||||
EntityCertificate other = (EntityCertificate) obj;
|
||||
return (this.subject.equals(other.subject) &&
|
||||
Objects.equals(this.email, other.email) &&
|
||||
this.data.equals(other.data));
|
||||
} else
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user