diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:58:40 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:58:40 +0200 |
| commit | ee0264d98c9a348ea29d12796bed25f9ba1494fb (patch) | |
| tree | cc559348547e504d37a6efa7826ea0120070babe /src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceStub.java | |
| parent | d94eb9309b4ab3ee1dfd3cee637b47a52223e15b (diff) | |
| parent | 7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff) | |
Merge branch 'master' into introduce_cplus_database_version
Conflicts:
gradle/wrapper/gradle-wrapper.properties
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceStub.java')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceStub.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceStub.java b/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceStub.java index 858cdf08..7db99b75 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceStub.java +++ b/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceStub.java @@ -204,4 +204,9 @@ public class AxolotlServiceStub implements AxolotlService { public void onAdvancedStreamFeaturesAvailable(Account account) { } + + @Override + public void resetBrokenness() { + + } } |