From 8ff0039be41e51e71e42553ff558640a7b74ec13 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 11 Oct 2018 21:09:45 +0530 Subject: Update gradle and external dependencies (#429) * Update gradle and external dependencies - Switch away from deprecated compile directive - Remove explicit buildToolsVersion, is defined by the gradle plugin now - Fix build in SelectFolderActivity Signed-off-by: Harsh Shandilya * Upgrade gradle plugin and wrapper to latest alpha Signed-off-by: Harsh Shandilya * Don't use alpha gradle plugin Signed-off-by: Harsh Shandilya --- app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/src/main/java') diff --git a/app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt b/app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt index c615ce8c..86076d4a 100644 --- a/app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt @@ -11,7 +11,7 @@ import com.zeapo.pwdstore.utils.PasswordRepository // TODO more work needed, this is just an extraction from PgpHandler class SelectFolderActivity : AppCompatActivity() { - internal var passwordList: SelectFolderFragment? = null + private lateinit var passwordList: SelectFolderFragment override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -26,7 +26,7 @@ class SelectFolderActivity : AppCompatActivity() { val args = Bundle() args.putString("Path", PasswordRepository.getRepositoryDirectory(applicationContext).absolutePath) - passwordList?.arguments = args + passwordList.arguments = args supportActionBar?.show() @@ -55,7 +55,7 @@ class SelectFolderActivity : AppCompatActivity() { } private fun selectFolder() { - intent.putExtra("SELECTED_FOLDER_PATH", passwordList?.currentDir?.absolutePath) + intent.putExtra("SELECTED_FOLDER_PATH", passwordList.currentDir?.absolutePath) setResult(Activity.RESULT_OK, intent) finish() } -- cgit v1.2.3