mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 10:05:15 +00:00

History

0x330a 07e1d80654 Merge remote-tracking branch 'upstream/dev' into disappearing-messages # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt # app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt # app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java # app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseComponent.kt # app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt # app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt # app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt # app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java # app/src/main/res/layout/activity_conversation_v2.xml # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt # libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt # libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt # libsignal/protobuf/SignalService.proto # libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt		2023-07-18 11:39:03 +10:00
..
Makefile	refactor: performance improvements in batch message processing, synchronized cache access and audible message notifications.	2021-09-29 15:29:24 +10:00
README.md	update protobufs	2021-01-25 11:27:05 +11:00
SignalService.proto	Merge remote-tracking branch 'upstream/dev' into disappearing-messages	2023-07-18 11:39:03 +10:00
Utils.proto	refactor: performance improvements in batch message processing, synchronized cache access and audible message notifications.	2021-09-29 15:29:24 +10:00
WebSocketResources.proto	proto updated	2021-06-09 11:03:18 +10:00

README.md

Generating Protobuf Files

Android requires protobuf 2.5.0 to auto generate the files. To generate the files just run make.

Note: Protobuf 2.5.0 will have to be aliased to protoc25.

Mac Installation Instructions

Protobuf can be installed using brew but this will only get versions > 3. To install protobuf 2.5.0 follow these steps:

wget https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.bz2
tar xvf protobuf-2.5.0.tar.bz2
cd protobuf-2.5.0
./configure CC=clang CXX=clang++ CXXFLAGS='-std=c++11 -stdlib=libc++ -O3 -g' LDFLAGS='-stdlib=libc++' LIBS="-lc++ -lc++abi" --disable-shared --prefix='<PATH TO A DIRECTORY>'
make -j4
make install

This will compile and build the binary at PATH TO A DIRECTORY which you specified in the ./configure command. Next you need to move it to your local bin:

cd <PATH WHERE YOU INSTALLED PROTOBUF 2.5>/bin
chmod +x ./protoc
mv ./protoc /usr/local/bin/protoc25