diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1ea69e4192..29bb87816f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -117,6 +117,9 @@
android:name="org.thoughtcrime.securesms.loki.activities.SettingsActivity"
android:screenOrientation="portrait"
android:theme="@style/Session.DarkTheme.NoActionBar" />
+
diff --git a/captures/network.loki.messenger_2020.05.28_16.39.li b/captures/network.loki.messenger_2020.05.28_16.39.li
new file mode 100644
index 0000000000..87ba95e64f
Binary files /dev/null and b/captures/network.loki.messenger_2020.05.28_16.39.li differ
diff --git a/res/drawable/accent_dot.xml b/res/drawable/accent_dot.xml
new file mode 100644
index 0000000000..2d5ffdfe0c
--- /dev/null
+++ b/res/drawable/accent_dot.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/ic_question_mark.xml b/res/drawable/ic_question_mark.xml
new file mode 100644
index 0000000000..131c8d77f9
--- /dev/null
+++ b/res/drawable/ic_question_mark.xml
@@ -0,0 +1,12 @@
+
+
+
diff --git a/res/drawable/paths_building_dot.xml b/res/drawable/paths_building_dot.xml
new file mode 100644
index 0000000000..e5da8b82c0
--- /dev/null
+++ b/res/drawable/paths_building_dot.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 1bafe1d074..bdfdc479fc 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -40,6 +40,22 @@
android:layout_centerVertical="true"
android:layout_marginLeft="64dp" />
+
+
+
+
+
+
diff --git a/res/layout/activity_path.xml b/res/layout/activity_path.xml
new file mode 100644
index 0000000000..6dd8dff316
--- /dev/null
+++ b/res/layout/activity_path.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/menu/menu_path.xml b/res/menu/menu_path.xml
new file mode 100644
index 0000000000..eaeb00d586
--- /dev/null
+++ b/res/menu/menu_path.xml
@@ -0,0 +1,10 @@
+
+
diff --git a/res/values-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml
index 4cd286a8bb..07440848c8 100644
--- a/res/values-sw400dp/dimens.xml
+++ b/res/values-sw400dp/dimens.xml
@@ -5,6 +5,7 @@
44dp
48dp
72dp
+ 72dp
300dp
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 374020fd95..e46a888f01 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,6 +28,7 @@
#1F1F1F
#1B1B1B
#212121
+ #FFCE3A
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 16ed23c8fe..c5659f4ce1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -33,6 +33,10 @@
8dp
4dp
8dp
+ 8dp
+ 56dp
+ 8dp
+ 16dp
8dp
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bf813e01c0..38f1f41b42 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1699,7 +1699,7 @@
Enter your Session ID
Pick your display name
- This will be your name when you use Session.
+ This will be your name when you use Session. It can be your real name, an alias, or anything else you like.
Enter a display name
Please pick a display name
Please pick a display name that consists of only a-z, A-Z, 0-9 and _ characters
@@ -1708,9 +1708,9 @@
Push Notifications
There are two ways Session can handle push notifications. Make sure to read the descriptions carefully before you choose.
Firebase Cloud Messaging
- Session will use the Firebase Cloud Messaging service to receive push notifications. You\’ll be notified of new messages reliably and immediately. Using FCM means that this device will communicate directly with Google\’s servers to retrieve push notifications, which will expose your IP address to Google. Your messages will still be onion-routed and end-to-end encrypted, so the contents of your messages will remain completely private.
+ Session will use the Firebase Cloud Messaging service to receive push notifications. You\'ll be notified of new messages reliably and immediately. Using FCM means that your IP address and device token will be exposed to Google. If you use push notifications for other apps, this will already be the case. Your IP address and device token will also be exposed to Loki, but your messages will still be onion-routed and end-to-end encrypted, so the contents of your messages will remain completely private.
Background Polling
- Session will occasionally check for new messages in the background. This guarantees full privacy protection, but message notifications may be significantly delayed.
+ Session will occasionally check for new messages in the background. This guarantees full metadata protection, but message notifications may be significantly delayed.
Recommended
Please Pick an Option
@@ -1724,9 +1724,9 @@
Push Notifications
Session now features two ways to handle push notifications. Make sure to read the descriptions carefully before you choose.
Firebase Cloud Messaging
- Session will use the Firebase Cloud Messaging service to receive push notifications. You\’ll be notified of new messages reliably and immediately. Using FCM means that this device will communicate directly with Google\’s servers to retrieve push notifications, which will expose your IP address to Google. Your messages will still be onion-routed and end-to-end encrypted, so the contents of your messages will remain completely private.
+ Session will use the Firebase Cloud Messaging service to receive push notifications. You\'ll be notified of new messages reliably and immediately. Using FCM means that your IP address and device token will be exposed to Google. If you use push notifications for other apps, this will already be the case. Your IP address and device token will also be exposed to Loki, but your messages will still be onion-routed and end-to-end encrypted, so the contents of your messages will remain completely private.
Background Polling
- Session will occasionally check for new messages in the background. This guarantees full privacy protection, but message notifications may be significantly delayed.
+ Session will occasionally check for new messages in the background. This guarantees full metadata protection, but message notifications may be significantly delayed.
Recommended
Please Pick an Option
Confirm
@@ -1734,13 +1734,21 @@
Your Recovery Phrase
Meet your recovery phrase
- Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don\’t give it to anyone. To restore your Session ID, launch Session and tap Continue your Session.
+ Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don\’t give it to anyone.
Hold to reveal
Secure your account by saving your recovery phrase
Tap and hold the redacted words to reveal your recovery phrase, then store it safely to secure your Session ID.
Make sure to store your recovery phrase in a safe place
+ Path
+ Session hides your IP by bouncing your messages through several Service Nodes in Session\'s decentralized network. These are the Service Nodes currently being used by your device:
+ You
+ Guard Node
+ Service Node
+ Destination
+ Rebuild Path
+
New Session
Enter Session ID
Scan QR Code
@@ -1796,7 +1804,7 @@
Notification Strategy
Use FCM
- Using Firebase Cloud Messaging allows for more reliable push notifications, but exposes your IP to Google.
+ Using Firebase Cloud Messaging allows for more reliable push notifications, but exposes your IP and device token to Google and Loki.
Waiting for Authorization
Device Link Authorized
@@ -1820,7 +1828,7 @@
This is your recovery phrase. With it, you can restore or migrate your Session ID to a new device.
Clear All Data
- This will permanently delete your Session ID, including all messages, sessions, and contacts.
+ This will permanently delete your messages, sessions, and contacts.
QR Code
View My QR Code
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index 5d018bb56d..cca17e57e5 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -181,6 +181,8 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
String userPublicKey = TextSecurePreferences.getLocalNumber(this);
LokiSessionResetImplementation sessionResetImpl = new LokiSessionResetImplementation(this);
if (userPublicKey != null) {
+ LokiSwarmAPI.Companion.configureIfNeeded(apiDB);
+ LokiAPI.Companion.configureIfNeeded(userPublicKey, apiDB, broadcaster);
FriendRequestProtocol.Companion.configureIfNeeded(apiDB, userPublicKey);
MentionsManager.Companion.configureIfNeeded(userPublicKey, threadDB, userDB);
SessionMetaProtocol.Companion.configureIfNeeded(apiDB, userPublicKey);
diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index e47442c04c..93990a1c33 100644
--- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -82,8 +82,9 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
private static final int lokiV6 = 27;
private static final int lokiV7 = 28;
private static final int lokiV8 = 29;
+ private static final int lokiV9 = 30;
- private static final int DATABASE_VERSION = lokiV8; // Loki - onUpgrade(...) must be updated to use Loki version numbers if Signal makes any database changes
+ private static final int DATABASE_VERSION = lokiV9; // Loki - onUpgrade(...) must be updated to use Loki version numbers if Signal makes any database changes
private static final String DATABASE_NAME = "signal.db";
private final Context context;
@@ -131,7 +132,9 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
}
db.execSQL(StickerDatabase.CREATE_TABLE);
- db.execSQL(LokiAPIDatabase.getCreateSwarmCacheTableCommand());
+ db.execSQL(LokiAPIDatabase.getCreateSnodePoolCacheCommand());
+ db.execSQL(LokiAPIDatabase.getCreatePathCacheCommand());
+ db.execSQL(LokiAPIDatabase.getCreateSwarmCacheCommand());
db.execSQL(LokiAPIDatabase.getCreateLastMessageHashValueTableCommand());
db.execSQL(LokiAPIDatabase.getCreateReceivedMessageHashValuesTableCommand());
db.execSQL(LokiAPIDatabase.getCreateGroupChatAuthTokenTableCommand());
@@ -582,6 +585,11 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
db.execSQL(LokiAPIDatabase.getCreateSessionRequestTimestampTableCommand());
}
+ if (oldVersion < lokiV9) {
+ db.execSQL(LokiAPIDatabase.getCreateSnodePoolCacheCommand());
+ db.execSQL(LokiAPIDatabase.getCreatePathCacheCommand());
+ }
+
db.setTransactionSuccessful();
} finally {
db.endTransaction();
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index 927fbfbc50..fdfc11a0b0 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -101,6 +101,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
profileButton.hexEncodedPublicKey = hexEncodedPublicKey
profileButton.update()
profileButton.setOnClickListener { openSettings() }
+ pathStatusViewContainer.setOnClickListener { showPath() }
// Set up seed reminder view
val isMasterDevice = (TextSecurePreferences.getMasterHexEncodedPublicKey(this) == null)
val hasViewedSeed = TextSecurePreferences.getHasViewedSeed(this)
@@ -262,6 +263,11 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
show(intent)
}
+ private fun showPath() {
+ val intent = Intent(this, PathActivity::class.java)
+ show(intent)
+ }
+
override fun createNewPrivateChat() {
val intent = Intent(this, CreatePrivateChatActivity::class.java)
show(intent)
diff --git a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
new file mode 100644
index 0000000000..d0030f483e
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
@@ -0,0 +1,261 @@
+package org.thoughtcrime.securesms.loki.activities
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.Uri
+import android.os.Bundle
+import android.os.Handler
+import android.support.v4.content.LocalBroadcastManager
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.Gravity
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.RelativeLayout
+import android.widget.TextView
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_path.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.loki.utilities.animateSizeChange
+import org.thoughtcrime.securesms.loki.utilities.fadeIn
+import org.thoughtcrime.securesms.loki.utilities.fadeOut
+import org.thoughtcrime.securesms.loki.utilities.getColorWithID
+import org.whispersystems.signalservice.loki.api.onionrequests.OnionRequestAPI
+import org.whispersystems.signalservice.loki.api.onionrequests.Snode
+
+class PathActivity : PassphraseRequiredActionBarActivity() {
+ private val broadcastReceivers = mutableListOf()
+
+ // region Lifecycle
+ override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+ super.onCreate(savedInstanceState, isReady)
+ setContentView(R.layout.activity_path)
+ supportActionBar!!.title = resources.getString(R.string.activity_path_title)
+ rebuildPathButton.setOnClickListener { rebuildPath() }
+ update(false)
+ registerObservers()
+ }
+
+ private fun registerObservers() {
+ val buildingPathsReceiver: BroadcastReceiver = object : BroadcastReceiver() {
+
+ override fun onReceive(context: Context, intent: Intent) {
+ handleBuildingPathsEvent()
+ }
+ }
+ broadcastReceivers.add(buildingPathsReceiver)
+ LocalBroadcastManager.getInstance(this).registerReceiver(buildingPathsReceiver, IntentFilter("buildingPaths"))
+ val pathsBuiltReceiver: BroadcastReceiver = object : BroadcastReceiver() {
+
+ override fun onReceive(context: Context, intent: Intent) {
+ handlePathsBuiltEvent()
+ }
+ }
+ broadcastReceivers.add(pathsBuiltReceiver)
+ LocalBroadcastManager.getInstance(this).registerReceiver(pathsBuiltReceiver, IntentFilter("pathsBuilt"))
+ }
+
+ override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+ menuInflater.inflate(R.menu.menu_path, menu)
+ return true
+ }
+
+ override fun onDestroy() {
+ for (receiver in broadcastReceivers) {
+ LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver)
+ }
+ super.onDestroy()
+ }
+ // endregion
+
+ // region Updating
+ private fun handleBuildingPathsEvent() { update(false) }
+ private fun handlePathsBuiltEvent() { update(false) }
+
+ private fun update(isAnimated: Boolean) {
+ pathRowsContainer.removeAllViews()
+ if (OnionRequestAPI.paths.count() >= OnionRequestAPI.pathCount) {
+ val path = OnionRequestAPI.paths.firstOrNull() ?: return finish()
+ val dotAnimationRepeatInterval = path.count().toLong() * 1000 + 1000
+ val pathRows = path.mapIndexed { index, snode ->
+ val isGuardSnode = (OnionRequestAPI.guardSnodes.contains(snode))
+ getPathRow(snode, LineView.Location.Middle, index.toLong() * 1000 + 2000, dotAnimationRepeatInterval, isGuardSnode)
+ }
+ val youRow = getPathRow("You", null, LineView.Location.Top, 1000, dotAnimationRepeatInterval)
+ val destinationRow = getPathRow("Destination", null, LineView.Location.Bottom, path.count().toLong() * 1000 + 2000, dotAnimationRepeatInterval)
+ val rows = listOf( youRow ) + pathRows + listOf( destinationRow )
+ for (row in rows) {
+ pathRowsContainer.addView(row)
+ }
+ if (isAnimated) {
+ spinner.fadeOut()
+ } else {
+ spinner.alpha = 0.0f
+ }
+ } else {
+ if (isAnimated) {
+ spinner.fadeIn()
+ } else {
+ spinner.alpha = 1.0f
+ }
+ }
+ }
+ // endregion
+
+ // region General
+ private fun getPathRow(title: String, subtitle: String?, location: LineView.Location, dotAnimationStartDelay: Long, dotAnimationRepeatInterval: Long): LinearLayout {
+ val mainContainer = LinearLayout(this)
+ mainContainer.orientation = LinearLayout.HORIZONTAL
+ mainContainer.gravity = Gravity.CENTER_VERTICAL
+ val mainContainerLayoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+ mainContainer.layoutParams = mainContainerLayoutParams
+ val lineView = LineView(this, location, dotAnimationStartDelay, dotAnimationRepeatInterval)
+ val lineViewLayoutParams = LinearLayout.LayoutParams(resources.getDimensionPixelSize(R.dimen.path_row_expanded_dot_size), resources.getDimensionPixelSize(R.dimen.path_row_height))
+ lineView.layoutParams = lineViewLayoutParams
+ mainContainer.addView(lineView)
+ val titleTextView = TextView(this)
+ titleTextView.setTextColor(resources.getColorWithID(R.color.text, theme))
+ titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.medium_font_size))
+ titleTextView.text = title
+ val titleContainer = LinearLayout(this)
+ titleContainer.orientation = LinearLayout.VERTICAL
+ titleContainer.addView(titleTextView)
+ val titleContainerLayoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+ titleContainerLayoutParams.marginStart = resources.getDimensionPixelSize(R.dimen.large_spacing)
+ titleContainer.layoutParams = titleContainerLayoutParams
+ mainContainer.addView(titleContainer)
+ if (subtitle != null) {
+ val subtitleTextView = TextView(this)
+ subtitleTextView.setTextColor(resources.getColorWithID(R.color.text, theme))
+ subtitleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.small_font_size))
+ subtitleTextView.text = subtitle
+ titleContainer.addView(subtitleTextView)
+ }
+ return mainContainer
+ }
+
+ private fun getPathRow(snode: Snode, location: LineView.Location, dotAnimationStartDelay: Long, dotAnimationRepeatInterval: Long, isGuardSnode: Boolean): LinearLayout {
+ val title = if (isGuardSnode) resources.getString(R.string.activity_path_guard_node_row_title) else resources.getString(R.string.activity_path_service_node_row_title)
+ val subtitle = snode.toString().removePrefix("https://").substringBefore(":")
+ return getPathRow(title, subtitle, location, dotAnimationStartDelay, dotAnimationRepeatInterval)
+ }
+ // endregion
+
+ // region Interaction
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ val id = item.itemId
+ when(id) {
+ R.id.learnMoreButton -> learnMore()
+ else -> { /* Do nothing */ }
+ }
+ return super.onOptionsItemSelected(item)
+ }
+
+ private fun learnMore() {
+ try {
+ val url = "https://getsession.org/faq/#onion-routing"
+ val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+ startActivity(intent)
+ } catch (e: Exception) {
+ Toast.makeText(this, R.string.invalid_url, Toast.LENGTH_SHORT).show()
+ }
+ }
+
+ private fun rebuildPath() {
+ DatabaseFactory.getLokiAPIDatabase(this).clearPaths()
+ OnionRequestAPI.guardSnodes = setOf()
+ OnionRequestAPI.paths = listOf()
+ OnionRequestAPI.buildPaths()
+ }
+ // endregion
+
+ // region Line View
+ private class LineView : RelativeLayout {
+ private lateinit var location: Location
+ private var dotAnimationStartDelay: Long = 0
+ private var dotAnimationRepeatInterval: Long = 0
+
+ private val dotView by lazy {
+ val result = View(context)
+ result.setBackgroundResource(R.drawable.accent_dot)
+ result
+ }
+
+ enum class Location {
+ Top, Middle, Bottom
+ }
+
+ constructor(context: Context, location: Location, dotAnimationStartDelay: Long, dotAnimationRepeatInterval: Long) : super(context) {
+ this.location = location
+ this.dotAnimationStartDelay = dotAnimationStartDelay
+ this.dotAnimationRepeatInterval = dotAnimationRepeatInterval
+ setUpViewHierarchy()
+ }
+
+ constructor(context: Context) : super(context) {
+ throw Exception("Use LineView(context:location:dotAnimationStartDelay:dotAnimationRepeatInterval:) instead.")
+ }
+
+ constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+ throw Exception("Use LineView(context:location:dotAnimationStartDelay:dotAnimationRepeatInterval:) instead.")
+ }
+
+ constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+ throw Exception("Use LineView(context:location:dotAnimationStartDelay:dotAnimationRepeatInterval:) instead.")
+ }
+
+ constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+ throw Exception("Use LineView(context:location:dotAnimationStartDelay:dotAnimationRepeatInterval:) instead.")
+ }
+
+ private fun setUpViewHierarchy() {
+ val lineView = View(context)
+ lineView.setBackgroundColor(resources.getColorWithID(R.color.text, context.theme))
+ val lineViewHeight = when (location) {
+ Location.Top, Location.Bottom -> resources.getDimensionPixelSize(R.dimen.path_row_height) / 2
+ Location.Middle -> resources.getDimensionPixelSize(R.dimen.path_row_height)
+ }
+ val lineViewLayoutParams = LayoutParams(1, lineViewHeight)
+ when (location) {
+ Location.Top -> lineViewLayoutParams.addRule(ALIGN_PARENT_BOTTOM)
+ Location.Middle, Location.Bottom -> lineViewLayoutParams.addRule(ALIGN_PARENT_TOP)
+ }
+ lineViewLayoutParams.addRule(CENTER_HORIZONTAL)
+ lineView.layoutParams = lineViewLayoutParams
+ addView(lineView)
+ val dotViewSize = resources.getDimensionPixelSize(R.dimen.path_row_dot_size)
+ val dotViewLayoutParams = LayoutParams(dotViewSize, dotViewSize)
+ dotViewLayoutParams.addRule(CENTER_IN_PARENT)
+ dotView.layoutParams = dotViewLayoutParams
+ addView(dotView)
+ Handler().postDelayed({
+ performAnimation()
+ }, dotAnimationStartDelay)
+ }
+
+ private fun performAnimation() {
+ expand()
+ Handler().postDelayed({
+ collapse()
+ Handler().postDelayed({
+ performAnimation()
+ }, dotAnimationRepeatInterval)
+ }, 1000)
+ }
+
+ private fun expand() {
+ dotView.animateSizeChange(R.dimen.path_row_dot_size, R.dimen.path_row_expanded_dot_size)
+ }
+
+ private fun collapse() {
+ dotView.animateSizeChange(R.dimen.path_row_expanded_dot_size, R.dimen.path_row_dot_size)
+ }
+ }
+ // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
index 269f0eeae7..91cf61b401 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
@@ -1,7 +1,5 @@
package org.thoughtcrime.securesms.loki.activities
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
import android.app.Activity
import android.content.ClipData
import android.content.ClipboardManager
@@ -31,6 +29,8 @@ import org.thoughtcrime.securesms.database.Address
import org.thoughtcrime.securesms.database.DatabaseFactory
import org.thoughtcrime.securesms.loki.dialogs.ClearAllDataDialog
import org.thoughtcrime.securesms.loki.dialogs.SeedDialog
+import org.thoughtcrime.securesms.loki.utilities.fadeIn
+import org.thoughtcrime.securesms.loki.utilities.fadeOut
import org.thoughtcrime.securesms.loki.utilities.push
import org.thoughtcrime.securesms.loki.utilities.toPx
import org.thoughtcrime.securesms.mms.GlideApp
@@ -147,7 +147,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
}
private fun updateProfile(isUpdatingProfilePicture: Boolean) {
- showLoader()
+ loader.fadeIn()
val promises = mutableListOf>()
val displayName = displayNameToBeUploaded
if (displayName != null) {
@@ -187,24 +187,9 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
profilePictureView.update()
}
profilePictureToBeUploaded = null
- hideLoader()
+ loader.fadeOut()
}
}
-
- private fun showLoader() {
- loader.visibility = View.VISIBLE
- loader.animate().setDuration(150).alpha(1.0f).start()
- }
-
- private fun hideLoader() {
- loader.animate().setDuration(150).alpha(0.0f).setListener(object : AnimatorListenerAdapter() {
-
- override fun onAnimationEnd(animation: Animator?) {
- super.onAnimationEnd(animation)
- loader.visibility = View.GONE
- }
- })
- }
// endregion
// region Interaction
diff --git a/src/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/src/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
index eee56c34d8..5593414581 100644
--- a/src/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
+++ b/src/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.loki.database
import android.content.ContentValues
import android.content.Context
+import android.util.Log
import org.thoughtcrime.securesms.database.Database
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
import org.thoughtcrime.securesms.loki.utilities.*
@@ -16,11 +17,21 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
private val userPublicKey get() = TextSecurePreferences.getLocalNumber(context)
companion object {
+ // Snode pool cache
+ private val snodePoolCache = "loki_snode_pool_cache"
+ private val dummyKey = "dummy_key"
+ private val snodePoolKey = "snode_pool_key"
+ @JvmStatic val createSnodePoolCacheCommand = "CREATE TABLE $snodePoolCache ($dummyKey TEXT PRIMARY KEY, $snodePoolKey TEXT);"
+ // Path cache
+ private val pathCache = "loki_path_cache"
+ private val indexPath = "index_path"
+ private val snode = "snode"
+ @JvmStatic val createPathCacheCommand = "CREATE TABLE $pathCache ($indexPath TEXT PRIMARY KEY, $snode TEXT);"
// Swarm cache
private val swarmCache = "loki_api_swarm_cache"
private val hexEncodedPublicKey = "hex_encoded_public_key"
private val swarm = "swarm"
- @JvmStatic val createSwarmCacheTableCommand = "CREATE TABLE $swarmCache ($hexEncodedPublicKey TEXT PRIMARY KEY, $swarm TEXT);"
+ @JvmStatic val createSwarmCacheCommand = "CREATE TABLE $swarmCache ($hexEncodedPublicKey TEXT PRIMARY KEY, $swarm TEXT);"
// Last message hash value cache
private val lastMessageHashValueCache = "loki_api_last_message_hash_value_cache"
private val target = "target"
@@ -66,6 +77,90 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
@JvmStatic val createSessionRequestTimestampTableCommand = "CREATE TABLE $sessionRequestTimestampCache ($publicKey STRING PRIMARY KEY, $timestamp INTEGER DEFAULT 0);"
}
+ override fun getSnodePool(): Set {
+ val database = databaseHelper.readableDatabase
+ return database.get(snodePoolCache, "${Companion.dummyKey} = ?", wrap("dummy_key")) { cursor ->
+ val snodePoolAsString = cursor.getString(cursor.getColumnIndexOrThrow(snodePoolKey))
+ snodePoolAsString.split(", ").mapNotNull { snodeAsString ->
+ val components = snodeAsString.split("-")
+ val address = components[0]
+ val port = components.getOrNull(1)?.toIntOrNull() ?: return@mapNotNull null
+ val ed25519Key = components.getOrNull(2) ?: return@mapNotNull null
+ val x25519Key = components.getOrNull(3) ?: return@mapNotNull null
+ LokiAPITarget(address, port, LokiAPITarget.KeySet(ed25519Key, x25519Key))
+ }
+ }?.toSet() ?: setOf()
+ }
+
+ override fun setSnodePool(newValue: Set) {
+ val database = databaseHelper.writableDatabase
+ val snodePoolAsString = newValue.joinToString(", ") { snode ->
+ var string = "${snode.address}-${snode.port}"
+ val keySet = snode.publicKeySet
+ if (keySet != null) {
+ string += "-${keySet.ed25519Key}-${keySet.x25519Key}"
+ }
+ string
+ }
+ val row = wrap(mapOf(Companion.dummyKey to "dummy_key", snodePoolKey to snodePoolAsString))
+ database.insertOrUpdate(snodePoolCache, row, "${Companion.dummyKey} = ?", wrap("dummy_key"))
+ }
+
+ override fun getPaths(): List> {
+ val database = databaseHelper.readableDatabase
+ fun get(indexPath: String): LokiAPITarget? {
+ return database.get(pathCache, "${Companion.indexPath} = ?", wrap(indexPath)) { cursor ->
+ val snodeAsString = cursor.getString(cursor.getColumnIndexOrThrow(snode))
+ val components = snodeAsString.split("-")
+ val address = components[0]
+ val port = components.getOrNull(1)?.toIntOrNull()
+ val ed25519Key = components.getOrNull(2)
+ val x25519Key = components.getOrNull(3)
+ if (port != null && ed25519Key != null && x25519Key != null) {
+ LokiAPITarget(address, port, LokiAPITarget.KeySet(ed25519Key, x25519Key))
+ } else {
+ null
+ }
+ }
+ }
+ val path0Snode0 = get("0-0") ?: return listOf(); val path0Snode1 = get("0-1") ?: return listOf()
+ val path0Snode2 = get("0-2") ?: return listOf(); val path1Snode0 = get("1-0") ?: return listOf()
+ val path1Snode1 = get("1-1") ?: return listOf(); val path1Snode2 = get("1-2") ?: return listOf()
+ return listOf( listOf( path0Snode0, path0Snode1, path0Snode2 ), listOf( path1Snode0, path1Snode1, path1Snode2 ) )
+ }
+
+ fun clearPaths() {
+ val database = databaseHelper.writableDatabase
+ fun delete(indexPath: String) {
+ database.delete(pathCache, "${Companion.indexPath} = ?", wrap(indexPath))
+ }
+ delete("0-0"); delete("0-1")
+ delete("0-2"); delete("1-0")
+ delete("1-1"); delete("1-2")
+ }
+
+ override fun setPaths(newValue: List>) {
+ // FIXME: This is a bit of a dirty approach that assumes 2 paths of length 3 each. We should do better than this.
+ if (newValue.count() != 2) { return }
+ val path0 = newValue[0]
+ val path1 = newValue[1]
+ if (path0.count() != 3 || path1.count() != 3) { return }
+ Log.d("Loki", "Persisting onion request paths to database.")
+ val database = databaseHelper.writableDatabase
+ fun set(indexPath: String ,snode: LokiAPITarget) {
+ var snodeAsString = "${snode.address}-${snode.port}"
+ val keySet = snode.publicKeySet
+ if (keySet != null) {
+ snodeAsString += "-${keySet.ed25519Key}-${keySet.x25519Key}"
+ }
+ val row = wrap(mapOf(Companion.indexPath to indexPath, Companion.snode to snodeAsString))
+ database.insertOrUpdate(pathCache, row, "${Companion.indexPath} = ?", wrap(indexPath))
+ }
+ set("0-0", path0[0]); set("0-1", path0[1])
+ set("0-2", path0[2]); set("1-0", path1[0])
+ set("1-1", path1[1]); set("1-2", path1[2])
+ }
+
override fun getSwarmCache(hexEncodedPublicKey: String): Set? {
val database = databaseHelper.readableDatabase
return database.get(swarmCache, "${Companion.hexEncodedPublicKey} = ?", wrap(hexEncodedPublicKey)) { cursor ->
@@ -75,7 +170,7 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
val address = components[0]
val port = components.getOrNull(1)?.toIntOrNull() ?: return@mapNotNull null
val ed25519Key = components.getOrNull(2) ?: return@mapNotNull null
- val x25519Key = components.getOrNull(3)?: return@mapNotNull null
+ val x25519Key = components.getOrNull(3) ?: return@mapNotNull null
LokiAPITarget(address, port, LokiAPITarget.KeySet(ed25519Key, x25519Key))
}
}?.toSet()
diff --git a/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt b/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
index 5ed961f4cb..3038c076ae 100644
--- a/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
@@ -1,7 +1,12 @@
package org.thoughtcrime.securesms.loki.utilities
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.FloatEvaluator
+import android.animation.ValueAnimator
import android.graphics.PointF
import android.graphics.Rect
+import android.support.annotation.DimenRes
import android.view.View
fun View.contains(point: PointF): Boolean {
@@ -13,4 +18,34 @@ val View.hitRect: Rect
val rect = Rect()
getHitRect(rect)
return rect
- }
\ No newline at end of file
+ }
+
+fun View.animateSizeChange(@DimenRes startSizeID: Int, @DimenRes endSizeID: Int, animationDuration: Long = 250) {
+ val layoutParams = this.layoutParams
+ val startSize = resources.getDimension(startSizeID)
+ val endSize = resources.getDimension(endSizeID)
+ val animation = ValueAnimator.ofObject(FloatEvaluator(), startSize, endSize)
+ animation.duration = animationDuration
+ animation.addUpdateListener { animator ->
+ val size = animator.animatedValue as Float
+ layoutParams.width = size.toInt()
+ layoutParams.height = size.toInt()
+ this.layoutParams = layoutParams
+ }
+ animation.start()
+}
+
+fun View.fadeIn(duration: Long = 150) {
+ visibility = View.VISIBLE
+ animate().setDuration(duration).alpha(1.0f).start()
+}
+
+fun View.fadeOut(duration: Long = 150) {
+ animate().setDuration(duration).alpha(0.0f).setListener(object : AnimatorListenerAdapter() {
+
+ override fun onAnimationEnd(animation: Animator?) {
+ super.onAnimationEnd(animation)
+ visibility = View.GONE
+ }
+ })
+}
diff --git a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
index 51b7b1d46f..3aefe5acbf 100644
--- a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
@@ -96,13 +96,13 @@ class NewConversationButtonSetView : RelativeLayout {
fun expand() {
animateImageViewColorChange(R.color.new_conversation_button_collapsed_background, R.color.accent)
- animateImageViewSizeChange(R.dimen.new_conversation_button_collapsed_size, R.dimen.new_conversation_button_expanded_size)
+ imageView.animateSizeChange(R.dimen.new_conversation_button_collapsed_size, R.dimen.new_conversation_button_expanded_size, animationDuration)
animateImageViewPositionChange(collapsedImageViewPosition, expandedImageViewPosition)
}
fun collapse() {
animateImageViewColorChange(R.color.accent, R.color.new_conversation_button_collapsed_background)
- animateImageViewSizeChange(R.dimen.new_conversation_button_expanded_size, R.dimen.new_conversation_button_collapsed_size)
+ imageView.animateSizeChange(R.dimen.new_conversation_button_expanded_size, R.dimen.new_conversation_button_collapsed_size, animationDuration)
animateImageViewPositionChange(expandedImageViewPosition, collapsedImageViewPosition)
}
@@ -119,21 +119,6 @@ class NewConversationButtonSetView : RelativeLayout {
animation.start()
}
- private fun animateImageViewSizeChange(@DimenRes startSizeID: Int, @DimenRes endSizeID: Int) {
- val layoutParams = imageView.layoutParams
- val startSize = resources.getDimension(startSizeID)
- val endSize = resources.getDimension(endSizeID)
- val animation = ValueAnimator.ofObject(FloatEvaluator(), startSize, endSize)
- animation.duration = animationDuration
- animation.addUpdateListener { animator ->
- val size = animator.animatedValue as Float
- layoutParams.width = size.toInt()
- layoutParams.height = size.toInt()
- imageView.layoutParams = layoutParams
- }
- animation.start()
- }
-
private fun animateImageViewPositionChange(startPosition: PointF, endPosition: PointF) {
val animation = ValueAnimator.ofObject(PointFEvaluator(), startPosition, endPosition)
animation.duration = animationDuration
diff --git a/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt b/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
new file mode 100644
index 0000000000..c56c0c51c6
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
@@ -0,0 +1,77 @@
+package org.thoughtcrime.securesms.loki.views
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.support.v4.content.LocalBroadcastManager
+import android.util.AttributeSet
+import android.view.View
+import network.loki.messenger.R
+import org.whispersystems.signalservice.loki.api.onionrequests.OnionRequestAPI
+
+class PathStatusView : View {
+ private val broadcastReceivers = mutableListOf()
+
+ constructor(context: Context) : super(context) {
+ initialize()
+ }
+
+ constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+ initialize()
+ }
+
+ constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+ initialize()
+ }
+
+ constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+ initialize()
+ }
+
+ private fun initialize() {
+ update()
+ }
+
+ override fun onAttachedToWindow() {
+ super.onAttachedToWindow()
+ registerObservers()
+ }
+
+ private fun registerObservers() {
+ val buildingPathsReceiver: BroadcastReceiver = object : BroadcastReceiver() {
+
+ override fun onReceive(context: Context, intent: Intent) {
+ handleBuildingPathsEvent()
+ }
+ }
+ broadcastReceivers.add(buildingPathsReceiver)
+ LocalBroadcastManager.getInstance(context).registerReceiver(buildingPathsReceiver, IntentFilter("buildingPaths"))
+ val pathsBuiltReceiver: BroadcastReceiver = object : BroadcastReceiver() {
+
+ override fun onReceive(context: Context, intent: Intent) {
+ handlePathsBuiltEvent()
+ }
+ }
+ broadcastReceivers.add(pathsBuiltReceiver)
+ LocalBroadcastManager.getInstance(context).registerReceiver(pathsBuiltReceiver, IntentFilter("pathsBuilt"))
+ }
+
+ override fun onDetachedFromWindow() {
+ for (receiver in broadcastReceivers) {
+ LocalBroadcastManager.getInstance(context).unregisterReceiver(receiver)
+ }
+ super.onDetachedFromWindow()
+ }
+
+ private fun handleBuildingPathsEvent() { update() }
+ private fun handlePathsBuiltEvent() { update() }
+
+ private fun update() {
+ if (OnionRequestAPI.paths.count() >= OnionRequestAPI.pathCount) {
+ setBackgroundResource(R.drawable.accent_dot)
+ } else {
+ setBackgroundResource(R.drawable.paths_building_dot)
+ }
+ }
+}
\ No newline at end of file