forked from penguin86/luna-tracker
		
	small code cleanup
This commit is contained in:
		@@ -13,9 +13,9 @@ import java.io.FilenameFilter
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
class FileLogbookRepository: LogbookRepository {
 | 
					class FileLogbookRepository: LogbookRepository {
 | 
				
			||||||
    companion object {
 | 
					    companion object {
 | 
				
			||||||
        val TAG = "FileLogbookRepository"
 | 
					        const val TAG = "FileLogbookRepository"
 | 
				
			||||||
        val FILE_NAME_START = "data"
 | 
					        const val FILE_NAME_START = "data"
 | 
				
			||||||
        val FILE_NAME_END = ".json"
 | 
					        const val FILE_NAME_END = ".json"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    override fun loadLogbook(context: Context, name: String, listener: LogbookLoadedListener) {
 | 
					    override fun loadLogbook(context: Context, name: String, listener: LogbookLoadedListener) {
 | 
				
			||||||
@@ -32,7 +32,7 @@ class FileLogbookRepository: LogbookRepository {
 | 
				
			|||||||
    fun loadLogbook(context: Context, name: String): Logbook {
 | 
					    fun loadLogbook(context: Context, name: String): Logbook {
 | 
				
			||||||
        val logbook = Logbook(name)
 | 
					        val logbook = Logbook(name)
 | 
				
			||||||
        val fileName = getFileName(name)
 | 
					        val fileName = getFileName(name)
 | 
				
			||||||
        val file = File(context.getFilesDir(), fileName)
 | 
					        val file = File(context.filesDir, fileName)
 | 
				
			||||||
        val json = FileInputStream(file).bufferedReader().use { it.readText() }
 | 
					        val json = FileInputStream(file).bufferedReader().use { it.readText() }
 | 
				
			||||||
        val ja = JSONArray(json)
 | 
					        val ja = JSONArray(json)
 | 
				
			||||||
        for (i in 0 until ja.length()) {
 | 
					        for (i in 0 until ja.length()) {
 | 
				
			||||||
@@ -58,7 +58,7 @@ class FileLogbookRepository: LogbookRepository {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    fun saveLogbook(context: Context, logbook: Logbook) {
 | 
					    fun saveLogbook(context: Context, logbook: Logbook) {
 | 
				
			||||||
        val fileName = getFileName(logbook.name)
 | 
					        val fileName = getFileName(logbook.name)
 | 
				
			||||||
        val file = File(context.getFilesDir(), fileName)
 | 
					        val file = File(context.filesDir, fileName)
 | 
				
			||||||
        val ja = JSONArray()
 | 
					        val ja = JSONArray()
 | 
				
			||||||
        for (l in logbook.logs) {
 | 
					        for (l in logbook.logs) {
 | 
				
			||||||
            ja.put(l.toJson())
 | 
					            ja.put(l.toJson())
 | 
				
			||||||
@@ -82,7 +82,7 @@ class FileLogbookRepository: LogbookRepository {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private fun listLogbooks(context: Context): ArrayList<String> {
 | 
					    private fun listLogbooks(context: Context): ArrayList<String> {
 | 
				
			||||||
        val logbooksFileNames = context.getFilesDir().list(object: FilenameFilter {
 | 
					        val logbooksFileNames = context.filesDir.list(object: FilenameFilter {
 | 
				
			||||||
            override fun accept(dir: File?, name: String?): Boolean {
 | 
					            override fun accept(dir: File?, name: String?): Boolean {
 | 
				
			||||||
                if (name == null)
 | 
					                if (name == null)
 | 
				
			||||||
                    return false
 | 
					                    return false
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user