diff --git a/.gitignore b/.gitignore index 42faf6b..5a5d5b4 100644 --- a/.gitignore +++ b/.gitignore @@ -39,14 +39,7 @@ proguard/ captures/ # IntelliJ -*.iml -.idea/workspace.xml -.idea/tasks.xml -.idea/gradle.xml -.idea/assetWizardSettings.xml -.idea/dictionaries -.idea/libraries -.idea/caches +.idea # Keystore files # Uncomment the following line if you do not want to check your keystore files in. @@ -117,25 +110,6 @@ obj/ *.iws /out/ -# User-specific configurations -.idea/caches/ -.idea/libraries/ -.idea/shelf/ -.idea/.name -.idea/compiler.xml -.idea/copyright/profiles_settings.xml -.idea/encodings.xml -.idea/misc.xml -.idea/modules.xml -.idea/scopes/scope_settings.xml -.idea/vcs.xml -.idea/jsLibraryMappings.xml -.idea/datasources.xml -.idea/dataSources.ids -.idea/sqlDataSources.xml -.idea/dynamic.xml -.idea/uiDesigner.xml - # OS-specific files .DS_Store .DS_Store? @@ -180,4 +154,8 @@ fabric.properties ### AndroidStudio Patch ### -!/gradle/wrapper/gradle-wrapper.jar \ No newline at end of file +!/gradle/wrapper/gradle-wrapper.jar + + +# NDK +app/.cxx \ No newline at end of file diff --git a/Rekado.iml b/Rekado.iml new file mode 100644 index 0000000..fea97ff --- /dev/null +++ b/Rekado.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 85df090..0bf2424 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.pavelrekun.rekado" minSdkVersion minimumSDKVersion targetSdkVersion currentSDKVersion - versionCode 70 - versionName "4.0" + versionCode 71 + versionName "4.0.1" archivesBaseName = "[$versionName] Rekado [${versionCode}]" } diff --git a/app/src/main/java/com/pavelrekun/rekado/screens/payload_fragment/PayloadsFragment.kt b/app/src/main/java/com/pavelrekun/rekado/screens/payload_fragment/PayloadsFragment.kt index 47de4b8..6cc5e04 100644 --- a/app/src/main/java/com/pavelrekun/rekado/screens/payload_fragment/PayloadsFragment.kt +++ b/app/src/main/java/com/pavelrekun/rekado/screens/payload_fragment/PayloadsFragment.kt @@ -1,5 +1,6 @@ package com.pavelrekun.rekado.screens.payload_fragment +import android.app.Activity import android.content.Intent import android.os.Bundle import android.view.View @@ -15,6 +16,7 @@ import com.pavelrekun.rekado.services.Constants import com.pavelrekun.rekado.services.Events import com.pavelrekun.rekado.services.utils.LoginUtils import com.pavelrekun.rekado.services.dialogs.DialogsShower +import com.pavelrekun.rekado.services.extensions.extractFileName import com.pavelrekun.rekado.services.extensions.viewBinding import com.pavelrekun.rekado.services.payloads.PayloadDownloadHelper import com.pavelrekun.rekado.services.payloads.PayloadHelper @@ -81,6 +83,33 @@ class PayloadsFragment : BaseFragment(R.layout.fragment_payloads) { }) } + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + + if (requestCode == Constants.KEY_OPEN_PAYLOAD) { + when (resultCode) { + Activity.RESULT_OK -> data?.data?.let { + val name = it.extractFileName() + if (name != null) { + val inputStream = getBaseActivity().contentResolver.openInputStream(it) + + if (inputStream != null) { + MemoryUtils.copyPayload(inputStream, name) + EventBus.getDefault().post(Events.UpdatePayloadsListEvent()) + LoginUtils.info("Added new payload: $name") + } else { + Toast.makeText(requireContext(), R.string.helper_error_adding_payload, Toast.LENGTH_SHORT).show() + LoginUtils.error("Failed to add payload: $name") + } + } else { + Toast.makeText(requireContext(), R.string.helper_error_adding_payload, Toast.LENGTH_SHORT).show() + LoginUtils.error("Failed to add selected payload!") + } + } + } + } + } + private fun initList() { MemoryUtils.parseBundledSchema() diff --git a/app/src/main/res/raw/bundled_payloads.json b/app/src/main/res/raw/bundled_payloads.json index a3e1605..344415f 100644 --- a/app/src/main/res/raw/bundled_payloads.json +++ b/app/src/main/res/raw/bundled_payloads.json @@ -1,5 +1,5 @@ { - "timestamp":1586248849, + "timestamp": 1588755094, "type": 0, "payloads":[ { @@ -10,12 +10,12 @@ { "title":"hekate.bin", "downloadUrl": "https://pavelrekun.dev/payloads/hekate.bin", - "version":"5.1.3" + "version":"5.2.1" }, { "title":"fusee_primary.bin", "downloadUrl": "https://pavelrekun.dev/payloads/fusee_primary.bin", - "version":"0.10.5" + "version":"0.12.0" } ] } diff --git a/app/src/main/res/raw/hekate.bin b/app/src/main/res/raw/hekate.bin index 8a5cba0..ca08caa 100644 Binary files a/app/src/main/res/raw/hekate.bin and b/app/src/main/res/raw/hekate.bin differ