diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 025fe15..e87ded9 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -32,8 +32,6 @@
-
-
diff --git a/android/app/src/main/java/com/massive/ExportActivity.kt b/android/app/src/main/java/com/massive/ExportActivity.kt
deleted file mode 100644
index 302de12..0000000
--- a/android/app/src/main/java/com/massive/ExportActivity.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.massive
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.database.Cursor
-import android.net.Uri
-import android.os.Bundle
-import android.provider.OpenableColumns
-import android.util.Log
-import java.io.*
-
-
-class ExportActivity : Activity() {
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- Log.d("ExportActivity", "Started ExportActivity.")
- val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
- addCategory(Intent.CATEGORY_OPENABLE)
- type = "text/csv"
- putExtra(Intent.EXTRA_TITLE, "sets.csv")
- }
- startActivityForResult(intent, CREATE_FILE, null)
- }
-
- @SuppressLint("Range")
- override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
- Log.d("ExportActivity", "Got activity result: requestCode=$requestCode,resultCode=$resultCode")
- data?.data?.also { uri ->
- contentResolver.openFileDescriptor(uri, "w")?.use { fd ->
- FileWriter(fd.fileDescriptor).use { fw ->
- Log.d("ExportActivity", "Got file writer: $fw")
- fw.write("id,name,reps,weight,created,unit\n")
- val db = MassiveHelper(applicationContext).readableDatabase
- db.use {
- with(it.query("sets", null, null, null, null, null, null)) {
- while (moveToNext()) {
- val id = getInt(getColumnIndex("id"))
- val name = getString(getColumnIndex("name"))
- val reps = getInt(getColumnIndex("reps"))
- val weight = getInt(getColumnIndex("weight"))
- val created = getString(getColumnIndex("created"))
- val unit = getString(getColumnIndex("unit"))
- fw.appendLine("$id,$name,$reps,$weight,$created,$unit\n")
- }
- }
- }
- fw.flush()
- fw.close()
- }
- }
- }
- }
-
- @Throws(IOException::class)
- fun getFile(context: Context, uri: Uri): File? {
- val destinationFilename =
- File(context.filesDir.path + File.separatorChar + queryName(context, uri))
- try {
- context.contentResolver.openInputStream(uri).use { ins ->
- if (ins != null) {
- createFileFromStream(
- ins,
- destinationFilename
- )
- }
- }
- } catch (ex: Exception) {
- Log.e("Save File", ex.message!!)
- ex.printStackTrace()
- }
- return destinationFilename
- }
-
- private fun createFileFromStream(ins: InputStream, destination: File?) {
- try {
- FileOutputStream(destination).use { os ->
- val buffer = ByteArray(4096)
- var length: Int
- while (ins.read(buffer).also { length = it } > 0) {
- os.write(buffer, 0, length)
- }
- os.flush()
- }
- } catch (ex: Exception) {
- Log.e("Save File", ex.message!!)
- ex.printStackTrace()
- }
- }
-
- private fun queryName(context: Context, uri: Uri): String {
- val returnCursor: Cursor = context.contentResolver.query(uri, null, null, null, null)!!
- val nameIndex: Int = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
- returnCursor.moveToFirst()
- val name: String = returnCursor.getString(nameIndex)
- returnCursor.close()
- return name
- }
-
-
- companion object {
- const val CREATE_FILE = 1
- }
-}
\ No newline at end of file
diff --git a/android/app/src/main/java/com/massive/ImportActivity.kt b/android/app/src/main/java/com/massive/ImportActivity.kt
deleted file mode 100644
index 9117704..0000000
--- a/android/app/src/main/java/com/massive/ImportActivity.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.massive
-
-import android.annotation.SuppressLint
-import android.app.*
-import android.content.ContentValues
-import android.content.Intent
-import android.os.Build
-import android.os.Bundle
-import android.util.Log
-import androidx.annotation.RequiresApi
-import java.io.*
-
-class ImportActivity : Activity() {
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- Log.d("ImportActivity", "Started ImportActivity.")
- val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
- addCategory(Intent.CATEGORY_OPENABLE)
- type = "*/*"
- }
- startActivityForResult(intent, OPEN_FILE, null)
- }
-
- @RequiresApi(Build.VERSION_CODES.M)
- @SuppressLint("Range")
- override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
- Log.d("ImportActivity", "Got activity result: requestCode=$requestCode,resultCode=$resultCode")
- val db = MassiveHelper(applicationContext).readableDatabase
- data?.data?.also { uri ->
- contentResolver.openInputStream(uri)?.use { inputStream ->
- BufferedReader(InputStreamReader(inputStream)).use { reader ->
- reader.readLine()
- var line: String? = reader.readLine()
- while (line != null) {
- Log.d("ImportActivity", "line: $line")
- val split = line.split(",")
- if (split.isEmpty()) continue
- val set = ContentValues().apply {
- put("name", split[1])
- put("reps", split[2])
- put("weight", split[3])
- put("created", split[4])
- put("unit", split[5])
- }
- db.insert("sets", null, set)
- line = reader.readLine()
- }
- }
- }
- }
- val mainIntent = Intent(applicationContext, MainActivity::class.java)
- mainIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
- applicationContext.startActivity(mainIntent)
- }
-
- companion object {
- const val OPEN_FILE = 1
- }
-}
\ No newline at end of file