nicolabs/Android-Password-Store
1
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store.git synced 2025-09-07 16:09:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stop relying on parent activties in subsettings

Browse source 
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
This commit is contained in:
Harsh Shandilya 2019-11-06 19:58:09 +05:30
parent be0d89958a
commit 3b758928ff
No known key found for this signature in database
GPG key ID: C2E74282C2133D62
3 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/AndroidManifest.xml
View file

@ -47,9 +47,7 @@
android:value="com.zeapo.pwdstore.PasswordStore" /> android:value="com.zeapo.pwdstore.PasswordStore" />
</activity> </activity>
<activity <activity android:name=".SshKeyGen">
android:name=".SshKeyGen"
android:parentActivityName=".PasswordStore">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value="com.zeapo.pwdstore.PasswordStore" /> android:value="com.zeapo.pwdstore.PasswordStore" />
@ -77,9 +75,7 @@
android:value="com.zeapo.pwdstore.PasswordStore" /> android:value="com.zeapo.pwdstore.PasswordStore" />
</activity> </activity>
<activity <activity android:name=".autofill.AutofillPreferenceActivity">
android:name=".autofill.AutofillPreferenceActivity"
android:parentActivityName=".PasswordStore">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value="com.zeapo.pwdstore.PasswordStore" /> android:value="com.zeapo.pwdstore.PasswordStore" />

11
app/src/main/java/com/zeapo/pwdstore/SshKeyGen.java
View file

@ -16,6 +16,7 @@ import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.text.InputType; import android.text.InputType;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
@ -61,6 +62,16 @@ public class SshKeyGen extends AppCompatActivity {
} }
} }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
// The back arrow in the action bar should act the same as the back button.
onBackPressed();
return true;
}
return super.onOptionsItemSelected(item);
}
// Invoked when 'Generate' button of SshKeyGenFragment clicked. Generates a // Invoked when 'Generate' button of SshKeyGenFragment clicked. Generates a
// private and public key, then replaces the SshKeyGenFragment with a // private and public key, then replaces the SshKeyGenFragment with a
// ShowSshKeyFragment which displays the public key. // ShowSshKeyFragment which displays the public key.

18
app/src/main/java/com/zeapo/pwdstore/autofill/AutofillPreferenceActivity.kt
View file

@ -14,8 +14,6 @@ import android.view.MenuItem
import android.view.View import android.view.View
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
import androidx.core.app.NavUtils
import androidx.core.app.TaskStackBuilder
import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
@ -86,18 +84,10 @@ class AutofillPreferenceActivity : AppCompatActivity() {
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
// in service, we CLEAR_TASK. then we set the recreate flag. // in service, we CLEAR_TASK. then we set the recreate flag.
// something of a hack, but w/o CLEAR_TASK, behaviour was unpredictable // something of a hack, but w/o CLEAR_TASK, behaviour was unpredictable
if (item.itemId == android.R.id.home) { return if (item.itemId == android.R.id.home) {
val upIntent = NavUtils.getParentActivityIntent(this) onBackPressed()
if (recreate) { true
TaskStackBuilder.create(this) } else super.onOptionsItemSelected(item)
.addNextIntentWithParentStack(upIntent!!)
.startActivities()
} else {
NavUtils.navigateUpTo(this, upIntent!!)
}
return true
}
return super.onOptionsItemSelected(item)
} }
fun showDialog(packageName: String?, appName: String?, isWeb: Boolean) { fun showDialog(packageName: String?, appName: String?, isWeb: Boolean) {