Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix kotlin compiler warnings.

Browse Source
This commit is contained in:
Cody Henthorne
2021-09-16 11:45:50 -04:00
committed by Alex Hart
parent 8984b763fb
commit 3761859681
44 changed files with 96 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java
View File

@@ -238,7 +238,7 @@ public class DatabaseFactory {
}
private DatabaseFactory(@NonNull Context context) {
SqlCipherLibraryLoader.load(context);
SqlCipherLibraryLoader.load();
DatabaseSecret databaseSecret = DatabaseSecretProvider.getOrCreateDatabaseSecret(context);
AttachmentSecret attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret();

2
app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
View File

@@ -95,7 +95,7 @@ public class JobDatabase extends SQLiteOpenHelper implements SignalDatabase {
if (instance == null) {
synchronized (JobDatabase.class) {
if (instance == null) {
SqlCipherLibraryLoader.load(context);
SqlCipherLibraryLoader.load();
instance = new JobDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
}
}

2
app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
View File

@@ -53,7 +53,7 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
if (instance == null) {
synchronized (KeyValueDatabase.class) {
if (instance == null) {
SqlCipherLibraryLoader.load(context);
SqlCipherLibraryLoader.load();
instance = new KeyValueDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
}
}

4
app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt
View File

@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit
*/
class LocalMetricsDatabase private constructor(
application: Application,
private val databaseSecret: DatabaseSecret
databaseSecret: DatabaseSecret
) : SQLiteOpenHelper(
application,
DATABASE_NAME,
@@ -80,7 +80,7 @@ class LocalMetricsDatabase private constructor(
if (instance == null) {
synchronized(LocalMetricsDatabase::class.java) {
if (instance == null) {
SqlCipherLibraryLoader.load(context)
SqlCipherLibraryLoader.load()
instance = LocalMetricsDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context))
}
}

4
app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt
View File

@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit
*/
class LogDatabase private constructor(
application: Application,
private val databaseSecret: DatabaseSecret
databaseSecret: DatabaseSecret
) : SQLiteOpenHelper(
application,
DATABASE_NAME,
@@ -81,7 +81,7 @@ class LogDatabase private constructor(
if (instance == null) {
synchronized(LogDatabase::class.java) {
if (instance == null) {
SqlCipherLibraryLoader.load(context)
SqlCipherLibraryLoader.load()
instance = LogDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context))
}
}

2
app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java
View File

@@ -56,7 +56,7 @@ public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabas
if (instance == null) {
synchronized (MegaphoneDatabase.class) {
if (instance == null) {
SqlCipherLibraryLoader.load(context);
SqlCipherLibraryLoader.load();
instance = new MegaphoneDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
}
}

4
app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherLibraryLoader.kt
View File

@@ -1,7 +1,5 @@
package org.thoughtcrime.securesms.database
import android.content.Context
/**
* A simple wrapper to load SQLCipher libs exactly once. The exact entry point of database access is non-deterministic because content providers run before
* Application#onCreate().
@@ -14,7 +12,7 @@ class SqlCipherLibraryLoader {
private val LOCK = Object()
@JvmStatic
fun load(context: Context) {
fun load() {
if (!loaded) {
synchronized(LOCK) {
if (!loaded) {