From b13edfa5cc7b236623e698c6782cc0933939dede Mon Sep 17 00:00:00 2001 From: Friedger Date: Fri, 30 Nov 2018 15:23:56 +0100 Subject: [PATCH 1/8] enable encryption --- .../convertcsv/blockstack/AccountActivity.kt | 10 ---------- .../convertcsv/blockstack/ConvertCSVProvider.kt | 4 ++-- app/src/main/res/layout/content_account.xml | 15 ++------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/org/openintents/convertcsv/blockstack/AccountActivity.kt b/app/src/main/java/org/openintents/convertcsv/blockstack/AccountActivity.kt index 3d7e941..de11406 100644 --- a/app/src/main/java/org/openintents/convertcsv/blockstack/AccountActivity.kt +++ b/app/src/main/java/org/openintents/convertcsv/blockstack/AccountActivity.kt @@ -88,16 +88,6 @@ class AccountActivity : AppCompatActivity() { finish() } } - - putFileButton.setOnClickListener { _ -> - launch(UI) { - async(CommonPool) { - blockstackSession().putFile("test.csv", "no data", PutFileOptions(false)) { - Log.d(TAG, "put done " + it.value + " " + it.error) - } - } - } - } } private fun onLoaded() { diff --git a/app/src/main/java/org/openintents/convertcsv/blockstack/ConvertCSVProvider.kt b/app/src/main/java/org/openintents/convertcsv/blockstack/ConvertCSVProvider.kt index 16cd6d9..1c70907 100644 --- a/app/src/main/java/org/openintents/convertcsv/blockstack/ConvertCSVProvider.kt +++ b/app/src/main/java/org/openintents/convertcsv/blockstack/ConvertCSVProvider.kt @@ -358,7 +358,7 @@ class ConvertCSVProvider : DocumentsProvider() { return ParcelFileDescriptor.open(outputFile, accessMode, mainHandler) { Log.d(TAG, "closing file " + it?.toString()) - val options = PutFileOptions(encrypt = false) + val options = PutFileOptions() var putFileDone = false val inputStream: InputStream = File(outputFile.path).inputStream() val inputString = inputStream.bufferedReader().use { it.readText() } @@ -383,7 +383,7 @@ class ConvertCSVProvider : DocumentsProvider() { } } } else { - val options = GetFileOptions(decrypt = false) + val options = GetFileOptions() var getFileDone = false runOnV8Thread { diff --git a/app/src/main/res/layout/content_account.xml b/app/src/main/res/layout/content_account.xml index 76c3db2..714cbe2 100644 --- a/app/src/main/res/layout/content_account.xml +++ b/app/src/main/res/layout/content_account.xml @@ -5,9 +5,9 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="org.blockstack.android.MainActivity" + tools:context=".blockstack.AccountActivity" tools:ignore="HardcodedText" - tools:showIn="@layout/activity_main"> + tools:showIn="@layout/activity_account">