Commit 1e16a26b authored by Max Lv's avatar Max Lv

more trackers

parent 234caa15
...@@ -5,8 +5,8 @@ import org.scalasbt.androidplugin._ ...@@ -5,8 +5,8 @@ import org.scalasbt.androidplugin._
import org.scalasbt.androidplugin.AndroidKeys._ import org.scalasbt.androidplugin.AndroidKeys._
object App { object App {
val version = "1.4.5" val version = "1.4.6"
val versionCode = 27 val versionCode = 28
} }
object General { object General {
......
...@@ -393,7 +393,7 @@ class ShadowVpnService extends VpnService { ...@@ -393,7 +393,7 @@ class ShadowVpnService extends VpnService {
override def onCreate() { override def onCreate() {
super.onCreate() super.onCreate()
EasyTracker.getTracker.sendEvent("service", "start", getVersionName, 0L) EasyTracker.getTracker.sendEvent(TAG, "start", getVersionName, 0L)
settings = PreferenceManager.getDefaultSharedPreferences(this) settings = PreferenceManager.getDefaultSharedPreferences(this)
notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) notificationManager = getSystemService(Context.NOTIFICATION_SERVICE)
.asInstanceOf[NotificationManager] .asInstanceOf[NotificationManager]
...@@ -412,7 +412,7 @@ class ShadowVpnService extends VpnService { ...@@ -412,7 +412,7 @@ class ShadowVpnService extends VpnService {
} }
def destroy() { def destroy() {
EasyTracker.getTracker.sendEvent("service", "stop", getVersionName, 0L) EasyTracker.getTracker.sendEvent(TAG, "stop", getVersionName, 0L)
if (receiver != null) { if (receiver != null) {
unregisterReceiver(receiver) unregisterReceiver(receiver)
receiver = null receiver = null
......
...@@ -66,7 +66,7 @@ import java.util.Hashtable ...@@ -66,7 +66,7 @@ import java.util.Hashtable
import net.saik0.android.unifiedpreference.UnifiedPreferenceFragment import net.saik0.android.unifiedpreference.UnifiedPreferenceFragment
import net.saik0.android.unifiedpreference.UnifiedSherlockPreferenceActivity import net.saik0.android.unifiedpreference.UnifiedSherlockPreferenceActivity
import org.jraf.android.backport.switchwidget.Switch import org.jraf.android.backport.switchwidget.Switch
import android.content.pm.PackageManager import android.content.pm.{PackageInfo, PackageManager}
import android.net.{Uri, VpnService} import android.net.{Uri, VpnService}
import android.webkit.{WebViewClient, WebView} import android.webkit.{WebViewClient, WebView}
...@@ -270,6 +270,19 @@ class Shadowsocks ...@@ -270,6 +270,19 @@ class Shadowsocks
Utils.runRootCommand(sb.toString()) Utils.runRootCommand(sb.toString())
} }
private def getVersionName: String = {
var version: String = null
try {
val pi: PackageInfo = getPackageManager.getPackageInfo(getPackageName, 0)
version = pi.versionName
} catch {
case e: PackageManager.NameNotFoundException => {
version = "Package name not found"
}
}
version
}
private def isTextEmpty(s: String, msg: String): Boolean = { private def isTextEmpty(s: String, msg: String): Boolean = {
if (s == null || s.length <= 0) { if (s == null || s.length <= 0) {
showDialog(msg) showDialog(msg)
...@@ -380,13 +393,19 @@ class Shadowsocks ...@@ -380,13 +393,19 @@ class Shadowsocks
override def onOptionsItemSelected(item: MenuItem): Boolean = { override def onOptionsItemSelected(item: MenuItem): Boolean = {
item.getItemId match { item.getItemId match {
case 0 => case 0 => {
EasyTracker.getTracker.sendEvent(Shadowsocks.TAG, "reset", getVersionName, 0L)
recovery() recovery()
case 1 => }
case 1 => {
EasyTracker.getTracker.sendEvent(Shadowsocks.TAG, "about", getVersionName, 0L)
showAbout() showAbout()
case 2 => }
case 2 => {
EasyTracker.getTracker.sendEvent(Shadowsocks.TAG, "donate", getVersionName, 0L)
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.donate_address)))) startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.donate_address))))
} }
}
super.onOptionsItemSelected(item) super.onOptionsItemSelected(item)
} }
......
...@@ -367,7 +367,7 @@ class ShadowsocksService extends Service { ...@@ -367,7 +367,7 @@ class ShadowsocksService extends Service {
override def onCreate() { override def onCreate() {
super.onCreate() super.onCreate()
EasyTracker.getTracker.sendEvent("service", "start", getVersionName, 0L) EasyTracker.getTracker.sendEvent(TAG, "start", getVersionName, 0L)
settings = PreferenceManager.getDefaultSharedPreferences(this) settings = PreferenceManager.getDefaultSharedPreferences(this)
notificationManager = this notificationManager = this
.getSystemService(Context.NOTIFICATION_SERVICE) .getSystemService(Context.NOTIFICATION_SERVICE)
...@@ -406,7 +406,7 @@ class ShadowsocksService extends Service { ...@@ -406,7 +406,7 @@ class ShadowsocksService extends Service {
/** Called when the activity is closed. */ /** Called when the activity is closed. */
override def onDestroy() { override def onDestroy() {
EasyTracker.getTracker.sendEvent("service", "stop", getVersionName, 0L) EasyTracker.getTracker.sendEvent(TAG, "stop", getVersionName, 0L)
stopForegroundCompat(1) stopForegroundCompat(1)
new Thread { new Thread {
override def run() { override def run() {
......
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