From 483e8d9310aea2e8bb88f77b89c0affdb8794427 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 12 Oct 2018 19:36:04 +0530 Subject: Migrate to AndroidX (#430) * 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 * Migrate to AndroidX https://developer.android.com/jetpack/androidx/ Signed-off-by: Harsh Shandilya * Upgrade AndroidX dependencies to stable release Signed-off-by: Harsh Shandilya * Enable Jetifier Signed-off-by: Harsh Shandilya * SelectFolderFragment: Fix build Signed-off-by: Harsh Shandilya --- .../java/com/zeapo/pwdstore/crypto/PgpActivity.kt | 39 +++++++++++++++++----- 1 file changed, 31 insertions(+), 8 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/crypto') diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt index 4afc6e19..74295e6a 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt @@ -4,22 +4,39 @@ import android.annotation.SuppressLint import android.app.Activity import android.app.AlertDialog import android.app.PendingIntent -import android.content.* +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.content.Intent +import android.content.IntentSender +import android.content.SharedPreferences import android.graphics.Typeface import android.os.AsyncTask import android.os.Bundle -import android.os.Handler -import android.os.SystemClock import android.os.ConditionVariable +import android.os.Handler import android.preference.PreferenceManager -import android.support.v7.app.AppCompatActivity import android.text.TextUtils import android.text.format.DateUtils import android.text.method.PasswordTransformationMethod import android.util.Log -import android.view.* -import android.widget.* -import com.zeapo.pwdstore.* +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuItem +import android.view.MotionEvent +import android.view.View +import android.view.WindowManager +import android.widget.Button +import android.widget.CheckBox +import android.widget.LinearLayout +import android.widget.ProgressBar +import android.widget.TextView +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.zeapo.pwdstore.PasswordEntry +import com.zeapo.pwdstore.R +import com.zeapo.pwdstore.UserPreference +import com.zeapo.pwdstore.pwgenDialogFragment import com.zeapo.pwdstore.utils.Otp import kotlinx.android.synthetic.main.decrypt_layout.* import kotlinx.android.synthetic.main.encrypt_layout.* @@ -27,7 +44,13 @@ import org.apache.commons.io.FileUtils import org.openintents.openpgp.IOpenPgpService2 import org.openintents.openpgp.OpenPgpError import org.openintents.openpgp.util.OpenPgpApi -import org.openintents.openpgp.util.OpenPgpApi.* +import org.openintents.openpgp.util.OpenPgpApi.ACTION_DECRYPT_VERIFY +import org.openintents.openpgp.util.OpenPgpApi.RESULT_CODE +import org.openintents.openpgp.util.OpenPgpApi.RESULT_CODE_ERROR +import org.openintents.openpgp.util.OpenPgpApi.RESULT_CODE_SUCCESS +import org.openintents.openpgp.util.OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED +import org.openintents.openpgp.util.OpenPgpApi.RESULT_ERROR +import org.openintents.openpgp.util.OpenPgpApi.RESULT_INTENT import org.openintents.openpgp.util.OpenPgpServiceConnection import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream -- cgit v1.2.3