mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-10-31 08:58:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue in biometric authentication in SecurityPreferenceFragment.

Browse Source
This commit is contained in:
Alex Ning
2020-09-23 12:01:50 +08:00
parent 3aa36ff74f
commit 05ea54a7c9
3 changed files with 1 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

371
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java
View File

@@ -625,35 +625,9 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
} }
fab.show(); fab.show();
} }
/*if (isInLazyMode) {
if (position == sectionsPagerAdapter.getCurrentLazyModeFragmentPosition()) {
sectionsPagerAdapter.resumeLazyMode();
} else {
sectionsPagerAdapter.pauseLazyMode();
}
}*/
sectionsPagerAdapter.displaySortTypeInToolbar(); sectionsPagerAdapter.displaySortTypeInToolbar();
} }
}); });
/*viewPager2.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
@Override
public void onPageSelected(int position) {
if (mAccessToken != null) {
if (showBottomAppBar) {
bottomNavigationView.performShow();
}
fab.show();
}
if (isInLazyMode) {
if (position == sectionsPagerAdapter.getCurrentLazyModeFragmentPosition()) {
sectionsPagerAdapter.resumeLazyMode();
} else {
sectionsPagerAdapter.pauseLazyMode();
}
}
sectionsPagerAdapter.displaySortTypeInToolbar();
}
});*/
loadSubscriptions(); loadSubscriptions();
@@ -993,10 +967,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
} }
private class SectionsPagerAdapter extends FragmentStateAdapter { private class SectionsPagerAdapter extends FragmentStateAdapter {
/*private PostFragment tab1;
private PostFragment tab2;
private PostFragment tab3;*/
SectionsPagerAdapter(FragmentManager fm, Lifecycle lifecycle) { SectionsPagerAdapter(FragmentManager fm, Lifecycle lifecycle) {
super(fm, lifecycle); super(fm, lifecycle);
} }
@@ -1116,56 +1086,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
return 3; return 3;
} }
/*@Override
public CharSequence getPageTitle(int position) {
if (mAccessToken == null) {
switch (position) {
case 0:
return getString(R.string.popular);
case 1:
return getString(R.string.all);
}
} else {
switch (position) {
case 0:
return mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, getString(R.string.home));
case 1:
return mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_TITLE, getString(R.string.popular));
case 2:
return mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_3_TITLE, getString(R.string.all));
}
}
return null;
}*/
/*@NonNull
@Override
public Object instantiateItem(@NonNull ViewGroup container, int position) {
Fragment fragment = (Fragment) super.instantiateItem(container, position);
if (mAccessToken == null) {
switch (position) {
case 0:
tab2 = (PostFragment) fragment;
break;
case 1:
tab3 = (PostFragment) fragment;
}
} else {
switch (position) {
case 0:
tab1 = (PostFragment) fragment;
break;
case 1:
tab2 = (PostFragment) fragment;
break;
case 2:
tab3 = (PostFragment) fragment;
}
}
displaySortTypeInToolbar();
return fragment;
}*/
@Nullable @Nullable
private PostFragment getCurrentFragment() { private PostFragment getCurrentFragment() {
if (viewPager2 == null || fragmentManager == null) { if (viewPager2 == null || fragmentManager == null) {
@@ -1183,23 +1103,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
if (currentFragment != null) { if (currentFragment != null) {
return currentFragment.handleKeyDown(keyCode); return currentFragment.handleKeyDown(keyCode);
} }
/*if (mAccessToken == null) {
switch (viewPager2.getCurrentItem()) {
case 0:
return tab2.handleKeyDown(keyCode);
case 1:
return tab3.handleKeyDown(keyCode);
}
} else {
switch (viewPager2.getCurrentItem()) {
case 0:
return tab1.handleKeyDown(keyCode);
case 1:
return tab2.handleKeyDown(keyCode);
case 2:
return tab3.handleKeyDown(keyCode);
}
}*/
return false; return false;
} }
@@ -1208,23 +1111,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
if (currentFragment != null) { if (currentFragment != null) {
return currentFragment.startLazyMode(); return currentFragment.startLazyMode();
} }
/*if (mAccessToken == null) {
switch (viewPager2.getCurrentItem()) {
case 0:
return tab2.startLazyMode();
case 1:
return tab3.startLazyMode();
}
} else {
switch (viewPager2.getCurrentItem()) {
case 0:
return tab1.startLazyMode();
case 1:
return tab2.startLazyMode();
case 2:
return tab3.startLazyMode();
}
}*/
return false; return false;
} }
@@ -1236,133 +1122,13 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
((PostFragment) fragment).stopLazyMode(); ((PostFragment) fragment).stopLazyMode();
} }
} }
/*if (mAccessToken == null) {
switch (getCurrentLazyModeFragmentPosition()) {
case 0:
tab2.stopLazyMode();
break;
case 1:
tab3.stopLazyMode();
break;
}
} else {
switch (getCurrentLazyModeFragmentPosition()) {
case 0:
tab1.stopLazyMode();
break;
case 1:
tab2.stopLazyMode();
break;
case 2:
tab3.stopLazyMode();
break;
}
}*/
} }
void resumeLazyMode() {
PostFragment currentFragment = getCurrentFragment();
if (currentFragment != null) {
currentFragment.resumeLazyMode(false);
}
/*if (mAccessToken == null) {
switch (getCurrentLazyModeFragmentPosition()) {
case 0:
tab2.resumeLazyMode(false);
break;
case 1:
tab3.resumeLazyMode(false);
break;
}
} else {
switch (getCurrentLazyModeFragmentPosition()) {
case 0:
tab1.resumeLazyMode(false);
break;
case 1:
tab2.resumeLazyMode(false);
break;
case 2:
tab3.resumeLazyMode(false);
break;
}
}*/
}
void pauseLazyMode() {
PostFragment currentFragment = getCurrentFragment();
if (currentFragment != null) {
currentFragment.pauseLazyMode(false);
}
/*if (mAccessToken == null) {
switch (getCurrentLazyModeFragmentPosition()) {
case 0:
tab2.pauseLazyMode(false);
break;
case 1:
tab3.pauseLazyMode(false);
}
} else {
switch (getCurrentLazyModeFragmentPosition()) {
case 0:
tab1.pauseLazyMode(false);
break;
case 1:
tab2.pauseLazyMode(false);
break;
case 2:
tab3.pauseLazyMode(false);
}
}*/
}
/*int getCurrentLazyModeFragmentPosition() {
if (mAccessToken == null) {
if (!isInLazyMode) {
return -1;
} else if (tab2 != null && tab2.isInLazyMode()) {
return 0;
} else if (tab3 != null && tab3.isInLazyMode()) {
return 1;
} else {
return -1;
}
} else {
if (!isInLazyMode) {
return -1;
} else if (tab1 != null && tab1.isInLazyMode()) {
return 0;
} else if (tab2 != null && tab2.isInLazyMode()) {
return 1;
} else if (tab3 != null && tab3.isInLazyMode()) {
return 2;
} else {
return -1;
}
}
}*/
int getCurrentPostType() { int getCurrentPostType() {
PostFragment currentFragment = getCurrentFragment(); PostFragment currentFragment = getCurrentFragment();
if (currentFragment != null) { if (currentFragment != null) {
return currentFragment.getPostType(); return currentFragment.getPostType();
} }
/*if (mAccessToken == null) {
if (viewPager2.getCurrentItem() == 0) {
return tab2.getPostType();
} else {
return tab3.getPostType();
}
} else {
switch (viewPager2.getCurrentItem()) {
case 1:
return tab2.getPostType();
case 2:
return tab3.getPostType();
default:
return tab1.getPostType();
}
}*/
return PostDataSource.TYPE_SUBREDDIT; return PostDataSource.TYPE_SUBREDDIT;
} }
@@ -1371,24 +1137,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
if (currentFragment != null) { if (currentFragment != null) {
currentFragment.changeSortType(sortType); currentFragment.changeSortType(sortType);
} }
/*if (mAccessToken == null) {
if (viewPager2.getCurrentItem() == 0) {
tab2.changeSortType(sortType);
} else {
tab3.changeSortType(sortType);
}
} else {
switch (viewPager2.getCurrentItem()) {
case 0:
tab1.changeSortType(sortType);
break;
case 1:
tab2.changeSortType(sortType);
break;
case 2:
tab3.changeSortType(sortType);
}
}*/
displaySortTypeInToolbar(); displaySortTypeInToolbar();
} }
@@ -1397,34 +1145,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
if (currentFragment != null) { if (currentFragment != null) {
currentFragment.refresh(); currentFragment.refresh();
} }
/*if (mAccessToken == null) {
if (viewPager2.getCurrentItem() == 0) {
if (tab2 != null) {
tab2.refresh();
}
} else {
if (tab3 != null) {
tab3.refresh();
}
}
} else {
switch (viewPager2.getCurrentItem()) {
case 0:
if (tab1 != null) {
tab1.refresh();
}
break;
case 1:
if (tab2 != null) {
tab2.refresh();
}
break;
case 2:
if (tab3 != null) {
tab3.refresh();
}
}
}*/
} }
void changeNSFW(boolean nsfw) { void changeNSFW(boolean nsfw) {
@@ -1434,15 +1154,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
((PostFragment) fragment).changeNSFW(nsfw); ((PostFragment) fragment).changeNSFW(nsfw);
} }
} }
/*if (tab1 != null) {
tab1.changeNSFW(nsfw);
}
if (tab2 != null) {
tab2.changeNSFW(nsfw);
}
if (tab3 != null) {
tab3.changeNSFW(nsfw);
}*/
} }
void changePostLayout(int postLayout) { void changePostLayout(int postLayout) {
@@ -1450,39 +1161,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
if (currentFragment != null) { if (currentFragment != null) {
currentFragment.changePostLayout(postLayout); currentFragment.changePostLayout(postLayout);
} }
/*if (mAccessToken == null) {
if (viewPager2.getCurrentItem() == 0) {
if (tab2 != null) {
mPostLayoutSharedPreferences.edit().putInt(SharedPreferencesUtils.POST_LAYOUT_POPULAR_POST, postLayout).apply();
tab2.changePostLayout(postLayout);
}
} else {
if (tab3 != null) {
mPostLayoutSharedPreferences.edit().putInt(SharedPreferencesUtils.POST_LAYOUT_ALL_POST, postLayout).apply();
tab3.changePostLayout(postLayout);
}
}
} else {
switch (viewPager2.getCurrentItem()) {
case 0:
if (tab1 != null) {
mPostLayoutSharedPreferences.edit().putInt(SharedPreferencesUtils.POST_LAYOUT_FRONT_PAGE_POST, postLayout).apply();
tab1.changePostLayout(postLayout);
}
break;
case 1:
if (tab2 != null) {
mPostLayoutSharedPreferences.edit().putInt(SharedPreferencesUtils.POST_LAYOUT_POPULAR_POST, postLayout).apply();
tab2.changePostLayout(postLayout);
}
break;
case 2:
if (tab3 != null) {
mPostLayoutSharedPreferences.edit().putInt(SharedPreferencesUtils.POST_LAYOUT_ALL_POST, postLayout).apply();
tab3.changePostLayout(postLayout);
}
}
}*/
} }
void goBackToTop() { void goBackToTop() {
@@ -1490,21 +1168,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
if (currentFragment != null) { if (currentFragment != null) {
currentFragment.goBackToTop(); currentFragment.goBackToTop();
} }
/*if (viewPager2.getCurrentItem() == 0) {
if (mAccessToken != null && tab1 != null) {
tab1.goBackToTop();
} else if (tab2 != null) {
tab2.goBackToTop();
}
} else if (viewPager2.getCurrentItem() == 1) {
if (mAccessToken != null && tab2 != null) {
tab2.goBackToTop();
} else if (tab3 != null) {
tab3.goBackToTop();
}
} else {
tab3.goBackToTop();
}*/
} }
void displaySortTypeInToolbar() { void displaySortTypeInToolbar() {
@@ -1513,40 +1176,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
SortType sortType = currentFragment.getSortType(); SortType sortType = currentFragment.getSortType();
Utils.displaySortTypeInToolbar(sortType, toolbar); Utils.displaySortTypeInToolbar(sortType, toolbar);
} }
/*switch (viewPager2.getCurrentItem()) {
case 0:
if (mAccessToken != null) {
if (tab1 != null) {
SortType sortType = tab1.getSortType();
Utils.displaySortTypeInToolbar(sortType, toolbar);
}
} else {
if (tab2 != null) {
SortType sortType = tab2.getSortType();
Utils.displaySortTypeInToolbar(sortType, toolbar);
}
}
break;
case 1:
if (mAccessToken != null) {
if (tab2 != null) {
SortType sortType = tab2.getSortType();
Utils.displaySortTypeInToolbar(sortType, toolbar);
}
} else {
if (tab3 != null) {
SortType sortType = tab3.getSortType();
Utils.displaySortTypeInToolbar(sortType, toolbar);
}
}
break;
case 2:
if (tab3 != null) {
SortType sortType = tab3.getSortType();
Utils.displaySortTypeInToolbar(sortType, toolbar);
}
break;
}*/
} }
} }
} }

