Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
aa0d9442
Commit
aa0d9442
authored
Jun 17, 2013
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add adview for testing servers
parent
1e6ec8c1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
11 deletions
+32
-11
build.sbt
build.sbt
+2
-1
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+10
-6
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+20
-4
No files found.
build.sbt
View file @
aa0d9442
...
...
@@ -6,7 +6,8 @@ libraryDependencies ++= Seq(
"com.google.android"
%
"support-v4"
%
"r12"
,
"com.google.android.analytics"
%
"analytics"
%
"2.0beta4"
,
"dnsjava"
%
"dnsjava"
%
"2.1.5"
,
"com.nostra13.universalimageloader"
%
"universal-image-loader"
%
"1.8.4"
"com.nostra13.universalimageloader"
%
"universal-image-loader"
%
"1.8.4"
,
"com.google.android.admob"
%
"admob"
%
"6.3.1"
)
libraryDependencies
++=
Seq
(
...
...
src/main/AndroidManifest.xml
View file @
aa0d9442
...
...
@@ -23,7 +23,11 @@
android:label=
"@string/app_name"
>
<meta-data
android:name=
"com.google.android.backup.api_key"
android:value=
"AEdPqrEAAAAI_zVxZthz2HDuz9toTvkYvL0L5GA-OjeUIfBeXg"
/>
android:value=
"AEdPqrEAAAAI_zVxZthz2HDuz9toTvkYvL0L5GA-OjeUIfBeXg"
/>
<activity
android:name=
"com.google.ads.AdActivity"
android:configChanges=
"keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
/>
<activity
android:name=
".Shadowsocks"
...
...
@@ -36,11 +40,11 @@
</intent-filter>
</activity>
<activity
android:name=
".ShadowVpnActivity"
android:theme=
"@android:style/Theme.Translucent.NoTitleBar"
android:launchMode=
"singleTask"
>
</activity>
<activity
android:name=
".ShadowVpnActivity"
android:theme=
"@android:style/Theme.Translucent.NoTitleBar"
android:launchMode=
"singleTask"
>
</activity>
<activity
android:name=
".AppManager"
...
...
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
aa0d9442
...
...
@@ -44,10 +44,8 @@ import android.graphics.Typeface
import
android.os._
import
android.preference.
{
CheckBoxPreference
,
Preference
,
PreferenceManager
}
import
android.util.Log
import
android.view.KeyEvent
import
android.widget.CompoundButton
import
android.widget.RelativeLayout
import
android.widget.TextView
import
android.view.
{
ViewParent
,
KeyEvent
}
import
android.widget.
{
LinearLayout
,
CompoundButton
,
RelativeLayout
,
TextView
}
import
com.actionbarsherlock.view.Menu
import
com.actionbarsherlock.view.MenuItem
import
com.google.analytics.tracking.android.EasyTracker
...
...
@@ -67,6 +65,7 @@ import android.webkit.{WebViewClient, WebView}
import
android.app.backup.BackupManager
import
scala.concurrent.ops._
import
android.content.SharedPreferences.OnSharedPreferenceChangeListener
import
com.google.ads.
{
AdRequest
,
AdSize
,
AdView
}
object
Shadowsocks
{
...
...
@@ -362,6 +361,8 @@ class Shadowsocks
setHeaderRes
(
R
.
xml
.
shadowsocks_headers
)
super
.
onCreate
(
savedInstanceState
)
val
switchLayout
=
getLayoutInflater
.
inflate
(
R
.
layout
.
layout_switch
,
null
)
.
asInstanceOf
[
RelativeLayout
]
...
...
@@ -381,6 +382,21 @@ class Shadowsocks
receiver
=
new
StateBroadcastReceiver
()
registerReceiver
(
receiver
,
new
IntentFilter
(
Action
.
UPDATE_STATE
))
if
(
settings
.
getString
(
Key
.
proxy
,
""
)
==
"198.199.101.152"
)
{
val
adView
=
new
AdView
(
this
,
AdSize
.
SMART_BANNER
,
"a151becb8068b09"
)
val
layoutView
=
{
def
getLayoutView
(
view
:
ViewParent
)
:
LinearLayout
=
{
view
match
{
case
layout
:
LinearLayout
=>
layout
case
_
=>
getLayoutView
(
view
.
getParent
)
}
}
getLayoutView
(
getListView
)
}
layoutView
.
addView
(
adView
,
0
)
adView
.
loadAd
(
new
AdRequest
)
}
val
init
:
Boolean
=
!
Shadowsocks
.
isServiceStarted
(
this
)
if
(
init
)
{
if
(
progressDialog
==
null
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment