msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Request local network permissions inline

Browse Source
master
M66B 1 day ago
parent 797d06cbb0
commit 6f35b0778f
4 changed files with 126 additions and 18 deletions
Show Stats Download Patch File Download Diff File

47
app/src/main/java/eu/faircode/email/FragmentAccount.java
Unescape View File

@ -2167,19 +2167,54 @@ public class FragmentAccount extends FragmentBase {
}.execute(this, args, "account:delete");
}
private Snackbar lanSnackbar = null;
private void checkLan(String host) {
String msg = null;
if (!TextUtils.isEmpty(host))
boolean lan = false;
if (!TextUtils.isEmpty(host) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.CINNAMON_BUN)
try {
Context context = getContext();
InetAddress addr = InetAddress.getByName(host);
if ((addr.isSiteLocalAddress() || addr.isLinkLocalAddress() || addr.isLoopbackAddress()) &&
!Helper.hasPermission(context, Manifest.permission.ACCESS_LOCAL_NETWORK))
msg = context.getString(R.string.title_lan);
lan = (addr.isSiteLocalAddress() || addr.isLinkLocalAddress() || addr.isLoopbackAddress()) &&
!Helper.hasPermission(context, Manifest.permission.ACCESS_LOCAL_NETWORK);
} catch (Throwable ignored) {
}
etHost.setError(msg);
if (lan && lanSnackbar == null) {
lanSnackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_lan_required, Snackbar.LENGTH_INDEFINITE));
Helper.setSnackbarLines(lanSnackbar, 2);
lanSnackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override
public void onClick(View v) {
lanSnackbar.dismiss();
if (BuildConfig.PLAY_STORE_RELEASE)
Helper.viewFAQ(v.getContext(), 210);
else
requestPermissions(new String[]{Manifest.permission.ACCESS_LOCAL_NETWORK}, REQUEST_PERMISSIONS);
}
});
lanSnackbar.addCallback(new Snackbar.Callback() {
@Override
public void onShown(Snackbar sb) {
view.requestApplyInsets();
}
@Override
public void onDismissed(Snackbar transientBottomBar, int event) {
view.requestApplyInsets();
}
});
lanSnackbar.show();
} else if (!lan && lanSnackbar != null) {
lanSnackbar.dismiss();
lanSnackbar = null;
}
}
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
Editable e = etHost.getText();
checkLan(e == null ? null : e.toString());
}
private void setFolders(List<EntityFolder> _folders, EntityAccount account) {

48
app/src/main/java/eu/faircode/email/FragmentIdentity.java
Unescape View File

@ -33,6 +33,7 @@ import android.database.Cursor;
import android.graphics.Color;
import android.graphics.Paint;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.ContactsContract;
import android.text.Editable;
@ -1646,6 +1647,12 @@ public class FragmentIdentity extends FragmentBase {
}
}
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
Editable e = etHost.getText();
checkLan(e == null ? null : e.toString());
}
private void onDelete() {
Bundle args = new Bundle();
args.putLong("id", id);
@ -1708,19 +1715,48 @@ public class FragmentIdentity extends FragmentBase {
}.execute(this, args, "identity:signature");
}
private Snackbar lanSnackbar = null;
private void checkLan(String host) {
String msg = null;
if (!TextUtils.isEmpty(host))
boolean lan = false;
if (!TextUtils.isEmpty(host) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.CINNAMON_BUN)
try {
Context context = getContext();
InetAddress addr = InetAddress.getByName(host);
if ((addr.isSiteLocalAddress() || addr.isLinkLocalAddress() || addr.isLoopbackAddress()) &&
!Helper.hasPermission(context, Manifest.permission.ACCESS_LOCAL_NETWORK))
msg = context.getString(R.string.title_lan);
lan = (addr.isSiteLocalAddress() || addr.isLinkLocalAddress() || addr.isLoopbackAddress()) &&
!Helper.hasPermission(context, Manifest.permission.ACCESS_LOCAL_NETWORK);
} catch (Throwable ignored) {
}
etHost.setError(msg);
if (lan && lanSnackbar == null) {
lanSnackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_lan_required, Snackbar.LENGTH_INDEFINITE));
Helper.setSnackbarLines(lanSnackbar, 2);
lanSnackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override
public void onClick(View v) {
lanSnackbar.dismiss();
if (BuildConfig.PLAY_STORE_RELEASE)
Helper.viewFAQ(v.getContext(), 210);
else
requestPermissions(new String[]{Manifest.permission.ACCESS_LOCAL_NETWORK}, REQUEST_PERMISSIONS);
}
});
lanSnackbar.addCallback(new Snackbar.Callback() {
@Override
public void onShown(Snackbar sb) {
view.requestApplyInsets();
}
@Override
public void onDismissed(Snackbar transientBottomBar, int event) {
view.requestApplyInsets();
}
});
lanSnackbar.show();
} else if (!lan && lanSnackbar != null) {
lanSnackbar.dismiss();
lanSnackbar = null;
}
}
private void onPickUri(Intent intent) {

2
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -6410,6 +6410,8 @@ public class FragmentMessages extends FragmentBase
new SimpleTask<Boolean>() {
@Override
protected Boolean onExecute(Context context, Bundle args) throws Throwable {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.CINNAMON_BUN)
return false;
if (Helper.hasPermission(context, Manifest.permission.ACCESS_LOCAL_NETWORK))
return false;

47
app/src/main/java/eu/faircode/email/FragmentPop.java
Unescape View File

@ -1167,6 +1167,12 @@ public class FragmentPop extends FragmentBase {
}
}
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
Editable e = etHost.getText();
checkLan(e == null ? null : e.toString());
}
private void onImageSelected(Uri uri) {
final Context context = getContext();
@ -1225,19 +1231,48 @@ public class FragmentPop extends FragmentBase {
}.execute(this, args, "account:delete");
}
private Snackbar lanSnackbar = null;
private void checkLan(String host) {
String msg = null;
if (!TextUtils.isEmpty(host))
boolean lan = false;
if (!TextUtils.isEmpty(host) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.CINNAMON_BUN)
try {
Context context = getContext();
InetAddress addr = InetAddress.getByName(host);
if ((addr.isSiteLocalAddress() || addr.isLinkLocalAddress() || addr.isLoopbackAddress()) &&
!Helper.hasPermission(context, Manifest.permission.ACCESS_LOCAL_NETWORK))
msg = context.getString(R.string.title_lan);
lan = (addr.isSiteLocalAddress() || addr.isLinkLocalAddress() || addr.isLoopbackAddress()) &&
!Helper.hasPermission(context, Manifest.permission.ACCESS_LOCAL_NETWORK);
} catch (Throwable ignored) {
}
etHost.setError(msg);
if (lan && lanSnackbar == null) {
lanSnackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_lan_required, Snackbar.LENGTH_INDEFINITE));
Helper.setSnackbarLines(lanSnackbar, 2);
lanSnackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override
public void onClick(View v) {
lanSnackbar.dismiss();
if (BuildConfig.PLAY_STORE_RELEASE)
Helper.viewFAQ(v.getContext(), 210);
else
requestPermissions(new String[]{Manifest.permission.ACCESS_LOCAL_NETWORK}, REQUEST_PERMISSIONS);
}
});
lanSnackbar.addCallback(new Snackbar.Callback() {
@Override
public void onShown(Snackbar sb) {
view.requestApplyInsets();
}
@Override
public void onDismissed(Snackbar transientBottomBar, int event) {
view.requestApplyInsets();
}
});
lanSnackbar.show();
} else if (!lan && lanSnackbar != null) {
lanSnackbar.dismiss();
lanSnackbar = null;
}
}
private List<EntityFolder> getSwipeActions(Context context) {

Write Preview
Loading…
Cancel
Save