Skip to content

Commit 75344b1

Browse files
ThomasSessionThomasSession
committed
Removed emoji search db
1 parent 3ab9fed commit 75344b1

File tree

6 files changed

+33
-176
lines changed

6 files changed

+33
-176
lines changed

‎app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,15 @@ import org.session.libsession.utilities.Toaster
6363
import org.session.libsession.utilities.UsernameUtils
6464
import org.session.libsession.utilities.WindowDebouncer
6565
import org.session.libsignal.utilities.HTTP.isConnectedToNetwork
66-
import org.session.libsignal.utilities.JsonUtil
6766
import org.session.libsignal.utilities.Log
6867
import org.session.libsignal.utilities.ThreadUtils.queue
6968
import org.signal.aesgcmprovider.AesGcmProvider
7069
import org.thoughtcrime.securesms.AppContext.configureKovenant
7170
import org.thoughtcrime.securesms.components.TypingStatusSender
7271
import org.thoughtcrime.securesms.configs.ConfigUploader
73-
import org.thoughtcrime.securesms.database.EmojiSearchDatabase
7472
import org.thoughtcrime.securesms.database.LastSentTimestampCache
7573
import org.thoughtcrime.securesms.database.LokiAPIDatabase
7674
import org.thoughtcrime.securesms.database.Storage
77-
import org.thoughtcrime.securesms.database.model.EmojiSearchData
7875
import org.thoughtcrime.securesms.debugmenu.DebugActivity
7976
import org.thoughtcrime.securesms.dependencies.AppComponent
8077
import org.thoughtcrime.securesms.dependencies.ConfigFactory
@@ -107,11 +104,8 @@ import org.thoughtcrime.securesms.webrtc.CallMessageProcessor
107104
import org.thoughtcrime.securesms.webrtc.WebRtcCallBridge
108105
import org.webrtc.PeerConnectionFactory
109106
import org.webrtc.PeerConnectionFactory.InitializationOptions
110-
import java.io.IOException
111107
import java.security.Security
112-
import java.util.Arrays
113108
import java.util.Timer
114-
import java.util.concurrent.Executors
115109
import javax.inject.Inject
116110
import kotlin.concurrent.Volatile
117111

@@ -182,7 +176,6 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
182176

183177
@Inject lateinit var messageNotifierLazy: Lazy<MessageNotifier>
184178
@Inject lateinit var apiDB: LokiAPIDatabase
185-
@Inject lateinit var emojiSearchDb: EmojiSearchDatabase
186179
@Inject lateinit var webRtcCallBridge: WebRtcCallBridge
187180
@Inject lateinit var legacyClosedGroupPollerV2: LegacyClosedGroupPollerV2
188181
@Inject lateinit var legacyGroupDeprecationManager: LegacyGroupDeprecationManager
@@ -299,7 +292,6 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
299292
initializeWebRtc()
300293
initializeBlobProvider()
301294
resubmitProfilePictureIfNeeded()
302-
loadEmojiSearchIndexIfNeeded()
303295

304296
val networkConstraint = NetworkConstraint.Factory(this).create()
305297
isConnectedToNetwork = { networkConstraint.isMet }
@@ -461,29 +453,7 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
461453
private fun resubmitProfilePictureIfNeeded() {
462454
resubmitProfilePictureIfNeeded(this)
463455
}
464-
465-
private fun loadEmojiSearchIndexIfNeeded() {
466-
Executors.newSingleThreadExecutor().execute {
467-
if (emojiSearchDb.query("face", 1).isEmpty()) {
468-
try {
469-
assets.open("emoji/emoji_search_index.json").use { inputStream ->
470-
val searchIndex = Arrays.asList(
471-
*JsonUtil.fromJson(
472-
inputStream,
473-
Array<EmojiSearchData>::class.java
474-
)
475-
)
476-
emojiSearchDb.setSearchIndex(searchIndex)
477-
}
478-
} catch (e: IOException) {
479-
Log.e(
480-
"Loki",
481-
"Failed to load emoji search index"
482-
)
483-
}
484-
}
485-
}
486-
} // endregion
456+
// endregion
487457

