Version 0.1.4

.tx/config

@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+
+[syncthing-lite.stringsxml]
+file_filter = app/src/main/res/values-<lang>/strings.xml
+source_file = app/src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT: es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: fil-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_CN: zh-rCN, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA, no_NO: no-rNO, he_IL: iw-rIL, he: iw, id:in

README.md

@@ -15,6 +15,10 @@ This project is based on [syncthing-java][3], a java implementation of Syncthing
 
 [<img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="80">](https://play.google.com/store/apps/details?id=net.syncthing.lite)
 
+## Translations
+
+The project is translated on [Transifex](https://www.transifex.com/syncthing-android/syncthing-lite/).
+
 ## Building
 
 The project uses a standard Android build, and requires the Android SDK. The easiest option is if

app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'com.github.ben-manes.versions'
 
 android {
     compileSdkVersion 27
@@ -10,8 +11,8 @@ android {
         applicationId "net.syncthing.lite"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 5
-        versionName "0.1.3"
+        versionCode 6
+        versionName "0.1.4"
         multiDexEnabled true
     }
     sourceSets {
@@ -45,19 +46,20 @@ dependencies {
     implementation "org.jetbrains.anko:anko-coroutines:$anko_version"
     kapt "com.android.databinding:compiler:$build_tools_version"
     implementation "com.android.support:appcompat-v7:$support_version"
-    implementation "com.android.support:support-v4:$support_version"
     implementation "com.android.support:design:$support_version"
     implementation "com.android.support:cardview-v7:$support_version"
-    implementation ("com.github.Nutomic:syncthing-java:0.1.3") {
+    implementation ("com.github.Nutomic:syncthing-java:0.1.4") {
         exclude group: 'commons-logging', module:'commons-logging'
-        exclude group: 'commons-codec'
         exclude group: 'org.apache.httpcomponents', module:'httpclient'
         exclude group: 'org.slf4j'
         exclude group: 'ch.qos.logback'
     }
+    // NOTE: httpclient-android seems to be used via reflection somehow. Removing this dependency
+    //       silently breaks the app.
     implementation 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
     implementation 'sk.baka.slf4j:slf4j-handroid:1.7.26'
     implementation 'com.google.zxing:android-integration:3.3.0'
-    implementation 'com.nononsenseapps:filepicker:2.5.2'
-    implementation 'uk.co.markormesher:android-fab:2.0.0'
+    implementation ('uk.co.markormesher:android-fab:2.0.0') {
+        exclude group: "org.jetbrains.kotlin"
+    }
 }

app/src/main/kotlin/net/syncthing/lite/activities/FolderBrowserActivity.kt

@@ -11,7 +11,6 @@ import android.support.v4.content.ContextCompat
 import android.util.Log
 import android.view.View
 import android.widget.Toast
-import com.google.common.base.Preconditions.checkArgument
 import net.syncthing.java.bep.IndexBrowser
 import net.syncthing.java.core.beans.FileInfo
 import net.syncthing.java.core.utils.PathUtils
@@ -89,7 +88,7 @@ class FolderBrowserActivity : SyncthingActivity() {
         if (indexBrowser.isRoot() && PathUtils.isParent(fileInfo.path)) {
             finish()
         } else {
-            if (fileInfo.isDirectory) {
+            if (fileInfo.isDirectory()) {
                 indexBrowser.navigateTo(fileInfo)
                 Log.d(TAG, "load folder cache bg")
                 binding.listView.visibility = View.GONE
@@ -109,7 +108,7 @@ class FolderBrowserActivity : SyncthingActivity() {
             val list = indexBrowser.listFiles()
             Log.i("navigateToFolder", "list for path = '" + indexBrowser.currentPath + "' list = " + list.size + " records")
             Log.d("navigateToFolder", "list for path = '" + indexBrowser.currentPath + "' list = " + list)
-            checkArgument(!list.isEmpty())//list must contain at least the 'parent' path
+            assert(!list.isEmpty())//list must contain at least the 'parent' path
             adapter.clear()
             adapter.addAll(list)
             adapter.notifyDataSetChanged()
@@ -135,8 +134,7 @@ class FolderBrowserActivity : SyncthingActivity() {
 
     override fun onIndexUpdateProgress(folder: String, percentage: Int) {
         binding.indexUpdate.visibility = View.VISIBLE
-        binding.indexUpdateLabel.text = (getString(R.string.index_update_folder)
-                + folder + " " + percentage + getString(R.string.index_update_percent_synchronized))
+        binding.indexUpdateLabel.text = getString(R.string.index_update_progress_label, folder, percentage)
         updateFolderListView()
     }
 

app/src/main/kotlin/net/syncthing/lite/activities/MainActivity.kt

@@ -98,12 +98,15 @@ class MainActivity : SyncthingActivity() {
     }
 
     override fun onIndexUpdateProgress(folder: String, percentage: Int) {
-        binding.indexUpdate.visibility = View.VISIBLE
-        binding.indexUpdateLabel.text = (getString(R.string.index_update_folder) + " "
-                + folder + " " + percentage + getString(R.string.index_update_percent_synchronized))
+        async(UI) {
+            binding.indexUpdate.visibility = View.VISIBLE
+            binding.indexUpdateLabel.text = getString(R.string.index_update_progress_label, folder, percentage)
+        }
     }
 
     override fun onIndexUpdateComplete() {
-        binding.indexUpdate.visibility = View.GONE
+        async(UI) {
+            binding.indexUpdate.visibility = View.GONE
+        }
     }
 }

app/src/main/kotlin/net/syncthing/lite/adapters/DevicesAdapter.kt

@@ -6,13 +6,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
-import com.google.common.collect.Lists
 import net.syncthing.java.core.beans.DeviceStats
 import net.syncthing.lite.R
 import net.syncthing.lite.databinding.ListviewDeviceBinding
 
 class DevicesAdapter(context: Context) :
-        ArrayAdapter<DeviceStats>(context, R.layout.listview_device, Lists.newArrayList()) {
+        ArrayAdapter<DeviceStats>(context, R.layout.listview_device, mutableListOf()) {
 
     override fun getView(position: Int, v: View?, parent: ViewGroup): View {
         val binding: ListviewDeviceBinding

app/src/main/kotlin/net/syncthing/lite/adapters/FolderContentsAdapter.kt

@@ -7,14 +7,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
-import com.google.common.collect.Lists
 import net.syncthing.java.core.beans.FileInfo
 import net.syncthing.lite.R
 import net.syncthing.lite.databinding.ListviewFileBinding
 import org.apache.commons.io.FileUtils
 
 class FolderContentsAdapter(context: Context) :
-        ArrayAdapter<FileInfo>(context, R.layout.listview_file, Lists.newArrayList()) {
+        ArrayAdapter<FileInfo>(context, R.layout.listview_file, mutableListOf()) {
 
     override fun getView(position: Int, v: View?, parent: ViewGroup): View {
         val binding: ListviewFileBinding =
@@ -25,15 +24,15 @@ class FolderContentsAdapter(context: Context) :
             }
         val fileInfo = getItem(position)
         binding.fileLabel.text = fileInfo!!.fileName
-        if (fileInfo.isDirectory) {
+        if (fileInfo.isDirectory()) {
             binding.fileIcon.setImageResource(R.drawable.ic_folder_black_24dp)
             binding.fileSize.visibility = View.GONE
         } else {
             binding.fileIcon.setImageResource(R.drawable.ic_image_black_24dp)
             binding.fileSize.visibility = View.VISIBLE
-            binding.fileSize.text = (FileUtils.byteCountToDisplaySize(fileInfo.size!!)
-                    + context.getString(R.string.last_modified)
-                    + DateUtils.getRelativeDateTimeString(context, fileInfo.lastModified.time, DateUtils.MINUTE_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0))
+            binding.fileSize.text = context.getString(R.string.file_info,
+                    FileUtils.byteCountToDisplaySize(fileInfo.size!!),
+                    DateUtils.getRelativeDateTimeString(context, fileInfo.lastModified.time, DateUtils.MINUTE_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0))
         }
         return binding.root
     }

app/src/main/kotlin/net/syncthing/lite/adapters/FoldersListAdapter.kt

@@ -25,13 +25,14 @@ class FoldersListAdapter(context: Context?, list: List<Pair<FolderInfo, FolderSt
             }
         val folderInfo = getItem(position)!!.left
         val folderStats = getItem(position)!!.right
-        binding.folderName.text = "${folderInfo.label} (${folderInfo.folder})"
+        binding.folderName.text = context.getString(R.string.folder_label_format, folderInfo.label, folderInfo.folder)
+
         binding.folderLastmodInfo.text =
                 if (folderStats.lastUpdate == null)
                     context.getString(R.string.last_modified_unknown)
-                else context.getString(R.string.last_modified_known) + " " +
-                        DateUtils.getRelativeDateTimeString(context, folderStats.lastUpdate.time, DateUtils.MINUTE_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0)
-        binding.folderContentInfo.text = "${folderStats.describeSize()}, ${folderStats.fileCount} files, ${folderStats.dirCount} dirs"
+                else context.getString(R.string.last_modified_time,
+                        DateUtils.getRelativeDateTimeString(context, folderStats.lastUpdate.time, DateUtils.MINUTE_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0))
+        binding.folderContentInfo.text = context.getString(R.string.folder_content_info, folderStats.describeSize(), folderStats.fileCount, folderStats.dirCount)
         return binding.root
     }
 

app/src/main/kotlin/net/syncthing/lite/fragments/DevicesFragment.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.databinding.DataBindingUtil
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -15,9 +14,9 @@ import android.widget.Toast
 import com.google.zxing.integration.android.IntentIntegrator
 import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.async
+import net.syncthing.java.core.beans.DeviceId
 import net.syncthing.java.core.beans.DeviceInfo
 import net.syncthing.java.core.beans.DeviceStats
-import net.syncthing.java.core.security.KeystoreHandler
 import net.syncthing.lite.R
 import net.syncthing.lite.adapters.DevicesAdapter
 import net.syncthing.lite.databinding.FragmentDevicesBinding
@@ -26,14 +25,11 @@ import net.syncthing.lite.utils.FragmentIntentIntegrator
 import org.apache.commons.lang3.StringUtils.isBlank
 import uk.co.markormesher.android_fab.SpeedDialMenuAdapter
 import uk.co.markormesher.android_fab.SpeedDialMenuItem
+import java.io.IOException
 import java.security.InvalidParameterException
 
 class DevicesFragment : SyncthingFragment() {
 
-    companion object {
-        private val TAG = "DevicesFragment"
-    }
-
     private lateinit var binding: FragmentDevicesBinding
     private lateinit var adapter: DevicesAdapter
 
@@ -54,16 +50,15 @@ class DevicesFragment : SyncthingFragment() {
         adapter = DevicesAdapter(context!!)
         binding.list.adapter = adapter
         binding.list.setOnItemLongClickListener { _, _, position, _ ->
-            val deviceId = (binding.list.getItemAtPosition(position) as DeviceStats).deviceId
+            val device = (binding.list.getItemAtPosition(position) as DeviceStats)
             AlertDialog.Builder(context)
-                    .setTitle(getString(R.string.remove_device_title) + " " + deviceId.substring(0, 7) + "?")
-                    .setMessage(getString(R.string.remove_device_body_1) + " " + deviceId.substring(0, 7) + " " + getString(R.string.remove_device_body_2))
+                    .setTitle(getString(R.string.remove_device_title, device.name))
+                    .setMessage(getString(R.string.remove_device_message, device.deviceId.deviceId.substring(0, 7)))
                     .setPositiveButton(android.R.string.yes) { _, _ ->
-                        libraryHandler?.configuration { it.edit().removePeer(deviceId).persistLater() }
+                        libraryHandler?.configuration { it.Editor().removePeer(device.deviceId).persistLater() }
                     }
                     .setNegativeButton(android.R.string.no, null)
                     .show()
-            Log.d(TAG, "showFolderListView delete device = '$deviceId'")
             false
         }
     }
@@ -71,7 +66,7 @@ class DevicesFragment : SyncthingFragment() {
     private fun updateDeviceList() {
         libraryHandler?.syncthingClient { syncthingClient ->
             adapter.clear()
-            adapter.addAll(syncthingClient.devicesHandler.deviceStatsList)
+            adapter.addAll(syncthingClient.devicesHandler.getDeviceStatsList())
             adapter.notifyDataSetChanged()
         }
     }
@@ -87,24 +82,25 @@ class DevicesFragment : SyncthingFragment() {
         }
     }
 
-    private fun importDeviceId(deviceId: String) {
+    private fun importDeviceId(deviceIdString: String) {
         libraryHandler?.library { configuration, syncthingClient, _ ->
             async(UI) {
-                try {
-                    KeystoreHandler.validateDeviceId(deviceId)
-                } catch (e: IllegalArgumentException) {
-                    Toast.makeText(this@DevicesFragment.context, R.string.invalid_device_id, Toast.LENGTH_SHORT).show()
-                    return@async
-                }
+                val deviceId =
+                    try {
+                        DeviceId(deviceIdString)
+                    } catch (e: IOException) {
+                        Toast.makeText(this@DevicesFragment.context, R.string.invalid_device_id, Toast.LENGTH_SHORT).show()
+                        return@async
+                    }
 
-                val modified = configuration.edit().addPeers(DeviceInfo(deviceId, null))
+                val modified = configuration.Editor().addPeers(DeviceInfo(deviceId, null))
                 if (modified) {
-                    configuration.edit().persistLater()
-                    Toast.makeText(this@DevicesFragment.context, getString(R.string.device_import_success) + " " + deviceId, Toast.LENGTH_SHORT).show()
+                    configuration.Editor().persistLater()
+                    Toast.makeText(this@DevicesFragment.context, getString(R.string.device_import_success, deviceId), Toast.LENGTH_SHORT).show()
                     updateDeviceList()//TODO remove this if event triggered (and handler trigger update)
                     UpdateIndexTask(this@DevicesFragment.context!!, syncthingClient).updateIndex()
                 } else {
-                    Toast.makeText(this@DevicesFragment.context, getString(R.string.device_already_known) + " " + deviceId, Toast.LENGTH_SHORT).show()
+                    Toast.makeText(this@DevicesFragment.context, getString(R.string.device_already_known, deviceId), Toast.LENGTH_SHORT).show()
                 }
             }
         }

app/src/main/kotlin/net/syncthing/lite/fragments/FoldersFragment.kt

@@ -6,17 +6,11 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.google.common.collect.Lists
-import com.google.common.collect.Ordering
-import net.syncthing.java.core.beans.FolderInfo
-import net.syncthing.java.core.beans.FolderStats
 import net.syncthing.lite.R
 import net.syncthing.lite.activities.FolderBrowserActivity
 import net.syncthing.lite.adapters.FoldersListAdapter
 import net.syncthing.lite.databinding.FragmentFoldersBinding
-import org.apache.commons.lang3.tuple.Pair
 import org.jetbrains.anko.intentFor
-import java.util.*
 
 class FoldersFragment : SyncthingFragment() {
 
@@ -37,9 +31,7 @@ class FoldersFragment : SyncthingFragment() {
 
     private fun showAllFoldersListView() {
         libraryHandler?.folderBrowser { folderBrowser ->
-            val list = Lists.newArrayList(folderBrowser.folderInfoAndStatsList())
-            Collections.sort(list, Ordering.natural<Comparable<String>>()
-                    .onResultOf<Pair<FolderInfo, FolderStats>> { input -> input?.left?.label })
+            val list = folderBrowser.folderInfoAndStatsList().sortedBy { it.left.label }
             Log.i(TAG, "list folders = " + list + " (" + list.size + " records)")
             val adapter = FoldersListAdapter(context, list)
             binding.list.adapter = adapter

app/src/main/kotlin/net/syncthing/lite/library/LibraryHandler.kt

@@ -4,12 +4,12 @@ import android.content.Context
 import android.os.Handler
 import android.preference.PreferenceManager
 import android.util.Log
-import com.google.common.eventbus.Subscribe
 import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.async
 import net.syncthing.java.bep.FolderBrowser
-import net.syncthing.java.bep.IndexHandler
 import net.syncthing.java.client.SyncthingClient
+import net.syncthing.java.core.beans.FileInfo
+import net.syncthing.java.core.beans.IndexInfo
 import net.syncthing.java.core.configuration.ConfigurationService
 import net.syncthing.java.core.security.KeystoreHandler
 import net.syncthing.lite.utils.Util
@@ -21,8 +21,8 @@ import java.io.IOException
 import java.util.*
 
 class LibraryHandler(context: Context, onLibraryLoaded: (LibraryHandler) -> Unit,
-                     onIndexUpdateProgressListener: (String, Int) -> Unit,
-                     onIndexUpdateCompleteListener: () -> Unit) {
+                     private val onIndexUpdateProgressListener: (String, Int) -> Unit,
+                     private val onIndexUpdateCompleteListener: () -> Unit) {
 
     companion object {
         private var instanceCount = 0
@@ -59,32 +59,31 @@ class LibraryHandler(context: Context, onLibraryLoaded: (LibraryHandler) -> Unit
         }
 
         onIndexUpdateListener = object : Any() {
-            @Subscribe
-            fun handleIndexRecordAquiredEvent(event: IndexHandler.IndexRecordAquiredEvent) {
-                val indexInfo = event.indexInfo()
-                event.newRecords().size
-                Log.i(TAG, "handleIndexRecordEvent trigger folder list update from index record acquired")
-                onIndexUpdateProgressListener(event.folder(), (indexInfo.completed * 100).toInt())
-            }
-
-            @Subscribe
-            fun handleRemoteIndexAquiredEvent(event: IndexHandler.FullIndexAquiredEvent) {
-                Log.i(TAG, "handleIndexAcquiredEvent trigger folder list update from index acquired")
-                onIndexUpdateCompleteListener()
-            }
         }
         syncthingClient {
-            it.indexHandler.eventBus.register(onIndexUpdateListener)
+            it.indexHandler.registerOnIndexRecordAcquiredListener(this::onIndexRecordAcquired)
+            it.indexHandler.registerOnFullIndexAcquiredListenersListener(this::onRemoteIndexAcquired)
         }
     }
 
+    private fun onIndexRecordAcquired(folderId: String, newRecords: List<FileInfo>, indexInfo: IndexInfo) {
+        newRecords.size
+        Log.i(TAG, "handleIndexRecordEvent trigger folder list update from index record acquired")
+        onIndexUpdateProgressListener(folderId, (indexInfo.getCompleted() * 100).toInt())
+    }
+
+    private fun onRemoteIndexAcquired(folderId: String) {
+        Log.i(TAG, "handleIndexAcquiredEvent trigger folder list update from index acquired")
+        onIndexUpdateCompleteListener()
+    }
+
     private fun init(context: Context) {
         isLoading = true
-        val configuration = ConfigurationService.newLoader()
+        val configuration = ConfigurationService.Loader()
                 .setCache(File(context.externalCacheDir, ".cache"))
                 .setDatabase(File(context.getExternalFilesDir(null), "database"))
                 .loadFrom(File(context.getExternalFilesDir(null), "config.properties"))
-        configuration.edit().setDeviceName(Util.getDeviceName())
+        configuration.Editor().setDeviceName(Util.getDeviceName())
         try {
             FileUtils.cleanDirectory(configuration.temp)
         } catch (e: IOException) {
@@ -92,10 +91,10 @@ class LibraryHandler(context: Context, onLibraryLoaded: (LibraryHandler) -> Unit
             close()
         }
 
-        KeystoreHandler.newLoader().loadAndStore(configuration)
-        configuration.edit().persistLater()
-        Log.i(TAG, "loaded mConfiguration = " + configuration.newWriter().dumpToString())
-        Log.i(TAG, "storage space = " + configuration.storageInfo.dumpAvailableSpace())
+        KeystoreHandler.Loader().loadAndStore(configuration)
+        configuration.Editor().persistLater()
+        Log.i(TAG, "loaded mConfiguration = " + configuration.Writer().dumpToString())
+        Log.i(TAG, "storage space = " + configuration.getStorageInfo().dumpAvailableSpace())
         val syncthingClient = SyncthingClient(configuration)
         //TODO listen for device events, update device list
         val folderBrowser = syncthingClient.indexHandler.newFolderBrowser()
@@ -154,7 +153,8 @@ class LibraryHandler(context: Context, onLibraryLoaded: (LibraryHandler) -> Unit
     fun close() {
         syncthingClient {
             try {
-                it.indexHandler.eventBus.unregister(onIndexUpdateListener)
+                it.indexHandler.unregisterOnIndexRecordAcquiredListener(this::onIndexRecordAcquired)
+                it.indexHandler.unregisterOnFullIndexAcquiredListenersListener(this::onRemoteIndexAcquired)
             } catch (e: IllegalArgumentException) {
                 // ignored, no idea why this is thrown
             }

app/src/main/kotlin/net/syncthing/lite/library/UploadFileTask.kt

@@ -4,14 +4,14 @@ import android.app.ProgressDialog
 import android.content.Context
 import android.net.Uri
 import android.util.Log
+import kotlinx.coroutines.experimental.android.UI
+import kotlinx.coroutines.experimental.async
 import net.syncthing.java.bep.BlockPusher
 import net.syncthing.java.client.SyncthingClient
 import net.syncthing.java.core.utils.PathUtils
 import net.syncthing.lite.R
 import net.syncthing.lite.utils.Util
-import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.toast
-import org.jetbrains.anko.uiThread
 import java.io.IOException
 
 // TODO: this should be an IntentService with notification
@@ -69,12 +69,10 @@ class UploadFileTask(private val context: Context, private val syncthingClient:
     }
 
     private fun onProgress(observer: BlockPusher.FileUploadObserver) {
-        doAsync {
-            uiThread {
-                mProgressDialog.isIndeterminate = false
-                mProgressDialog.max = observer.dataSource().getSize().toInt()
-                mProgressDialog.progress = (observer.progress() * observer.dataSource().getSize()).toInt()
-            }
+        async(UI) {
+            mProgressDialog.isIndeterminate = false
+            mProgressDialog.max = observer.dataSource().getSize().toInt()
+            mProgressDialog.progress = (observer.progress() * observer.dataSource().getSize()).toInt()
         }
     }
 
@@ -83,21 +81,17 @@ class UploadFileTask(private val context: Context, private val syncthingClient:
             return
 
         Log.i(TAG, "Uploaded file $fileName to folder $syncthingFolder:$syncthingPath")
-        doAsync {
-            uiThread {
-                mProgressDialog.dismiss()
-                context.toast(R.string.toast_upload_complete)
-                onUploadCompleteListener()
-            }
+        async(UI) {
+            mProgressDialog.dismiss()
+            this@UploadFileTask.context.toast(R.string.toast_upload_complete)
+            onUploadCompleteListener()
         }
     }
 
     private fun onError() {
-        doAsync {
-            uiThread {
-                mProgressDialog.dismiss()
-                context.toast(R.string.toast_file_upload_failed)
-            }
+        async(UI) {
+            mProgressDialog.dismiss()
+            this@UploadFileTask.context.toast(R.string.toast_file_upload_failed)
         }
     }
-}
+}

app/src/main/kotlin/net/syncthing/lite/utils/Util.kt

@@ -5,16 +5,16 @@ import android.net.Uri
 import android.os.Build
 import android.provider.MediaStore
 import android.util.Log
-import com.google.common.base.Objects.equal
-import com.google.common.base.Strings.nullToEmpty
 import org.apache.commons.lang3.StringUtils.capitalize
 import java.io.File
 
 object Util {
 
+    private val Tag = "Util"
+
     fun getDeviceName(): String {
-        val manufacturer = nullToEmpty(Build.MANUFACTURER)
-        val model = nullToEmpty(Build.MODEL)
+        val manufacturer = Build.MANUFACTURER ?: ""
+        val model = Build.MODEL ?: ""
         val deviceName =
             if (model.startsWith(manufacturer)) {
                 capitalize(model)
@@ -26,12 +26,12 @@ object Util {
 
     fun getContentFileName(context: Context, contentUri: Uri): String {
         var fileName = File(contentUri.lastPathSegment).name
-        if (equal(contentUri.scheme, "content")) {
+        if (contentUri.scheme == "content") {
             context.contentResolver.query(contentUri, arrayOf(MediaStore.Images.Media.DATA), null, null, null)!!.use { cursor ->
                 val columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)
                 cursor.moveToFirst()
                 val path = cursor.getString(columnIndex)
-                Log.d("Main", "recovered 'content' uri real path = " + path)
+                Log.d(Tag, "recovered 'content' uri real path = " + path)
                 fileName = File(Uri.parse(path).lastPathSegment).name
             }
         }

app/src/main/res/values-de/strings.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="index_update_progress_message">Index wird aktualisiert...</string>
+    <string name="app_name">Syncthing Lite</string>
+    <string name="index_update_progress_message">Index wird aktualisiert…</string>
     <string name="folder_list_empty_message">Keine Ordner verfügbar</string>
     <string name="clear_local_cache_index_label">Lokalen Index und Cache löschen</string>
     <string name="update_remote_index_label">Index aktualisieren</string>
@@ -21,17 +21,17 @@
     <string name="directory_empty">Ordner ist leer</string>
     <string name="clear_cache_and_index_title">Lokalen Cache und Index löschen?</string>
     <string name="clear_cache_and_index_body">Gesamten lokalen Cache und Index löschen?</string>
-    <string name="index_update_folder">Index aktualisierung, Ordner</string>
-    <string name="index_update_percent_synchronized">% synchronisiert</string>
+    <string name="index_update_progress_label">Index aktualisierung für Ordner %1$s, %2$d\\% synchronisiert</string>
     <string name="loading_config_starting_syncthing_client">Konfiguartion wird geladen, Syncthing wird gestartet</string>
-    <string name="last_modified">- zuletzt modifiziert</string>
     <string name="last_modified_unknown">zuletzt modifiziert: unbekannt</string>
-    <string name="last_modified_known">zuletzt modifiziert:</string>
+    <string name="last_modified_time">Zuletzt modifiziert: %1$s</string>
     <string name="remove_device_title">Gerät entfernen:</string>
-    <string name="remove_device_body_1">Gerät</string>
-    <string name="remove_device_body_2">von den bekannten Geräten entfernen?</string>
-    <string name="device_import_success">Gerät erfolgreich importiert:</string>
-    <string name="device_already_known">Gerät ist bereits bekannt:</string>
+    <string name="remove_device_message">Gerät %1$s entfernen?</string>
+    <string name="device_import_success">Gerät %1$s erfolgreich importiert</string>
+    <string name="device_already_known">Gerät ist bereits bekannt $1%s</string>
     <string name="folders_label">Ordner</string>
     <string name="devices_label">Geräte</string>
-</resources>
+    <string name="folder_label_format">%1$s (%2$s)</string>
+    <string name="folder_content_info">%1$s, %2$d Dateien, %3$d Ordner</string>
+    <string name="file_info">%1$s, zuletzt modifiziert %2$s</string>
+</resources>

app/src/main/res/values/colors.xml

@@ -6,7 +6,4 @@
     <color name="accent">#FFC107</color>
     <color name="divider">#1F000000</color>
 
-    <color name="device_online_active">#ff99cc00</color>
-    <color name="device_online_inactive">#f43703</color>
-    <color name="device_offline">#aaaaaa</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name" translatable="false">Syncthing Lite</string>
+    <string name="app_name">Syncthing Lite</string>
     <string name="index_update_progress_message">Index update…</string>
     <string name="folder_list_empty_message">No folder available</string>
     <string name="clear_local_cache_index_label">Clear local cache/index</string>
@@ -21,17 +21,17 @@
     <string name="directory_empty">Directory is empty</string>
     <string name="clear_cache_and_index_title">Clear local cache and index?</string>
     <string name="clear_cache_and_index_body">Clear all local cache data and index data?</string>
-    <string name="index_update_folder">Index update, folder</string>
-    <string name="index_update_percent_synchronized">% synchronized</string>
+    <string name="index_update_progress_label">Index update for folder %1$s, %2$d% synchronized</string>
     <string name="loading_config_starting_syncthing_client">Loading config, starting syncthing client</string>
-    <string name="last_modified">- last modified</string>
-    <string name="last_modified_unknown">last modified: unknown</string>
-    <string name="last_modified_known">last modified:</string>
-    <string name="remove_device_title">Remove device:</string>
-    <string name="remove_device_body_1">Remove device</string>
-    <string name="remove_device_body_2">from list of known devices?</string>
-    <string name="device_import_success">Successfully imported device:</string>
-    <string name="device_already_known">Device already present:</string>
+    <string name="last_modified_unknown">Last modified: unknown</string>
+    <string name="last_modified_time">Last modified: %1$s</string>
+    <string name="remove_device_title">Remove device %1$s\?</string>
+    <string name="remove_device_message">Remove device %1$s from list of known devices?</string>
+    <string name="device_import_success">Successfully imported device %1$s</string>
+    <string name="device_already_known">Device already present %1$s</string>
     <string name="folders_label">Folders</string>
     <string name="devices_label">Devices</string>
+    <string name="folder_label_format">%1$s (%2$s)</string>
+    <string name="folder_content_info">%1$s, %2$d files, %3$d directories</string>
+    <string name="file_info">%1$s, last modified %2$s</string>
 </resources>

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.0'
+    ext.kotlin_version = '1.2.20'
     ext.support_version = '27.0.2'
     ext.build_tools_version = '3.0.1'
     ext.anko_version = '0.10.4'
@@ -14,9 +14,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$build_tools_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
     }
 }
 

prepare-release.bash

@@ -3,21 +3,27 @@
 set -e
 
 NEW_VERSION_NAME=$1
-OLD_VERSION_NAME=$(grep "versionName" "app/build.gradle" | awk '{print $2}')
+OLD_VERSION_NAME=$(grep "versionName" "app/build.gradle" | awk '{print $2}' | tr -d "\"")
 if [[ -z ${NEW_VERSION_NAME} ]]
 then
     echo "New version name is empty. Please set a new version. Current version: $OLD_VERSION_NAME"
     exit
 fi
 
-
 echo "
 
-Running Lint
+Updating Translations
 -----------------------------
 "
-./gradlew clean lintVitalRelease
-
+tx push -s
+# Force push/pull to make sure this is executed. Apparently tx only compares timestamps, not file
+# contents. So if a file was `touch`ed, it won't be updated by default.
+tx pull -a -f
+git add -A "app/src/main/res/values-*/strings.xml"
+if ! git diff --cached --exit-code;
+then
+    git commit -m "Imported translations"
+fi
 
 echo "
 
@@ -27,13 +33,22 @@ Updating Version
 OLD_VERSION_CODE=$(grep "versionCode" "app/build.gradle" -m 1 | awk '{print $2}')
 NEW_VERSION_CODE=$(($OLD_VERSION_CODE + 1))
 sed -i "s/versionCode $OLD_VERSION_CODE/versionCode $NEW_VERSION_CODE/" "app/build.gradle"
+sed -i "s/versionName \"$OLD_VERSION_NAME\"/versionName \"$NEW_VERSION_NAME\"/" "app/build.gradle"
+
+LIBRARY_NAME="com.github.Nutomic:syncthing-java"
+sed -i "s/$LIBRARY_NAME:$OLD_VERSION_NAME/$LIBRARY_NAME:$NEW_VERSION_NAME/" "app/build.gradle"
 
-OLD_VERSION_NAME=$(grep "versionName" "app/build.gradle" | awk '{print $2}')
-sed -i "s/$OLD_VERSION_NAME/\"$NEW_VERSION_NAME\"/" "app/build.gradle"
 git add "app/build.gradle"
 git commit -m "Version $NEW_VERSION_NAME"
 git tag ${NEW_VERSION_NAME}
 
+echo "
+
+Running Lint
+-----------------------------
+"
+./gradlew clean lintVitalRelease
+
 echo "
 Update ready.
 "