forked from GitHub-Mirror/riotX-android
Remove duplicated method
This commit is contained in:
parent
bc1edcf33d
commit
62d2443b85
@ -29,13 +29,13 @@ import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
|
|||||||
import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStore
|
import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStore
|
||||||
import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreMigration
|
import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreMigration
|
||||||
import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreModule
|
import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreModule
|
||||||
import im.vector.matrix.android.internal.crypto.store.db.hash
|
|
||||||
import im.vector.matrix.android.internal.crypto.tasks.*
|
import im.vector.matrix.android.internal.crypto.tasks.*
|
||||||
import im.vector.matrix.android.internal.database.configureEncryption
|
import im.vector.matrix.android.internal.database.configureEncryption
|
||||||
import im.vector.matrix.android.internal.di.CryptoDatabase
|
import im.vector.matrix.android.internal.di.CryptoDatabase
|
||||||
import im.vector.matrix.android.internal.session.SessionScope
|
import im.vector.matrix.android.internal.session.SessionScope
|
||||||
import im.vector.matrix.android.internal.session.cache.ClearCacheTask
|
import im.vector.matrix.android.internal.session.cache.ClearCacheTask
|
||||||
import im.vector.matrix.android.internal.session.cache.RealmClearCacheTask
|
import im.vector.matrix.android.internal.session.cache.RealmClearCacheTask
|
||||||
|
import im.vector.matrix.android.internal.util.md5
|
||||||
import io.realm.RealmConfiguration
|
import io.realm.RealmConfiguration
|
||||||
import retrofit2.Retrofit
|
import retrofit2.Retrofit
|
||||||
import java.io.File
|
import java.io.File
|
||||||
@ -51,7 +51,7 @@ internal abstract class CryptoModule {
|
|||||||
@CryptoDatabase
|
@CryptoDatabase
|
||||||
@SessionScope
|
@SessionScope
|
||||||
fun providesRealmConfiguration(context: Context, credentials: Credentials): RealmConfiguration {
|
fun providesRealmConfiguration(context: Context, credentials: Credentials): RealmConfiguration {
|
||||||
val userIDHash = credentials.userId.hash()
|
val userIDHash = credentials.userId.md5()
|
||||||
|
|
||||||
return RealmConfiguration.Builder()
|
return RealmConfiguration.Builder()
|
||||||
.directory(File(context.filesDir, userIDHash))
|
.directory(File(context.filesDir, userIDHash))
|
||||||
|
@ -25,27 +25,9 @@ import java.io.ByteArrayInputStream
|
|||||||
import java.io.ByteArrayOutputStream
|
import java.io.ByteArrayOutputStream
|
||||||
import java.io.ObjectInputStream
|
import java.io.ObjectInputStream
|
||||||
import java.io.ObjectOutputStream
|
import java.io.ObjectOutputStream
|
||||||
import java.security.MessageDigest
|
|
||||||
import java.util.zip.GZIPInputStream
|
import java.util.zip.GZIPInputStream
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Compute a Hash of a String, using md5 algorithm
|
|
||||||
*/
|
|
||||||
fun String.hash() = try {
|
|
||||||
val digest = MessageDigest.getInstance("md5")
|
|
||||||
digest.update(toByteArray())
|
|
||||||
val bytes = digest.digest()
|
|
||||||
val sb = StringBuilder()
|
|
||||||
for (i in bytes.indices) {
|
|
||||||
sb.append(String.format("%02X", bytes[i]))
|
|
||||||
}
|
|
||||||
sb.toString().toLowerCase()
|
|
||||||
} catch (exc: Exception) {
|
|
||||||
// Should not happen, but just in case
|
|
||||||
hashCode().toString()
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get realm, invoke the action, close realm, and return the result of the action
|
* Get realm, invoke the action, close realm, and return the result of the action
|
||||||
*/
|
*/
|
||||||
|
@ -18,6 +18,9 @@ package im.vector.matrix.android.internal.util
|
|||||||
|
|
||||||
import java.security.MessageDigest
|
import java.security.MessageDigest
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compute a Hash of a String, using md5 algorithm
|
||||||
|
*/
|
||||||
fun String.md5() = try {
|
fun String.md5() = try {
|
||||||
val digest = MessageDigest.getInstance("md5")
|
val digest = MessageDigest.getInstance("md5")
|
||||||
digest.update(toByteArray())
|
digest.update(toByteArray())
|
||||||
|
Loading…
Reference in New Issue
Block a user