nutomic
/
ensichat
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed unused MaxConnections setting

This commit is contained in:
Felix Ableitner 2016-09-24 18:49:36 +09:00
parent 68cb2253d9
commit ab5370cd86
6 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/src/main/res/values/strings.xml
View File

@ -99,9 +99,6 @@
<!-- Preference title -->
<string name="notification_sounds">Notification Sounds</string>
<!-- Preference title (debug only)-->
<string name="max_connections" translatable="false">Maximum Number of Connections</string>
<!-- Preference title -->
<string name="servers">Servers</string>

6
android/src/main/res/xml/settings.xml
View File

@ -26,12 +26,6 @@
android:inputType="number"
android:numeric="integer" />
<EditTextPreference
android:title="@string/max_connections"
android:key="max_connections"
android:inputType="number"
android:numeric="integer" />
<EditTextPreference
android:title="@string/servers"
android:key="servers" />

1
android/src/main/scala/com/nutomic/ensichat/activities/FirstStartActivity.scala
View File

@ -82,7 +82,6 @@ class FirstStartActivity extends AppCompatActivity with OnEditorActionListener w
.putString(KeyUserStatus, SettingsInterface.DefaultUserStatus)
.putBoolean(KeyNotificationSoundsOn, DefaultNotificationSoundsOn)
.putString(KeyScanInterval, DefaultScanInterval.toString)
.putString(KeyMaxConnections, DefaultMaxConnections.toString)
.putString(KeyAddresses, DefaultAddresses)
.apply()

10
android/src/main/scala/com/nutomic/ensichat/fragments/SettingsFragment.scala
View File

@ -4,12 +4,12 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener
import android.content.{Intent, SharedPreferences}
import android.os.Bundle
import android.preference.{PreferenceFragment, PreferenceManager}
import com.nutomic.ensichat.R
import com.nutomic.ensichat.activities.EnsichatActivity
import com.nutomic.ensichat.core.messages.body.UserInfo
import com.nutomic.ensichat.core.interfaces.SettingsInterface._
import com.nutomic.ensichat.core.messages.body.UserInfo
import com.nutomic.ensichat.fragments.SettingsFragment._
import com.nutomic.ensichat.service.ChatService
import com.nutomic.ensichat.{BuildConfig, R}
object SettingsFragment {
val Version = "version"
@ -22,8 +22,7 @@ class SettingsFragment extends PreferenceFragment with OnSharedPreferenceChangeL
private lazy val activity = getActivity.asInstanceOf[EnsichatActivity]
private lazy val maxConnections = findPreference(KeyMaxConnections)
private lazy val version = findPreference(Version)
private lazy val version = findPreference(Version)
private lazy val prefs = PreferenceManager.getDefaultSharedPreferences(getActivity)
@ -32,9 +31,6 @@ class SettingsFragment extends PreferenceFragment with OnSharedPreferenceChangeL
addPreferencesFromResource(R.xml.settings)
if (!BuildConfig.DEBUG)
getPreferenceScreen.removePreference(maxConnections)
val packageInfo = getActivity.getPackageManager.getPackageInfo(getActivity.getPackageName, 0)
version.setSummary(packageInfo.versionName)
prefs.registerOnSharedPreferenceChangeListener(this)

7
core/src/main/scala/com/nutomic/ensichat/core/ConnectionHandler.scala
View File

@ -363,13 +363,6 @@ final class ConnectionHandler(settings: SettingsInterface, database: Database,
* @return True if the connection is valid
*/
def onConnectionOpened(msg: Message): Boolean = {
val maxConnections = settings.get(SettingsInterface.KeyMaxConnections,
SettingsInterface.DefaultMaxConnections.toString).toInt
if (connections().size == maxConnections) {
logger.info("Maximum number of connections reached")
return false
}
val info = msg.body.asInstanceOf[messages.body.ConnectionInfo]
val sender = crypto.calculateAddress(info.key)
if (sender == Address.Broadcast || sender == Address.Null) {

6
core/src/main/scala/com/nutomic/ensichat/core/interfaces/SettingsInterface.scala
View File

@ -11,11 +11,6 @@ object SettingsInterface {
*/
val KeyScanInterval = "scan_interval_seconds"
/**
* NOTE: Stored as string.
*/
val KeyMaxConnections = "max_connections"
/**
* NOTE: Stored as comma separated string.
*/
@ -24,7 +19,6 @@ object SettingsInterface {
val DefaultUserStatus = "Let's chat!"
val DefaultScanInterval = 15
val DefaultNotificationSoundsOn = true
val DefaultMaxConnections = 1000000
// When updating this, be sure to adjust the code in [[InternetInterface.create]].
val DefaultAddresses = Set("ensichat.nutomic.com:26344", "trinity.nutomic.com:26344").mkString(", ")