kopia lustrzana https://github.com/ge0rg/aprsdroid
refactoring: use PrefsWrapper
rodzic
33a7185b5c
commit
16198e889f
|
@ -108,7 +108,7 @@ class APRSdroid extends Activity with OnClickListener
|
|||
|
||||
def passcodeWarning(call : String, pass : String) {
|
||||
import Backend._
|
||||
if ((defaultBackendInfo(prefs.prefs).need_passcode == PASSCODE_OPTIONAL) &&
|
||||
if ((defaultBackendInfo(prefs).need_passcode == PASSCODE_OPTIONAL) &&
|
||||
!AprsPacket.passcodeAllowed(call, pass, false))
|
||||
Toast.makeText(this, R.string.anon_warning, Toast.LENGTH_LONG).show()
|
||||
}
|
||||
|
@ -117,7 +117,7 @@ class APRSdroid extends Activity with OnClickListener
|
|||
import Backend._
|
||||
// a valid passcode must be entered for "required",
|
||||
// "" and "-1" are accepted as well for "optional"
|
||||
defaultBackendInfo(prefs.prefs).need_passcode match {
|
||||
defaultBackendInfo(prefs).need_passcode match {
|
||||
case PASSCODE_NONE => false
|
||||
case PASSCODE_OPTIONAL =>
|
||||
!AprsPacket.passcodeAllowed(call, pass, true)
|
||||
|
|
|
@ -93,7 +93,7 @@ class AprsService extends Service with LocationListener {
|
|||
}
|
||||
|
||||
def startPoster() {
|
||||
poster = AprsIsUploader.instanciateUploader(this, prefs.prefs)
|
||||
poster = AprsIsUploader.instanciateUploader(this, prefs)
|
||||
poster.start()
|
||||
}
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ import _root_.android.preference.{PreferenceActivity, PreferenceManager}
|
|||
class BackendPrefs extends PreferenceActivity {
|
||||
override def onCreate(savedInstanceState: Bundle) {
|
||||
super.onCreate(savedInstanceState)
|
||||
val prefs = PreferenceManager.getDefaultSharedPreferences(this)
|
||||
val prefs = new PrefsWrapper(this)
|
||||
addPreferencesFromResource(AprsIsUploader.instanciatePrefsAct(prefs))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,12 +1,10 @@
|
|||
package org.aprsdroid.app
|
||||
|
||||
import _root_.android.content.SharedPreferences
|
||||
import _root_.android.preference.PreferenceManager
|
||||
import _root_.android.util.Log
|
||||
import _root_.java.net.{InetAddress, DatagramSocket, DatagramPacket}
|
||||
import com.nogy.afu.soundmodem.{Message, APRSFrame, Afsk}
|
||||
|
||||
class AfskUploader(prefs : SharedPreferences) extends AprsIsUploader(prefs) {
|
||||
class AfskUploader(prefs : PrefsWrapper) extends AprsIsUploader(prefs) {
|
||||
val TAG = "AprsAfsk"
|
||||
var FrameLength = 150 //1200Bits = 1sec to open VOX
|
||||
var Digis = prefs.getString("digi_path", "WIDE1-1")
|
||||
|
|
|
@ -1,19 +1,18 @@
|
|||
package org.aprsdroid.app
|
||||
|
||||
import _root_.android.content.SharedPreferences
|
||||
|
||||
object AprsIsUploader {
|
||||
val DEFAULT_CONNTYPE = "tcp"
|
||||
|
||||
def instanciateUploader(service : AprsService, prefs : SharedPreferences) : AprsIsUploader = {
|
||||
def instanciateUploader(service : AprsService, prefs : PrefsWrapper) : AprsIsUploader = {
|
||||
Backend.defaultBackendInfo(prefs).create(service, prefs)
|
||||
}
|
||||
def instanciatePrefsAct(prefs : SharedPreferences) = {
|
||||
def instanciatePrefsAct(prefs : PrefsWrapper) = {
|
||||
Backend.defaultBackendInfo(prefs).prefxml
|
||||
}
|
||||
}
|
||||
|
||||
abstract class AprsIsUploader(prefs : SharedPreferences) {
|
||||
abstract class AprsIsUploader(prefs : PrefsWrapper) {
|
||||
val passcode = prefs.getString("passcode", "") match {
|
||||
case "" => "-1"
|
||||
case s => s
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package org.aprsdroid.app
|
||||
|
||||
import _root_.android.content.SharedPreferences
|
||||
|
||||
object Backend {
|
||||
val PASSCODE_NONE = 0
|
||||
|
@ -26,7 +25,7 @@ object Backend {
|
|||
PASSCODE_OPTIONAL)
|
||||
)
|
||||
|
||||
def defaultBackendInfo(prefs : SharedPreferences) : BackendInfo = {
|
||||
def defaultBackendInfo(prefs : PrefsWrapper) : BackendInfo = {
|
||||
backend_collection.get(prefs.getString("backend", "")) match {
|
||||
case Some(bi) => bi
|
||||
case None => backend_collection("tcp")
|
||||
|
@ -35,7 +34,7 @@ object Backend {
|
|||
}
|
||||
|
||||
class BackendInfo(
|
||||
val create : (AprsService, SharedPreferences) => AprsIsUploader,
|
||||
val create : (AprsService, PrefsWrapper) => AprsIsUploader,
|
||||
val prefxml : Int,
|
||||
val need_passcode : Int
|
||||
) {}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package org.aprsdroid.app
|
||||
|
||||
import _root_.android.content.SharedPreferences
|
||||
import _root_.android.location.Location
|
||||
import _root_.android.util.Log
|
||||
import _root_.org.apache.http._
|
||||
|
@ -8,7 +7,7 @@ import _root_.org.apache.http.entity.StringEntity
|
|||
import _root_.org.apache.http.impl.client.DefaultHttpClient
|
||||
import _root_.org.apache.http.client.methods.HttpPost
|
||||
|
||||
class HttpPostUploader(prefs : SharedPreferences) extends AprsIsUploader(prefs) {
|
||||
class HttpPostUploader(prefs : PrefsWrapper) extends AprsIsUploader(prefs) {
|
||||
val TAG = "AprsHttpPost"
|
||||
val host = prefs.getString("http.server", "srvr.aprs-is.net")
|
||||
|
||||
|
|
|
@ -1,14 +1,12 @@
|
|||
package org.aprsdroid.app
|
||||
|
||||
import _root_.android.content.SharedPreferences
|
||||
import _root_.android.app.Service
|
||||
import _root_.android.location.{Location, LocationManager}
|
||||
import _root_.android.preference.PreferenceManager
|
||||
import _root_.android.util.Log
|
||||
import _root_.java.io.{BufferedReader, InputStreamReader, OutputStreamWriter, PrintWriter}
|
||||
import _root_.java.net.{InetAddress, Socket}
|
||||
|
||||
class TcpUploader(service : AprsService, prefs : SharedPreferences) extends AprsIsUploader(prefs) {
|
||||
class TcpUploader(service : AprsService, prefs : PrefsWrapper) extends AprsIsUploader(prefs) {
|
||||
val TAG = "TcpUploader"
|
||||
val hostname = prefs.getString("tcp.server", "euro.aprs2.net")
|
||||
var conn : TcpSocketThread = null
|
||||
|
|
|
@ -1,12 +1,10 @@
|
|||
package org.aprsdroid.app
|
||||
|
||||
import _root_.android.content.SharedPreferences
|
||||
import _root_.android.location.Location
|
||||
import _root_.android.preference.PreferenceManager
|
||||
import _root_.android.util.Log
|
||||
import _root_.java.net.{InetAddress, DatagramSocket, DatagramPacket}
|
||||
|
||||
class UdpUploader(prefs : SharedPreferences) extends AprsIsUploader(prefs) {
|
||||
class UdpUploader(prefs : PrefsWrapper) extends AprsIsUploader(prefs) {
|
||||
val TAG = "AprsUdp"
|
||||
lazy val socket = new DatagramSocket()
|
||||
val host = prefs.getString("udp.server", "srvr.aprs-is.net")
|
||||
|
|
Ładowanie…
Reference in New Issue