Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 14:17:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show manual setup after quick setup failure

Browse Source
This commit is contained in:
M66B
2021-07-03 18:26:32 +02:00
parent 8621788345
commit 97ec6f0bbf
2 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@@ -109,17 +109,7 @@ public class FragmentSetup extends FragmentBase {
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
setSubtitle(R.string.title_setup);
if (savedInstanceState == null) {
FragmentActivity activity = getActivity();
if (activity != null) {
Intent intent = activity.getIntent();
if (intent.hasExtra("manual")) {
manual = intent.getBooleanExtra("manual", false);
intent.removeExtra("manual");
activity.setIntent(intent);
}
}
} else
if (savedInstanceState != null)
manual = savedInstanceState.getBoolean("fair:manual");
textColorPrimary = Helper.resolveColor(getContext(), android.R.attr.textColorPrimary);
@@ -298,8 +288,7 @@ public class FragmentSetup extends FragmentBase {
@Override
public void onClick(View v) {
manual = !manual;
ibManual.setImageLevel(manual ? 0 /* less */ : 1 /* more */);
grpManual.setVisibility(manual ? View.VISIBLE : View.GONE);
updateManual();
}
});
@@ -312,8 +301,7 @@ public class FragmentSetup extends FragmentBase {
}
});
ibManual.setImageLevel(manual ? 0 /* less */ : 1 /* more */);
grpManual.setVisibility(manual ? View.VISIBLE : View.GONE);
updateManual();
btnAccount.setOnClickListener(new View.OnClickListener() {
@Override
@@ -534,6 +522,8 @@ public class FragmentSetup extends FragmentBase {
public void onResume() {
super.onResume();
updateManual();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
ConnectivityManager cm = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
cm.registerDefaultNetworkCallback(networkCallback);
@@ -579,6 +569,21 @@ public class FragmentSetup extends FragmentBase {
}
}
private void updateManual() {
FragmentActivity activity = getActivity();
if (activity != null) {
Intent intent = activity.getIntent();
if (intent.hasExtra("manual")) {
manual = intent.getBooleanExtra("manual", false);
intent.removeExtra("manual");
activity.setIntent(intent);
}
}
ibManual.setImageLevel(manual ? 0 /* less */ : 1 /* more */);
grpManual.setVisibility(manual ? View.VISIBLE : View.GONE);
}
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
for (int i = 0; i < permissions.length; i++)