avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-23 03:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Post merge errors/conflicts

Browse Source
This commit is contained in:
machiav3lli 2021-12-24 15:08:25 +01:00
parent 4778f128f2
commit b359475db7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/com/looker/droidify/content/ProductPreferences.kt
View File

@ -41,11 +41,11 @@ object ProductPreferences {
CoroutineScope(Dispatchers.Default).launch { CoroutineScope(Dispatchers.Default).launch {
subject.collect { (packageName, versionCode) -> subject.collect { (packageName, versionCode) ->
if (versionCode != null) db.lockDao.insert(Lock().apply { if (versionCode != null) db.lockDao.insert(Lock().apply {
package_name = pName package_name = packageName
version_code = versionCode version_code = versionCode
} }
) )
else db.lockDao.delete(pName) else db.lockDao.delete(packageName)
} }
} }
} }

4
src/main/kotlin/com/looker/droidify/utility/Utils.kt
View File

@ -4,8 +4,11 @@ import android.content.Context
import android.content.pm.PackageInfo import android.content.pm.PackageInfo
import android.content.pm.Signature import android.content.pm.Signature
import android.content.res.Configuration import android.content.res.Configuration
import android.database.Cursor
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.os.Build import android.os.Build
import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParser
import com.looker.droidify.* import com.looker.droidify.*
import com.looker.droidify.content.Preferences import com.looker.droidify.content.Preferences
import com.looker.droidify.entity.InstalledItem import com.looker.droidify.entity.InstalledItem
@ -26,6 +29,7 @@ import com.looker.droidify.utility.extension.text.hex
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.collect
import java.io.ByteArrayOutputStream
import java.security.MessageDigest import java.security.MessageDigest
import java.security.cert.Certificate import java.security.cert.Certificate
import java.security.cert.CertificateEncodingException import java.security.cert.CertificateEncodingException