Emojireactions by claudds · Pull Request #156 · jacobrs/Signal-Android

claudds · 2018-04-14T19:35:12Z

Messages can now be appended with an emoji reaction (both incoming and outgoing).

Messages are given a hashed id upon sending/receiving which consists of the hashed timestamp down to milliseconds. When an emoji reaction for a message is sent, this timestamp is appended to the message and it is associated to the proper message upon receipt.
closes: #88

…ong pressing a conversation item

…id unique to each message but accessible to both sender and recipient. Class uses the simple, existing Base64 encoding method to create the hash. Also includes test for the Base64 mehtod.

…oming messages, and shows when only one message is selected at a time

… the emoji menu button on long press

…ced emoji drawer listener for emoji reactions #107

…droid into emojireactions

…emented new EmojiReactionDatabase, and updated MessageHashedId Defined a hashId value in the MmsSmsDatabase and subclasses, as well as in MessageRecord and subclasses. Created EmojiReactionDatabase to hold reaction items and keys to hashed column in Sms- and MmsDatabase. Updated MessagedHashId to take MessageRecord parameter instead of Address, as accessing one's own address as a sender is not straightforward. The hash will now be done with the message body and date sent timestamp instead, which will still produce a unique id for each message.

@claudds

…ceived. Pair Programming @claudds

…hen an emoji is selected in the popup and call message sender

…atabase

…ven the message hashed id.

…droid into emojireactions

@claudds

…sation items. Attempted to set up the setting of the reactions in the db when reacting. Found where receiving incoming messages happens. Peer programmed with @claudds @samantha-kerr #88 #108

@samantha-kerr

…database methods and initial hashing method. Peer programmed with @samantha-kerr @claudds #88 #108 #153

@samantha-kerr

… for recieved emoji reactions. Pear programmed with @samantha-kerr @claudds #88 #108

…r testing purposed. #88

…ng message reaction to be able notify conversation listeners of changes #88 #108

…on a timestamp to associate an emoji to a sent message

…arching for specific messages #153

… a delete for reaction messages on the sender side. #88 #108 #153

…droid into emojireactions

…receiving emoji reaction #109

…eactionDatabase.

benrs · 2018-04-16T01:24:13Z

src/org/thoughtcrime/securesms/database/MmsDatabase.java

    contentValues.put(ADDRESS, message.getRecipient().getAddress().serialize());
    contentValues.put(DELIVERY_RECEIPT_COUNT, Stream.of(earlyDeliveryReceipts.values()).mapToLong(Long::longValue).sum());
    contentValues.put(READ_RECEIPT_COUNT, Stream.of(earlyReadReceipts.values()).mapToLong(Long::longValue).sum());
+    contentValues.put(HASHED_ID, generateHashedId(message.getSentTimeMillis()));


What happens if you send a multi length message (160+ characters)? Will this still work based off of the sent time?

Is a multi length message a message that gets auto sent as two+ bubbles?

A message split shouldn't happen, messages are just cut off at 2000 characters.

benrs · 2018-04-16T01:28:32Z

test/androidTest/java/org/thoughtcrime/securesms/espressotests/EmojiReactionTest.java

+
+        //check if the emoji drawer is closed & proper emoji is displayed
+        Expectations.checkIsNotDisplayed(R.id.emoji_drawer);
+        Expectations.checkIsDisplayed(R.id.emoji_reaction, "🏡");


Can we test against the unicode string instead of an actual emoji? Seems kinda weird to push this to a repo.

Tried to replace this with unicode text; however, the actual emoji animation is saved in the database as the "text" part of the view, thus espresso's matchers do not find any matches for unicode text

BDSchoeler · 2018-04-16T19:19:54Z

src/org/thoughtcrime/securesms/database/EmojiReactionDatabase.java

