kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Run a treewide reformat (#908)

Browse source 
Co-authored-by: Harsh Shandilya <msfjarvis@gmail.com>
This commit is contained in:
Fabian Henneke 2020-07-01 12:51:05 +02:00 committed by GitHub
parent 83ba0a3ed5
commit c5a93b8b81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt
View file

@ -20,7 +20,6 @@ import com.github.ajalt.timberkt.e
import com.zeapo.pwdstore.R import com.zeapo.pwdstore.R
import com.zeapo.pwdstore.databinding.DecryptLayoutBinding import com.zeapo.pwdstore.databinding.DecryptLayoutBinding
import com.zeapo.pwdstore.model.PasswordEntry import com.zeapo.pwdstore.model.PasswordEntry
import com.zeapo.pwdstore.utils.Otp
import com.zeapo.pwdstore.utils.PreferenceKeys import com.zeapo.pwdstore.utils.PreferenceKeys
import com.zeapo.pwdstore.utils.viewBinding import com.zeapo.pwdstore.utils.viewBinding
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -32,7 +31,6 @@ import me.msfjarvis.openpgpktx.util.OpenPgpServiceConnection
import org.openintents.openpgp.IOpenPgpService2 import org.openintents.openpgp.IOpenPgpService2
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.File import java.io.File
import java.util.Date
import kotlin.time.ExperimentalTime import kotlin.time.ExperimentalTime
import kotlin.time.seconds import kotlin.time.seconds

4
app/src/main/java/com/zeapo/pwdstore/git/config/SshApiSessionFactory.java
View file

@ -110,11 +110,11 @@ public class SshApiSessionFactory extends JschConfigSessionFactory {
*/ */
public static class IdentityBuilder { public static class IdentityBuilder {
private final SshAuthenticationConnection connection; private final SshAuthenticationConnection connection;
private final BaseGitActivity callingActivity;
private final SharedPreferences settings;
private SshAuthenticationApi api; private SshAuthenticationApi api;
private String keyId, description, alg; private String keyId, description, alg;
private byte[] publicKey; private byte[] publicKey;
private final BaseGitActivity callingActivity;
private final SharedPreferences settings;
/** /**
* Construct a new IdentityBuilder * Construct a new IdentityBuilder

1
app/src/main/java/com/zeapo/pwdstore/utils/Otp.kt
View file

@ -18,6 +18,7 @@ import kotlin.experimental.and
object Otp { object Otp {
private val BASE_32 = Base32() private val BASE_32 = Base32()
private val STEAM_ALPHABET = "23456789BCDFGHJKMNPQRTVWXY".toCharArray() private val STEAM_ALPHABET = "23456789BCDFGHJKMNPQRTVWXY".toCharArray()
init { init {
check(STEAM_ALPHABET.size == 26) check(STEAM_ALPHABET.size == 26)
} }

1
app/src/main/java/com/zeapo/pwdstore/utils/UriTotpFinder.kt
View file

@ -11,6 +11,7 @@ import android.net.Uri
* [Uri] backed TOTP URL parser. * [Uri] backed TOTP URL parser.
*/ */
class UriTotpFinder : TotpFinder { class UriTotpFinder : TotpFinder {
override fun findSecret(content: String): String? { override fun findSecret(content: String): String? {
content.split("\n".toRegex()).forEach { line -> content.split("\n".toRegex()).forEach { line ->
if (line.startsWith("otpauth://totp/")) { if (line.startsWith("otpauth://totp/")) {

6
app/src/main/res/drawable/ic_qr_code_scanner.xml
View file

@ -3,7 +3,7 @@
android:height="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24"> android:viewportHeight="24">
<path <path
android:pathData="M9.5,6.5v3h-3v-3H9.5M11,5H5v6h6V5L11,5zM9.5,14.5v3h-3v-3H9.5M11,13H5v6h6V13L11,13zM17.5,6.5v3h-3v-3H17.5M19,5h-6v6h6V5L19,5zM13,13h1.5v1.5H13V13zM14.5,14.5H16V16h-1.5V14.5zM16,13h1.5v1.5H16V13zM13,16h1.5v1.5H13V16zM14.5,17.5H16V19h-1.5V17.5zM16,16h1.5v1.5H16V16zM17.5,14.5H19V16h-1.5V14.5zM17.5,17.5H19V19h-1.5V17.5zM22,7h-2V4h-3V2h5V7zM22,22v-5h-2v3h-3v2H22zM2,22h5v-2H4v-3H2V22zM2,2v5h2V4h3V2H2z" android:fillColor="#000000"
android:fillColor="#000000"/> android:pathData="M9.5,6.5v3h-3v-3H9.5M11,5H5v6h6V5L11,5zM9.5,14.5v3h-3v-3H9.5M11,13H5v6h6V13L11,13zM17.5,6.5v3h-3v-3H17.5M19,5h-6v6h6V5L19,5zM13,13h1.5v1.5H13V13zM14.5,14.5H16V16h-1.5V14.5zM16,13h1.5v1.5H16V13zM13,16h1.5v1.5H13V16zM14.5,17.5H16V19h-1.5V17.5zM16,16h1.5v1.5H16V16zM17.5,14.5H19V16h-1.5V14.5zM17.5,17.5H19V19h-1.5V17.5zM22,7h-2V4h-3V2h5V7zM22,22v-5h-2v3h-3v2H22zM2,22h5v-2H4v-3H2V22zM2,2v5h2V4h3V2H2z" />
</vector> </vector>

2
app/src/main/res/layout/password_row_layout.xml
View file

@ -31,8 +31,8 @@
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:textSize="18sp" android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/type_image"
app:layout_constraintEnd_toStartOf="@id/child_count" app:layout_constraintEnd_toStartOf="@id/child_count"
app:layout_constraintStart_toEndOf="@id/type_image"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="FILE_NAME" /> tools:text="FILE_NAME" />