Commit a1871f79 authored by Mygod's avatar Mygod

Fix building

parent 0b7fb75b
...@@ -15,10 +15,11 @@ import com.github.shadowsocks.utils.{Key, Utils} ...@@ -15,10 +15,11 @@ import com.github.shadowsocks.utils.{Key, Utils}
object ShadowsocksSettings { object ShadowsocksSettings {
// Constants // Constants
val PREFS_NAME = "Shadowsocks" private final val TAG = "ShadowsocksSettings"
val PROXY_PREFS = Array(Key.profileName, Key.proxy, Key.remotePort, Key.localPort, Key.sitekey, Key.encMethod, private final val PREFS_NAME = "Shadowsocks"
private val PROXY_PREFS = Array(Key.profileName, Key.proxy, Key.remotePort, Key.localPort, Key.sitekey, Key.encMethod,
Key.isAuth) Key.isAuth)
val FEATURE_PREFS = Array(Key.route, Key.isProxyApps, Key.isUdpDns, Key.isIpv6) private val FEATURE_PREFS = Array(Key.route, Key.isProxyApps, Key.isUdpDns, Key.isIpv6)
// Helper functions // Helper functions
def updateDropDownPreference(pref: Preference, value: String) { def updateDropDownPreference(pref: Preference, value: String) {
...@@ -81,7 +82,7 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan ...@@ -81,7 +82,7 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
}) })
findPreference("recovery").setOnPreferenceClickListener((preference: Preference) => { findPreference("recovery").setOnPreferenceClickListener((preference: Preference) => {
ShadowsocksApplication.track(Shadowsocks.TAG, "reset") ShadowsocksApplication.track(TAG, "reset")
activity.recovery() activity.recovery()
true true
}) })
...@@ -89,13 +90,13 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan ...@@ -89,13 +90,13 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
val flush = findPreference("flush_dnscache") val flush = findPreference("flush_dnscache")
if (Build.VERSION.SDK_INT < 17) flush.setSummary(R.string.flush_dnscache_summary) if (Build.VERSION.SDK_INT < 17) flush.setSummary(R.string.flush_dnscache_summary)
flush.setOnPreferenceClickListener(_ => { flush.setOnPreferenceClickListener(_ => {
ShadowsocksApplication.track(Shadowsocks.TAG, "flush_dnscache") ShadowsocksApplication.track(TAG, "flush_dnscache")
activity.flushDnsCache() activity.flushDnsCache()
true true
}) })
findPreference("about").setOnPreferenceClickListener((preference: Preference) => { findPreference("about").setOnPreferenceClickListener((preference: Preference) => {
ShadowsocksApplication.track(Shadowsocks.TAG, "about") ShadowsocksApplication.track(TAG, "about")
val web = new WebView(activity) val web = new WebView(activity)
web.loadUrl("file:///android_asset/pages/about.html") web.loadUrl("file:///android_asset/pages/about.html")
web.setWebViewClient(new WebViewClient() { web.setWebViewClient(new WebViewClient() {
......
...@@ -44,7 +44,12 @@ import android.util.Log ...@@ -44,7 +44,12 @@ import android.util.Log
import com.github.shadowsocks._ import com.github.shadowsocks._
import com.github.shadowsocks.utils.Key import com.github.shadowsocks.utils.Key
object ProfileManager {
private final val TAG = "ProfileManager"
}
class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) { class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
import ProfileManager._
var profileAddedListener: Profile => Any = _ var profileAddedListener: Profile => Any = _
def setProfileAddedListener(listener: Profile => Any) = this.profileAddedListener = listener def setProfileAddedListener(listener: Profile => Any) = this.profileAddedListener = listener
...@@ -72,7 +77,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) { ...@@ -72,7 +77,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
profile profile
} catch { } catch {
case ex: Exception => case ex: Exception =>
Log.e(Shadowsocks.TAG, "addProfile", ex) Log.e(TAG, "addProfile", ex)
p p
} }
} }
...@@ -83,7 +88,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) { ...@@ -83,7 +88,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
true true
} catch { } catch {
case ex: Exception => case ex: Exception =>
Log.e(Shadowsocks.TAG, "updateProfile", ex) Log.e(TAG, "updateProfile", ex)
false false
} }
} }
...@@ -96,7 +101,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) { ...@@ -96,7 +101,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
} }
} catch { } catch {
case ex: Exception => case ex: Exception =>
Log.e(Shadowsocks.TAG, "getProfile", ex) Log.e(TAG, "getProfile", ex)
None None
} }
} }
...@@ -107,7 +112,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) { ...@@ -107,7 +112,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
true true
} catch { } catch {
case ex: Exception => case ex: Exception =>
Log.e(Shadowsocks.TAG, "delProfile", ex) Log.e(TAG, "delProfile", ex)
false false
} }
} }
...@@ -118,7 +123,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) { ...@@ -118,7 +123,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
if (result.size == 1) Option(result.get(0)) else None if (result.size == 1) Option(result.get(0)) else None
} catch { } catch {
case ex: Exception => case ex: Exception =>
Log.e(Shadowsocks.TAG, "getAllProfiles", ex) Log.e(TAG, "getAllProfiles", ex)
None None
} }
} }
...@@ -129,7 +134,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) { ...@@ -129,7 +134,7 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
Option(dbHelper.profileDao.query(dbHelper.profileDao.queryBuilder.orderBy("userOrder", true).prepare).toList) Option(dbHelper.profileDao.query(dbHelper.profileDao.queryBuilder.orderBy("userOrder", true).prepare).toList)
} catch { } catch {
case ex: Exception => case ex: Exception =>
Log.e(Shadowsocks.TAG, "getAllProfiles", ex) Log.e(TAG, "getAllProfiles", ex)
None None
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment