TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 05:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into calls

Browse Source 
# Conflicts:
#	app/build.gradle
#	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/conversation/v2/messages/ControlMessageView.kt
#	app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
#	app/src/main/res/values/strings.xml
#	gradle.properties
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPollerV2.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPollerV2.kt
#	libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
This commit is contained in:
jubb
2022-02-08 09:58:57 +11:00
parent ae30d2f070 07ccc2696b
commit 38164ea23d
187 changed files with 5438 additions and 3061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libsignal/src/test/java/org/session/libsignal/ExampleUnitTest.kt
View File

@@ -1,17 +0,0 @@
package org.session.libsignal
import org.junit.Test
import org.junit.Assert.*
/**
* Example local unit test, which will execute on the development machine (host).
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
class ExampleUnitTest {
@Test
fun addition_isCorrect() {
assertEquals(4, 2 + 2)
}
}