aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-11-15 11:31:15 -0500
committerSam Whited <sam@samwhited.com>2014-11-15 11:31:15 -0500
commitd2388a5a7ef5ede40de03d66cbad205b6510ef75 (patch)
treed88ab9bacf5af792bb238a408956998eb41ac5c4 /src/main/java
parent251f4d6d7f93da6d23c3422cf8eeece780789f45 (diff)
Remove extra status wrapper method
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Account.java4
-rw-r--r--src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java3
2 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index 85f967ec..10f2940c 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -399,10 +399,6 @@ public class Account extends AbstractEntity {
return this.avatar;
}
- public int getReadableStatusId() {
- return this.getStatus().getReadableId();
- }
-
public void activateGracePeriod() {
this.mEndGracePeriod = SystemClock.elapsedRealtime()
+ (Config.CARBON_GRACE_PERIOD * 1000);
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 82be4eed..dc818599 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -428,8 +428,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
}
} else {
if (this.mAccount.errorStatus()) {
- this.mAccountJid.setError(getString(this.mAccount
- .getReadableStatusId()));
+ this.mAccountJid.setError(getString(this.mAccount.getStatus().getReadableId()));
this.mAccountJid.requestFocus();
}
this.mStats.setVisibility(View.GONE);