mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-24 08:47:46 +00:00
325abe020a
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt # 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/notifications/AndroidAutoReplyReceiver.java # app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt # app/src/main/res/layout/activity_conversation_v2_action_bar.xml # app/src/main/res/layout/expiration_dialog.xml # app/src/main/res/menu/menu_conversation_expiration.xml # app/src/main/res/menu/menu_conversation_expiration_on.xml # app/src/main/res/values/strings.xml # libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt # libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt # libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java # libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java # libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java # 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/messaging/utilities/UpdateMessageBuilder.kt # libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt # libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
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