Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix dynamic language override for app context.

Browse Source 
Fixes #11889
This commit is contained in:
Rashad Sookram
2022-01-19 14:49:30 -05:00
committed by Greyson Parrelli
parent ab34a9b027
commit fd6a2c6b10
25 changed files with 76 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.database;
import android.app.Application;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import androidx.annotation.NonNull;
@@ -46,9 +47,9 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
private static volatile KeyValueDatabase instance;
private final Application application;
private final Context application;
public static @NonNull KeyValueDatabase getInstance(@NonNull Application context) {
public static @NonNull KeyValueDatabase getInstance(@NonNull Context context) {
if (instance == null) {
synchronized (KeyValueDatabase.class) {
if (instance == null) {
@@ -60,7 +61,7 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
return instance;
}
private KeyValueDatabase(@NonNull Application application, @NonNull DatabaseSecret databaseSecret) {
private KeyValueDatabase(@NonNull Context application, @NonNull DatabaseSecret databaseSecret) {
super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0,new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook());
this.application = application;

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

@@ -1,8 +1,8 @@
package org.thoughtcrime.securesms.database
import android.annotation.SuppressLint
import android.app.Application
import android.content.ContentValues
import android.content.Context
import net.zetetic.database.sqlcipher.SQLiteDatabase
import net.zetetic.database.sqlcipher.SQLiteOpenHelper
import org.signal.core.util.logging.Log
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit
* This is it's own separate physical database, so it cannot do joins or queries with any other tables.
*/
class LocalMetricsDatabase private constructor(
application: Application,
application: Context,
databaseSecret: DatabaseSecret
) :
SQLiteOpenHelper(
@@ -77,7 +77,7 @@ class LocalMetricsDatabase private constructor(
private var instance: LocalMetricsDatabase? = null
@JvmStatic
fun getInstance(context: Application): LocalMetricsDatabase {
fun getInstance(context: Context): LocalMetricsDatabase {
if (instance == null) {
synchronized(LocalMetricsDatabase::class.java) {
if (instance == null) {

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

@@ -1,8 +1,8 @@
package org.thoughtcrime.securesms.database
import android.annotation.SuppressLint
import android.app.Application
import android.content.ContentValues
import android.content.Context
import android.database.Cursor
import net.zetetic.database.sqlcipher.SQLiteDatabase
import net.zetetic.database.sqlcipher.SQLiteOpenHelper
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit
* This is it's own separate physical database, so it cannot do joins or queries with any other tables.
*/
class LogDatabase private constructor(
application: Application,
application: Context,
databaseSecret: DatabaseSecret
) :
SQLiteOpenHelper(
@@ -78,7 +78,7 @@ class LogDatabase private constructor(
private var instance: LogDatabase? = null
@JvmStatic
fun getInstance(context: Application): LogDatabase {
fun getInstance(context: Context): LogDatabase {
if (instance == null) {
synchronized(LogDatabase::class.java) {
if (instance == null) {