+        SQLiteDatabase db = databaseHelper.getWritableDatabase();
+        db.beginTransaction();
+        try {
+            String hashedId = messageRecord.getHashedId();


good usage of try/catch/finally!

BDSchoeler · 2018-04-16T19:22:06Z

src/org/thoughtcrime/securesms/database/EmojiReactionDatabase.java

+            }
+
+            db.setTransactionSuccessful();
+        }catch(Exception e){


I would change catching exception e to catching the specific exceptions instead, to make it more clear what kind of exception these operations can throw/and to not squash other unexpected exceptions.

…eaction setter methods.

claudds and others added 30 commits April 4, 2018 13:30

#106 #88 implemented emoji menu button in the action mode menu when l…

22d487f

…ong pressing a conversation item

#108 #109 Added a MessageHashedId class to use for creating a hashed …

ad80790

…id unique to each message but accessible to both sender and recipient. Class uses the simple, existing Base64 encoding method to create the hash. Also includes test for the Base64 mehtod.

#106 #88 fixed menu button so that it shows for both outgoing and inc…

6bcf0e6

…oming messages, and shows when only one message is selected at a time

#88 #109 added in preliminary espresso test to test the appearance of…

902bb92

… the emoji menu button on long press

Implemented action for when emoji reaction option is clicked. Introdu…

800f9bc

…ced emoji drawer listener for emoji reactions #107

#88 #106 removed ability to react to outgoing emojis

394e503

Merge branch 'emojireactions' of https://github.com/jacobrs/Signal-An…

7bd2dcf

…droid into emojireactions

#88 #108 Saving the hashed id generated when a message is sent and re…

0db8617

…ceived. Pair Programming @claudds

#88 #108 fixed syntax error in emoji database causing app to crash

0d5a54e

#88 #108 added in new kind of outgoing message. Create one of these w…

fb21d1e

…hen an emoji is selected in the popup and call message sender

#88 #108 adding method to get a message by its hashed id in the sms d…

4168f3e

…atabase

#88 #108 added get message by hashed id method in mms database

303fcbe

#88 #108 Added getter method to get the emoji reaction saved in DB gi…

0e42b2a

…ven the message hashed id.

Merge branch 'emojireactions' of https://github.com/jacobrs/Signal-An…

58503f7

…droid into emojireactions

Added containers for emoji reactions to both sent and recieved conver…

5f1fc91

…sation items. Attempted to set up the setting of the reactions in the db when reacting. Found where receiving incoming messages happens. Peer programmed with @claudds @samantha-kerr #88 #108

Got reactions to display after reacting (For the sender only). Fixed …

1814f58

…database methods and initial hashing method. Peer programmed with @samantha-kerr @claudds #88 #108 #153

Made message body gone if it is a reaction. Implemented a new handler…

601ed8e

… for recieved emoji reactions. Pear programmed with @samantha-kerr @claudds #88 #108

Made changes to database queries, pushing for remote testing #88 #108

2d3dc9b

Changed sizing of reaction emojis on display #153

e1e900d

Small changes for testing purposes #88 #108

7e1d452

Changed how messageRecords are hashed for their hashedId. Commited fo…

5afe4cc

…r testing purposed. #88

Added comments everywhere for readability and added threadId in setti…

ede27d7

…ng message reaction to be able notify conversation listeners of changes #88 #108

#108 #88 trying to hash sender + timestamp rather than message body

83efc44

#108 #88 trying to get sending to work with only time

e43093d

#108 #88 cleaning up message hashed id class. now uses sha1 encoding …

73d6f45

…on a timestamp to associate an emoji to a sent message

Made sure that emoji reactions disappear with message bubbles when se…

e1a55a5

…arching for specific messages #153

#108 #88 deleting a message now deletes any associated emoji reactions

2b5cad8

Changed the string to see if a message is a messageReaction and added…

06b6530

… a delete for reaction messages on the sender side. #88 #108 #153

Merge branch 'emojireactions' of https://github.com/jacobrs/Signal-An…

eaac5b0

…droid into emojireactions

Repository owner deleted a comment Apr 14, 2018

Added unit tests that verify the set calls when sending an emoji and …

096234c

…receiving emoji reaction #109

Repository owner deleted a comment Apr 15, 2018

samantha-kerr added 2 commits April 15, 2018 19:46

#88 #109 #156 Added unit tests for classes MessageHashedId and EmojiR…

48a3f37

…eactionDatabase.

#88 #109 #156 Fixing some static analysis issues for unti tests

ffcdb12

benrs reviewed Apr 16, 2018

View reviewed changes

benrs approved these changes Apr 16, 2018

View reviewed changes

BDSchoeler approved these changes Apr 16, 2018

View reviewed changes

#88 #108 #156 PR Fix: Changed exception type in try-catch block for r…

4480440

…eaction setter methods.

samantha-kerr merged commit 9987265 into 4.15.0 Apr 16, 2018

jacobrs deleted the emojireactions branch April 16, 2018 20:24

samantha-kerr restored the emojireactions branch April 17, 2018 22:32

samantha-kerr deleted the emojireactions branch April 18, 2018 00:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Emojireactions#156

Emojireactions#156
samantha-kerr merged 40 commits into4.15.0from
emojireactions

claudds commented Apr 14, 2018 •

edited

Loading

Uh oh!

benrs Apr 16, 2018

Uh oh!

lori-dalkin Apr 16, 2018

Uh oh!

samantha-kerr Apr 16, 2018

Uh oh!

benrs Apr 16, 2018

Uh oh!

claudds Apr 16, 2018

Uh oh!

BDSchoeler Apr 16, 2018

Uh oh!

BDSchoeler Apr 16, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

claudds commented Apr 14, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

benrs Apr 16, 2018

Choose a reason for hiding this comment

Uh oh!

lori-dalkin Apr 16, 2018

Choose a reason for hiding this comment

Uh oh!

samantha-kerr Apr 16, 2018

Choose a reason for hiding this comment

Uh oh!

benrs Apr 16, 2018

Choose a reason for hiding this comment

Uh oh!

claudds Apr 16, 2018

Choose a reason for hiding this comment

Uh oh!

BDSchoeler Apr 16, 2018

Choose a reason for hiding this comment

Uh oh!

BDSchoeler Apr 16, 2018

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

claudds commented Apr 14, 2018 •

edited

Loading