narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

display error status for missing internet permission

Browse source
This commit is contained in:
Daniel Gultsch 2016-08-19 21:47:08 +02:00
parent cf909afc60
commit 285d86b375
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/entities/Account.java
View file

@ -112,7 +112,8 @@ public class Account extends AbstractEntity {
STREAM_ERROR(true), STREAM_ERROR(true),
POLICY_VIOLATION(true), POLICY_VIOLATION(true),
REGISTRATION_PASSWORD_TOO_WEAK(true), REGISTRATION_PASSWORD_TOO_WEAK(true),
PAYMENT_REQUIRED(true); PAYMENT_REQUIRED(true),
MISSING_INTERNET_PERMISSION(true);
private final boolean isError; private final boolean isError;
@ -172,6 +173,8 @@ public class Account extends AbstractEntity {
return R.string.account_status_stream_error; return R.string.account_status_stream_error;
case PAYMENT_REQUIRED: case PAYMENT_REQUIRED:
return R.string.payment_required; return R.string.payment_required;
case MISSING_INTERNET_PERMISSION:
return R.string.missing_internet_permission;
default: default:
return R.string.account_status_unknown; return R.string.account_status_unknown;
} }

2
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -378,6 +378,8 @@ public class XmppConnection implements Runnable {
} }
} }
processStream(); processStream();
} catch (final java.lang.SecurityException e) {
this.changeStatus(Account.State.MISSING_INTERNET_PERMISSION);
} catch (final IncompatibleServerException e) { } catch (final IncompatibleServerException e) {
this.changeStatus(Account.State.INCOMPATIBLE_SERVER); this.changeStatus(Account.State.INCOMPATIBLE_SERVER);
} catch (final SecurityException e) { } catch (final SecurityException e) {

1
src/main/res/values/strings.xml
View file

@ -675,4 +675,5 @@
<string name="type_web">Web browser</string> <string name="type_web">Web browser</string>
<string name="type_console">Console</string> <string name="type_console">Console</string>
<string name="payment_required">Payment required</string> <string name="payment_required">Payment required</string>
<string name="missing_internet_permission">Missing internet permission</string>
</resources> </resources>