diff options
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/utils')
7 files changed, 53 insertions, 56 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.kt b/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.kt index f52756f4..bf2fac94 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.kt +++ b/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.kt @@ -98,19 +98,23 @@ abstract class EntryRecyclerAdapter internal constructor(val values: ArrayList<P protected abstract fun getOnClickListener(holder: ViewHolder, pass: PasswordItem): View.OnClickListener // Create new views (invoked by the layout manager) - override fun onCreateViewHolder(parent: ViewGroup, - viewType: Int): ViewHolder { + override fun onCreateViewHolder( + parent: ViewGroup, + viewType: Int + ): ViewHolder { // create a new view val v = LayoutInflater.from(parent.context) .inflate(R.layout.password_row_layout, parent, false) return ViewHolder(v) } - // Provide a reference to the views for each data item - // Complex data items may need more than one view per item, and - // you provide access to all the views for a data item in a view holder - class ViewHolder(// each data item is just a string in this case - val view: View) : RecyclerView.ViewHolder(view) { + /* + Provide a reference to the views for each data item + Complex data items may need more than one view per item, and + you provide access to all the views for a data item in a view holder + each data item is just a string in this case + */ + class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) { val name: AppCompatTextView = view.findViewById(R.id.label) val type: AppCompatTextView = view.findViewById(R.id.type) val typeImage: AppCompatImageView = view.findViewById(R.id.type_image) diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.kt b/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.kt index 4f0ca4c8..cab1c052 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.kt +++ b/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.kt @@ -6,8 +6,9 @@ import com.zeapo.pwdstore.SelectFolderFragment import java.util.ArrayList -class FolderRecyclerAdapter(private val listener: SelectFolderFragment.OnFragmentInteractionListener, - values: ArrayList<PasswordItem> +class FolderRecyclerAdapter( + private val listener: SelectFolderFragment.OnFragmentInteractionListener, + values: ArrayList<PasswordItem> ) : EntryRecyclerAdapter(values) { override fun getOnClickListener(holder: ViewHolder, pass: PasswordItem): View.OnClickListener { @@ -16,5 +17,4 @@ class FolderRecyclerAdapter(private val listener: SelectFolderFragment.OnFragmen notifyItemChanged(holder.adapterPosition) } } - } diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/Otp.java b/app/src/main/java/com/zeapo/pwdstore/utils/Otp.java index cb949f2e..1a77c380 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/Otp.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/Otp.java @@ -1,29 +1,27 @@ package com.zeapo.pwdstore.utils; import android.util.Log; - -import org.apache.commons.codec.binary.Base32; - import java.math.BigInteger; import java.nio.ByteBuffer; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.util.Arrays; - import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; +import org.apache.commons.codec.binary.Base32; public class Otp { private static final Base32 BASE_32 = new Base32(); - private Otp() { - } + private Otp() {} - public static String calculateCode(String secret, long counter, String algorithm, String digits) { - String[] steam = {"2", "3", "4", "5", "6", "7", "8", "9", "B", "C", - "D", "F", "G", "H", "J", "K", "M", "N", "P", "Q", - "R", "T", "V", "W", "X", "Y"}; + public static String calculateCode( + String secret, long counter, String algorithm, String digits) { + String[] steam = { + "2", "3", "4", "5", "6", "7", "8", "9", "B", "C", "D", "F", "G", "H", "J", "K", "M", + "N", "P", "Q", "R", "T", "V", "W", "X", "Y" + }; String ALGORITHM = "Hmac" + algorithm.toUpperCase(); SecretKeySpec signingKey = new SecretKeySpec(BASE_32.decode(secret), ALGORITHM); diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.kt b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.kt index ddecd2da..f16e5111 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.kt +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.kt @@ -4,11 +4,11 @@ import com.zeapo.pwdstore.crypto.PgpActivity import java.io.File data class PasswordItem( - val name: String, - val parent: PasswordItem? = null, - val type: Char, - val file: File, - val rootDir: File + val name: String, + val parent: PasswordItem? = null, + val type: Char, + val file: File, + val rootDir: File ) : Comparable<PasswordItem> { val fullPathToParent = file.absolutePath .replace(rootDir.absolutePath, "") @@ -41,41 +41,40 @@ data class PasswordItem( @JvmStatic fun newCategory( - name: String, - file: File, - parent: PasswordItem, - rootDir: File + name: String, + file: File, + parent: PasswordItem, + rootDir: File ): PasswordItem { return PasswordItem(name, parent, TYPE_CATEGORY, file, rootDir) } @JvmStatic fun newCategory( - name: String, - file: File, - rootDir: File + name: String, + file: File, + rootDir: File ): PasswordItem { return PasswordItem(name, null, TYPE_CATEGORY, file, rootDir) } @JvmStatic fun newPassword( - name: String, - file: File, - parent: PasswordItem, - rootDir: File + name: String, + file: File, + parent: PasswordItem, + rootDir: File ): PasswordItem { return PasswordItem(name, parent, TYPE_PASSWORD, file, rootDir) } @JvmStatic fun newPassword( - name: String, - file: File, - rootDir: File + name: String, + file: File, + rootDir: File ): PasswordItem { return PasswordItem(name, null, TYPE_PASSWORD, file, rootDir) } } - -}
\ No newline at end of file +} diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.kt b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.kt index d7493a48..55ea3ddf 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.kt +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.kt @@ -12,9 +12,10 @@ import com.zeapo.pwdstore.R import java.util.ArrayList import java.util.TreeSet -class PasswordRecyclerAdapter(private val activity: PasswordStore, - private val listener: PasswordFragment.OnFragmentInteractionListener, - values: ArrayList<PasswordItem> +class PasswordRecyclerAdapter( + private val activity: PasswordStore, + private val listener: PasswordFragment.OnFragmentInteractionListener, + values: ArrayList<PasswordItem> ) : EntryRecyclerAdapter(values) { var actionMode: ActionMode? = null private var canEdit: Boolean = false diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt index 9e94e400..db37c547 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt @@ -32,7 +32,6 @@ open class PasswordRepository protected constructor() { (p2.type + p1.name).compareTo(p1.type + p2.name, ignoreCase = true) }); - companion object { @JvmStatic fun getSortOrder(settings: SharedPreferences): PasswordSortOrder { @@ -63,7 +62,6 @@ open class PasswordRepository protected constructor() { e.printStackTrace() return null } - } return repository } @@ -104,7 +102,6 @@ open class PasswordRepository protected constructor() { } catch (e: Exception) { e.printStackTrace() } - } else if (replace!!) { try { val uri = URIish(url) @@ -127,7 +124,6 @@ open class PasswordRepository protected constructor() { } catch (e: Exception) { e.printStackTrace() } - } } @@ -214,7 +210,7 @@ open class PasswordRepository protected constructor() { */ @JvmStatic fun getPasswords(path: File, rootDir: File, sortOrder: PasswordSortOrder): ArrayList<PasswordItem> { - //We need to recover the passwords then parse the files + // We need to recover the passwords then parse the files val passList = getFilesList(path) if (passList.size == 0) return ArrayList() @@ -259,10 +255,10 @@ open class PasswordRepository protected constructor() { /** * Sets a git config value * - * @param section config section name + * @param section config section name * @param subsection config subsection name - * @param name config name - * @param value the value to be set + * @param name config name + * @param value the value to be set */ @JvmStatic @Suppress("SameParameterValue") @@ -275,7 +271,6 @@ open class PasswordRepository protected constructor() { } catch (e: Exception) { e.printStackTrace() } - } } } diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/auth/Authenticator.kt b/app/src/main/java/com/zeapo/pwdstore/utils/auth/Authenticator.kt index 5139ef01..98d787f9 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/auth/Authenticator.kt +++ b/app/src/main/java/com/zeapo/pwdstore/utils/auth/Authenticator.kt @@ -8,8 +8,8 @@ import androidx.fragment.app.FragmentActivity import com.zeapo.pwdstore.R internal class Authenticator( - private val fragmentActivity: FragmentActivity, - private val callback: (AuthenticationResult) -> Unit + private val fragmentActivity: FragmentActivity, + private val callback: (AuthenticationResult) -> Unit ) { private val handler = Handler() private val biometricManager = BiometricManager.from(fragmentActivity) @@ -18,7 +18,7 @@ internal class Authenticator( override fun onAuthenticationError(errorCode: Int, errString: CharSequence) { super.onAuthenticationError(errorCode, errString) - Log.d(TAG,"Error: $errorCode: $errString") + Log.d(TAG, "Error: $errorCode: $errString") callback(AuthenticationResult.UnrecoverableError(errorCode, errString)) } |