Add key import UI

Author: msfjarvis

app/src/main/java/dev/msfjarvis/aps/ui/onboarding/activity/OnboardingActivity.kt

@@ -5,17 +5,30 @@
 
 package dev.msfjarvis.aps.ui.onboarding.activity
 
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.commitNow
 import dagger.hilt.android.AndroidEntryPoint
 import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.ui.onboarding.fragments.GopenpgpKeySelectionFragment
+import dev.msfjarvis.aps.ui.onboarding.fragments.WelcomeFragment
 
 @AndroidEntryPoint
 class OnboardingActivity : AppCompatActivity(R.layout.activity_onboarding) {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     supportActionBar?.hide()
+    val import = intent.extras?.getBoolean(KEY_IMPORT) ?: false
+    supportFragmentManager.commitNow {
+      if (import) {
+        replace(R.id.fragment_first_run, GopenpgpKeySelectionFragment.newInstance())
+      } else {
+        replace(R.id.fragment_first_run, WelcomeFragment.newInstance())
+      }
+    }
   }
 
   override fun onBackPressed() {
@@ -25,4 +38,15 @@ class OnboardingActivity : AppCompatActivity(R.layout.activity_onboarding) {
       super.onBackPressed()
     }
   }
+
+  companion object {
+    private const val KEY_IMPORT = "KEY_IMPORT"
+
+    fun createKeyImportIntent(context: Context) =
+      Intent(
+          context,
+          OnboardingActivity::class.java,
+        )
+        .putExtra(KEY_IMPORT, true)
+  }
 }

app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/WelcomeFragment.kt

@@ -31,4 +31,8 @@ class WelcomeFragment : Fragment(R.layout.fragment_welcome) {
       startActivity(Intent(requireContext(), SettingsActivity::class.java))
     }
   }
+
+  companion object {
+    fun newInstance() = WelcomeFragment()
+  }
 }

app/src/main/java/dev/msfjarvis/aps/ui/settings/PasswordSettings.kt

@@ -17,10 +17,12 @@ import de.Maxr1998.modernpreferences.helpers.editText
 import de.Maxr1998.modernpreferences.helpers.onCheckedChange
 import de.Maxr1998.modernpreferences.helpers.onClick
 import de.Maxr1998.modernpreferences.helpers.onSelectionChange
+import de.Maxr1998.modernpreferences.helpers.pref
 import de.Maxr1998.modernpreferences.helpers.singleChoice
 import de.Maxr1998.modernpreferences.preferences.CheckBoxPreference
 import de.Maxr1998.modernpreferences.preferences.choice.SelectionItem
 import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.ui.onboarding.activity.OnboardingActivity
 import dev.msfjarvis.aps.util.extensions.getString
 import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import dev.msfjarvis.aps.util.extensions.unsafeLazy
@@ -118,6 +120,14 @@ class PasswordSettings(private val activity: FragmentActivity) : SettingsProvide
         summaryRes = R.string.pref_copy_summary
         defaultValue = false
       }
+      pref(PreferenceKeys.IMPORT_GPG_KEY) {
+        titleRes = R.string.pref_import_gpg_key_title
+        summaryRes = R.string.pref_import_gpg_key_summary
+        onClick {
+          activity.startActivity(OnboardingActivity.createKeyImportIntent(activity))
+          true
+        }
+      }
     }
   }
 }

app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt

@@ -82,4 +82,5 @@ object PreferenceKeys {
   const val PROXY_PASSWORD = "proxy_password"
 
   const val REBASE_ON_PULL = "rebase_on_pull"
+  const val IMPORT_GPG_KEY = "import_gpg_key"
 }

app/src/main/res/layout/activity_onboarding.xml

@@ -11,7 +11,6 @@
 
   <androidx.fragment.app.FragmentContainerView
     android:id="@+id/fragment_first_run"
-    android:name="dev.msfjarvis.aps.ui.onboarding.fragments.WelcomeFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:tag="welcome_fragment" />

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

@@ -111,6 +111,8 @@
   <string name="pref_import_ssh_key_title">Import SSH key</string>
   <string name="pref_ssh_keygen_title">Generate SSH key pair</string>
   <string name="pref_ssh_see_key_title">View generated public SSH key</string>
+  <string name="pref_import_gpg_key_title">Import GPG key</string>
+  <string name="pref_import_gpg_key_summary">Add a GPG key to the internal keyring</string>
   <string name="pref_git_delete_repo_title">Delete repository</string>
   <string name="pref_dialog_delete_title">Clear repository</string>
   <string name="pref_category_general_title">General</string>