narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

take btbv setting into account when deciding default trust

Browse source
This commit is contained in:
Daniel Gultsch 2023-03-01 09:19:48 +01:00
parent 1a924d3efd
commit 303f14200f
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
6 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/androidTest/java/im/conversations/android/xmpp/MessageTransformationTest.java
View file

@ -55,7 +55,8 @@ public class MessageTransformationTest {
final long id = database.accountDao().insert(account); final long id = database.accountDao().insert(account);
this.transformer = this.transformer =
new Transformer(database.accountDao().getEnabledAccount(id).get(), database); new Transformer(
database.accountDao().getEnabledAccount(id).get(), context, database);
} }
@Test @Test

2
app/src/main/java/im/conversations/android/AppSettings.java
View file

@ -36,7 +36,7 @@ public class AppSettings {
.apply(); .apply();
} }
public boolean isBtbv() { public boolean isBTBVEnabled() {
final SharedPreferences sharedPreferences = final SharedPreferences sharedPreferences =
PreferenceManager.getDefaultSharedPreferences(context); PreferenceManager.getDefaultSharedPreferences(context);
return sharedPreferences.getBoolean( return sharedPreferences.getBoolean(

8
app/src/main/java/im/conversations/android/axolotl/AxolotlService.java
View file

@ -1,5 +1,6 @@
package im.conversations.android.axolotl; package im.conversations.android.axolotl;
import android.content.Context;
import android.os.Build; import android.os.Build;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ArrayListMultimap;
@ -62,9 +63,12 @@ public class AxolotlService extends AbstractAccountService {
private final Multimap<BareJid, Integer> devicesNotInPep = ArrayListMultimap.create(); private final Multimap<BareJid, Integer> devicesNotInPep = ArrayListMultimap.create();
public AxolotlService( public AxolotlService(
final Account account, final ConversationsDatabase conversationsDatabase) { final Account account,
final Context context,
final ConversationsDatabase conversationsDatabase) {
super(account, conversationsDatabase); super(account, conversationsDatabase);
this.signalProtocolStore = new AxolotlDatabaseStore(account, conversationsDatabase); this.signalProtocolStore =
new AxolotlDatabaseStore(account, context, conversationsDatabase);
} }
public void setPostDecryptionHook(final PostDecryptionHook postDecryptionHook) { public void setPostDecryptionHook(final PostDecryptionHook postDecryptionHook) {

11
app/src/main/java/im/conversations/android/database/AxolotlDatabaseStore.java
View file

@ -1,6 +1,8 @@
package im.conversations.android.database; package im.conversations.android.database;
import android.content.Context;
import im.conversations.android.AbstractAccountService; import im.conversations.android.AbstractAccountService;
import im.conversations.android.AppSettings;
import im.conversations.android.axolotl.AxolotlAddress; import im.conversations.android.axolotl.AxolotlAddress;
import im.conversations.android.database.dao.AxolotlDao; import im.conversations.android.database.dao.AxolotlDao;
import im.conversations.android.database.model.Account; import im.conversations.android.database.model.Account;
@ -17,9 +19,14 @@ import org.whispersystems.libsignal.state.SignedPreKeyRecord;
public class AxolotlDatabaseStore extends AbstractAccountService implements SignalProtocolStore { public class AxolotlDatabaseStore extends AbstractAccountService implements SignalProtocolStore {
private AppSettings appSettings;
public AxolotlDatabaseStore( public AxolotlDatabaseStore(
final Account account, final ConversationsDatabase conversationsDatabase) { final Account account,
final Context context,
final ConversationsDatabase conversationsDatabase) {
super(account, conversationsDatabase); super(account, conversationsDatabase);
this.appSettings = new AppSettings(context);
} }
private AxolotlDao axolotlDao() { private AxolotlDao axolotlDao() {
@ -40,7 +47,7 @@ public class AxolotlDatabaseStore extends AbstractAccountService implements Sign
public boolean saveIdentity( public boolean saveIdentity(
final SignalProtocolAddress signalProtocolAddress, final IdentityKey identityKey) { final SignalProtocolAddress signalProtocolAddress, final IdentityKey identityKey) {
final var address = AxolotlAddress.cast(signalProtocolAddress); final var address = AxolotlAddress.cast(signalProtocolAddress);
final boolean isBTBVEnabled = true; final boolean isBTBVEnabled = appSettings.isBTBVEnabled();
return database.runInTransaction( return database.runInTransaction(
() -> { () -> {
final Trust trust; final Trust trust;

11
app/src/main/java/im/conversations/android/transformer/Transformer.java
View file

@ -1,5 +1,6 @@
package im.conversations.android.transformer; package im.conversations.android.transformer;
import android.content.Context;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import im.conversations.android.axolotl.AxolotlDecryptionException; import im.conversations.android.axolotl.AxolotlDecryptionException;
import im.conversations.android.axolotl.AxolotlService; import im.conversations.android.axolotl.AxolotlService;
@ -32,8 +33,14 @@ public class Transformer {
private final AxolotlService axolotlService; private final AxolotlService axolotlService;
public Transformer(final Account account, final ConversationsDatabase conversationsDatabase) { public Transformer(
this(account, conversationsDatabase, new AxolotlService(account, conversationsDatabase)); final Account account,
final Context context,
final ConversationsDatabase conversationsDatabase) {
this(
account,
conversationsDatabase,
new AxolotlService(account, context, conversationsDatabase));
} }
public Transformer( public Transformer(

4
app/src/main/java/im/conversations/android/xmpp/manager/AxolotlManager.java
View file

@ -67,7 +67,9 @@ public class AxolotlManager extends AbstractManager implements AxolotlService.Po
super(context, connection); super(context, connection);
this.axolotlService = this.axolotlService =
new AxolotlService( new AxolotlService(
connection.getAccount(), ConversationsDatabase.getInstance(context)); connection.getAccount(),
context,
ConversationsDatabase.getInstance(context));
this.axolotlService.setPostDecryptionHook(this); this.axolotlService.setPostDecryptionHook(this);
} }