diff options
| author | Christian S <christian@pix-art.de> | 2016-05-05 19:30:53 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-05-05 19:30:53 +0200 |
| commit | 27ccf4e08f2547f372196bf381915ed1e6204ad8 (patch) | |
| tree | 05749ea85a8421b77daf3c04d316c958895e3601 /src/main/java/eu/siacs/conversations/entities | |
| parent | 626d0d3260d792843bebf2a8b8a62c1a026dd314 (diff) | |
| parent | 6e0ec9b924173bd2afe3b87646e3b1f4e907b7c1 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Account.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java index 2c0ec7ff9..1bcb15c07 100644 --- a/src/main/java/eu/siacs/conversations/entities/Account.java +++ b/src/main/java/eu/siacs/conversations/entities/Account.java @@ -478,10 +478,10 @@ public class Account extends AbstractEntity { try { return keys.getLong(KEY_PGP_ID); } catch (JSONException e) { - return -1; + return 0; } } else { - return -1; + return 0; } } |