488458
companion object {
489459
const val PREFERENCES_NAME: String = "SecureSMS-Preferences"

‎app/src/main/java/org/thoughtcrime/securesms/database/EmojiSearchDatabase.kt

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,24 @@
66
import android.app.NotificationManager;
77
import android.content.Context;
88
import android.database.Cursor;
9+
910
import androidx.annotation.NonNull;
1011
import androidx.core.app.NotificationCompat;
12+
1113
import com.squareup.phrase.Phrase;
12-
import java.io.File;
14+
1315
import net.zetetic.database.sqlcipher.SQLiteConnection;
1416
import net.zetetic.database.sqlcipher.SQLiteDatabase;
1517
import net.zetetic.database.sqlcipher.SQLiteDatabaseHook;
1618
import net.zetetic.database.sqlcipher.SQLiteOpenHelper;
17-
import network.loki.messenger.R;
19+
1820
import org.session.libsession.utilities.TextSecurePreferences;
1921
import org.session.libsignal.utilities.Log;
2022
import org.thoughtcrime.securesms.crypto.DatabaseSecret;
2123
import org.thoughtcrime.securesms.database.AttachmentDatabase;
2224
import org.thoughtcrime.securesms.database.BlindedIdMappingDatabase;
2325
import org.thoughtcrime.securesms.database.ConfigDatabase;
2426
import org.thoughtcrime.securesms.database.DraftDatabase;
25-
import org.thoughtcrime.securesms.database.EmojiSearchDatabase;
2627
import org.thoughtcrime.securesms.database.ExpirationConfigurationDatabase;
2728
import org.thoughtcrime.securesms.database.GroupDatabase;
2829
import org.thoughtcrime.securesms.database.GroupMemberDatabase;
@@ -43,6 +44,10 @@
4344
import org.thoughtcrime.securesms.database.ThreadDatabase;
4445
import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities;
4546

47+
import java.io.File;
48+
49+
import network.loki.messenger.R;
50+
4651
public class SQLCipherOpenHelper extends SQLiteOpenHelper {
4752

4853
@SuppressWarnings("unused")
@@ -343,7 +348,6 @@ public void onCreate(SQLiteDatabase db) {
343348
db.execSQL(BlindedIdMappingDatabase.CREATE_BLINDED_ID_MAPPING_TABLE_COMMAND);
344349
db.execSQL(GroupMemberDatabase.CREATE_GROUP_MEMBER_TABLE_COMMAND);
345350
db.execSQL(LokiAPIDatabase.RESET_SEQ_NO); // probably not needed but consistent with all migrations
346-
db.execSQL(EmojiSearchDatabase.CREATE_EMOJI_SEARCH_TABLE_COMMAND);
347351
db.execSQL(ReactionDatabase.CREATE_REACTION_TABLE_COMMAND);
348352
db.execSQL(ThreadDatabase.getUnreadMentionCountCommand());
349353
db.execSQL(SmsDatabase.CREATE_HAS_MENTION_COMMAND);
@@ -589,10 +593,6 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
589593
executeStatements(db, ReactionDatabase.CREATE_REACTION_TRIGGERS);
590594
}
591595

592-
if (oldVersion < lokiV38) {
593-
db.execSQL(EmojiSearchDatabase.CREATE_EMOJI_SEARCH_TABLE_COMMAND);
594-
}
595-
596596
if (oldVersion < lokiV39) {
597597
executeStatements(db, ReactionDatabase.CREATE_INDEXS);
598598
}

‎app/src/main/java/org/thoughtcrime/securesms/database/model/EmojiSearchData.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseComponent.kt

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,32 @@ import dagger.hilt.EntryPoint
55
import dagger.hilt.InstallIn
66
import dagger.hilt.components.SingletonComponent
77
import org.session.libsession.database.MessageDataProvider
8-
import org.session.libsession.database.StorageProtocol
98
import org.thoughtcrime.securesms.ApplicationContext
10-
import org.thoughtcrime.securesms.database.*
9+
import org.thoughtcrime.securesms.database.AttachmentDatabase
10+
import org.thoughtcrime.securesms.database.BlindedIdMappingDatabase
11+
import org.thoughtcrime.securesms.database.ConfigDatabase
12+
import org.thoughtcrime.securesms.database.DraftDatabase
13+
import org.thoughtcrime.securesms.database.ExpirationConfigurationDatabase
14+
import org.thoughtcrime.securesms.database.GroupDatabase
15+
import org.thoughtcrime.securesms.database.GroupMemberDatabase
16+
import org.thoughtcrime.securesms.database.GroupReceiptDatabase
17+
import org.thoughtcrime.securesms.database.LokiAPIDatabase
18+
import org.thoughtcrime.securesms.database.LokiBackupFilesDatabase
19+
import org.thoughtcrime.securesms.database.LokiMessageDatabase
20+
import org.thoughtcrime.securesms.database.LokiThreadDatabase
21+
import org.thoughtcrime.securesms.database.LokiUserDatabase
22+
import org.thoughtcrime.securesms.database.MediaDatabase
23+
import org.thoughtcrime.securesms.database.MmsDatabase
1124
import org.thoughtcrime.securesms.database.MmsSmsDatabase
25+
import org.thoughtcrime.securesms.database.PushDatabase
26+
import org.thoughtcrime.securesms.database.ReactionDatabase
27+
import org.thoughtcrime.securesms.database.RecipientDatabase
28+
import org.thoughtcrime.securesms.database.SearchDatabase
29+
import org.thoughtcrime.securesms.database.SessionContactDatabase
30+
import org.thoughtcrime.securesms.database.SessionJobDatabase
31+
import org.thoughtcrime.securesms.database.SmsDatabase
32+
import org.thoughtcrime.securesms.database.Storage
33+
import org.thoughtcrime.securesms.database.ThreadDatabase
1234
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
1335

1436
@EntryPoint
@@ -43,7 +65,6 @@ interface DatabaseComponent {
4365
fun sessionJobDatabase(): SessionJobDatabase
4466
fun sessionContactDatabase(): SessionContactDatabase
4567
fun reactionDatabase(): ReactionDatabase
46-
fun emojiSearchDatabase(): EmojiSearchDatabase
4768
fun storage(): Storage
4869
fun attachmentProvider(): MessageDataProvider
4970
fun blindedIdMappingDatabase(): BlindedIdMappingDatabase

‎app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase
1515
import org.thoughtcrime.securesms.database.BlindedIdMappingDatabase
1616
import org.thoughtcrime.securesms.database.ConfigDatabase
1717
import org.thoughtcrime.securesms.database.DraftDatabase
18-
import org.thoughtcrime.securesms.database.EmojiSearchDatabase
1918
import org.thoughtcrime.securesms.database.ExpirationConfigurationDatabase
2019
import org.thoughtcrime.securesms.database.GroupDatabase
2120
import org.thoughtcrime.securesms.database.GroupMemberDatabase
@@ -149,10 +148,6 @@ object DatabaseModule {
149148
@Singleton
150149
fun provideReactionDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = ReactionDatabase(context, openHelper)
151150

152-
@Provides
153-
@Singleton
154-
fun provideEmojiSearchDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = EmojiSearchDatabase(context, openHelper)
155-
156151
@Provides
157152
@Singleton
158153
fun provideExpirationConfigurationDatabase(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper) = ExpirationConfigurationDatabase(context, openHelper)

0 commit comments

Comments
 (0)