11
app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/NavigationDrawerRecyclerViewAdapter.java
View File

@@ -200,23 +200,12 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re
Executor executor = ContextCompat.getMainExecutor(appCompatActivity); Executor executor = ContextCompat.getMainExecutor(appCompatActivity);
BiometricPrompt biometricPrompt = new BiometricPrompt(appCompatActivity, BiometricPrompt biometricPrompt = new BiometricPrompt(appCompatActivity,
executor, new BiometricPrompt.AuthenticationCallback() { executor, new BiometricPrompt.AuthenticationCallback() {
@Override
public void onAuthenticationError(int errorCode,
@NonNull CharSequence errString) {
super.onAuthenticationError(errorCode, errString);
}
@Override @Override
public void onAuthenticationSucceeded( public void onAuthenticationSucceeded(
@NonNull BiometricPrompt.AuthenticationResult result) { @NonNull BiometricPrompt.AuthenticationResult result) {
super.onAuthenticationSucceeded(result); super.onAuthenticationSucceeded(result);
openAccountSection(((NavHeaderViewHolder) holder).dropIconImageView); openAccountSection(((NavHeaderViewHolder) holder).dropIconImageView);
} }
@Override
public void onAuthenticationFailed() {
super.onAuthenticationFailed();
}
}); });
BiometricPrompt.PromptInfo promptInfo = new BiometricPrompt.PromptInfo.Builder() BiometricPrompt.PromptInfo promptInfo = new BiometricPrompt.PromptInfo.Builder()

16
app/src/main/java/ml/docilealligator/infinityforreddit/Settings/SecurityPreferenceFragment.java
View File

@@ -56,21 +56,7 @@ public class SecurityPreferenceFragment extends PreferenceFragmentCompat {
BiometricPrompt biometricPrompt = new BiometricPrompt(SecurityPreferenceFragment.this, BiometricPrompt biometricPrompt = new BiometricPrompt(SecurityPreferenceFragment.this,
executor, new BiometricPrompt.AuthenticationCallback() { executor, new BiometricPrompt.AuthenticationCallback() {
@Override @Override
public void onAuthenticationError(int errorCode, public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
@NonNull CharSequence errString) {
super.onAuthenticationError(errorCode, errString);
activity.onBackPressed();
}
@Override
public void onAuthenticationSucceeded(
@NonNull BiometricPrompt.AuthenticationResult result) {
super.onAuthenticationSucceeded(result);
}
@Override
public void onAuthenticationFailed() {
super.onAuthenticationFailed();
activity.onBackPressed(); activity.onBackPressed();
} }
}); });