Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

First draft of OMEMO #1256

Draft
wants to merge 49 commits into
base: master
Choose a base branch
from
Draft

First draft of OMEMO #1256

wants to merge 49 commits into from

Commits on Sep 9, 2018

  1. Playing around with Smack OMEMO 

    Sending not implemented yet; Receiving works only if user subscription was granted.
The way the OMEMO API and our own application is designed, it's not easy to build
something abstracted following the Coder interface. But since Smack 4.4 will dismantle
the current OMEMO API...

Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Sep 9, 2018
    Configuration menu
    Copy the full SHA
    9c00af7 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2018

  1. Merge branch 'master' into feature/omemo 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    98e1016 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2019

  1. Merge branch 'master' into feature/omemo 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    dade92c View commit details
    Browse the repository at this point in the history

  2. Merge branch master 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    0353ef1 View commit details
    Browse the repository at this point in the history

  3. Merge branch master 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    77e371f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into feature/omemo

    @daniele-athome
    daniele-athome committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    e90be41 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2019

  1. Merge branch master 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 21, 2019
    Configuration menu
    Copy the full SHA
    707a651 View commit details
    Browse the repository at this point in the history

  2. Merge branch master 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 21, 2019
    Configuration menu
    Copy the full SHA
    c7b7111 View commit details
    Browse the repository at this point in the history

  3. Begin refactoring of Coder to accomodate for OMEMO needs 

    Actually it's not just because of OMEMO, the aim here is to create
a more clear abstraction for encrypting/decrypting.

Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 21, 2019
    Configuration menu
    Copy the full SHA
    cdb15a3 View commit details
    Browse the repository at this point in the history

  4. Comments 

    [skip ci]

Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 21, 2019
    Configuration menu
    Copy the full SHA
    3ffc778 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2019

  1. Some tests with OMEMO send/receive 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 22, 2019
    Configuration menu
    Copy the full SHA
    06f6d5b View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2019

  1. Better handle decryption errors 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    e31673c View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2019

  1. Handle encryption fallback in a proper manner 

    Also update security flags of a message when falling back to basic encryption

Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    9a92053 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2019

  1. Extract trust information for OMEMO 

    Also move TRUST_* constants to Keyring

Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 25, 2019
    Configuration menu
    Copy the full SHA
    df0f3f0 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2019

  1. Fix using OMEMO with yourself 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    fbe15a8 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2019

  1. Time to deprecated stuff from years ago 

    [skip ci]

Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    e81cd19 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2019

  1. Fix processing encrypted chat state group message 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed May 2, 2019
    Configuration menu
    Copy the full SHA
    ba70eed View commit details
    Browse the repository at this point in the history

Commits on May 25, 2019

  1. Update Gradle tools 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed May 25, 2019
    Configuration menu
    Copy the full SHA
    216c9ac View commit details
    Browse the repository at this point in the history

  2. Working incoming OMEMO processing via some dirty workarounds 

    Because of the way smack-omemo is designed, processing and decryption
can't be separated, so a few dirty tricks were put in place to make
this work.

Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed May 25, 2019
    Configuration menu
    Copy the full SHA
    c423e8a View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2019

  1. Upgrade Smack to 4.3.4 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    8a9e45b View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2019

  1. Crash test scenario 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    dfd4e7f View commit details
    Browse the repository at this point in the history

  2. More or less working OMEMO between clients 

    And a few optimizations.

Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    9b94523 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2019

  1. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    192ef2e View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2019

  1. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Jun 16, 2019
    Configuration menu
    Copy the full SHA
    719eaff View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Jun 16, 2019
    Configuration menu
    Copy the full SHA
    ba76ed9 View commit details
    Browse the repository at this point in the history

  3. Unused code 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Jun 16, 2019
    Configuration menu
    Copy the full SHA
    c8e92bb View commit details
    Browse the repository at this point in the history

  4. Remove name from key UID (close #1179) 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Jun 16, 2019
    Configuration menu
    Copy the full SHA
    d97b0ab View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Jun 16, 2019
    Configuration menu
    Copy the full SHA
    b1c6087 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2019

  1. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    70e134f View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2019

  1. Init instance only when sure 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Aug 11, 2019
    Configuration menu
    Copy the full SHA
    691b4a3 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. Merge branch 'master' into feature/omemo 

    # Conflicts:
#	app/src/main/java/org/kontalk/ui/GroupInfoFragment.java
    @daniele-athome
    daniele-athome committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    29b5f71 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2020

  1. Merge branch 'master' into feature/omemo 

    # Conflicts:
#	app/src/main/java/org/kontalk/crypto/PGPCoder.java
#	app/src/main/java/org/kontalk/provider/Keyring.java
#	app/src/main/java/org/kontalk/service/msgcenter/DiscoverInfoListener.java
#	app/src/main/java/org/kontalk/service/msgcenter/DiscoverItemsListener.java
#	app/src/main/java/org/kontalk/service/msgcenter/MessageCenterService.java
#	app/src/main/java/org/kontalk/service/msgcenter/PushDiscoverItemsListener.java
#	app/src/main/java/org/kontalk/util/MessageUtils.java
    @daniele-athome
    daniele-athome committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    bc245c8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    ec16b56 View commit details
    Browse the repository at this point in the history

  3. Handle disconnections during OMEMO stuff (#1260) 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    5330d97 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2020

  1. Merge branch 'master' into feature/omemo 

    # Conflicts:
#	app/src/androidTest/java/org/kontalk/provider/UsersProviderTest.java
#	app/src/main/java/org/kontalk/data/Contact.java
    @daniele-athome
    daniele-athome committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    32167b2 View commit details
    Browse the repository at this point in the history

  2. Cache contact security flags 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    780ad2f View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2020

  1. Revert ZXing to 3.3.3 to allow API level < 24 

    Sorry people, I missed this...

Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    035d47b View commit details
    Browse the repository at this point in the history

  2. Upgrade dependencies 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    992fb68 View commit details
    Browse the repository at this point in the history

  3. Upgrade dependencies 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    a3667c2 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2020

  1. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    dc27c67 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    b25bef4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    498369c View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2020

  1. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    3da589c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    251c4e6 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2020

  1. Merge branch 'master' into feature/omemo

    @daniele-athome
    daniele-athome committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    ebfa4fc View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. Merge branch 'master' into feature/omemo 

    # Conflicts:
#	app/src/main/java/org/kontalk/data/Contact.java
#	app/src/main/java/org/kontalk/service/msgcenter/MessageCenterService.java
#	app/src/main/java/org/kontalk/service/msgcenter/MessageListener.java
#	app/src/main/java/org/kontalk/service/msgcenter/RegenerateKeyPairListener.java
#	app/src/main/java/org/kontalk/sync/Syncer.java
#	app/src/main/java/org/kontalk/util/MessageUtils.java
    @daniele-athome
    daniele-athome committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    e4c6ac8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/omemo 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    3e135a8 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. Preliminary porting to Smack 4.4 

    Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    58fdd35 View commit details
    Browse the repository at this point in the history

  2. Preliminary porting to Smack 4.4 

    Brings Java to 1.8 and minimum API level to 19

Signed-off-by: Daniele Ricci <[email protected]>
    @daniele-athome
    daniele-athome committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    aa8c9b1 View commit details
    Browse the repository at this point in the history