Compare commits

...

9 Commits
1.1.1 ... 1.1.2

Author SHA1 Message Date
2dust
f25aaf43d7 Update V2RayVpnService.kt 2019-09-24 13:12:39 +08:00
2dust
3b365533fc Create libv2ray.aar 2019-09-02 08:48:17 +08:00
2dust
a982327030 Update .gitignore 2019-09-02 08:48:11 +08:00
2dust
6ce12b2ea5 Update AndroidManifest.xml 2019-09-02 08:47:01 +08:00
2dust
d7f3ed5182 Update BaseDrawerActivity.kt 2019-09-02 08:46:58 +08:00
2dust
f519103b3e Update MainActivity.kt 2019-09-02 08:46:54 +08:00
2dust
d7c40ee883 Update SettingsActivity.kt 2019-09-02 08:46:50 +08:00
2dust
809d50689b Update gradle.properties 2019-09-02 08:46:36 +08:00
2dust
042def7e83 Update V2RayVpnService.kt 2019-08-27 15:14:22 +08:00
8 changed files with 8 additions and 8 deletions

1
.gitignore vendored
View File

@@ -4,7 +4,6 @@ V2rayNG/app/src/main/assets/geosite.dat
V2rayNG/app/src/main/java/com/v2ray/ang/InappBuyActivity.java
V2rayNG/gradle/wrapper/gradle-wrapper.properties
V2rayNG/gradle/wrapper/gradle-wrapper.properties
*.aar
*.dat
*.jks
V2rayNG/gradle/wrapper/gradle-wrapper.properties

Binary file not shown.

View File

@@ -57,7 +57,7 @@
<activity android:name=".ui.SettingsActivity" />
<activity android:name=".ui.PerAppProxyActivity" />
<activity android:name=".ui.ScannerActivity" />
<activity android:name=".InappBuyActivity" />
<!-- <activity android:name=".InappBuyActivity" />-->
<activity android:name=".ui.LogcatActivity" />
<activity
android:name=".ui.RoutingSettingsActivity"

View File

@@ -103,6 +103,7 @@ class V2RayVpnService : VpnService() {
val policy = StrictMode.ThreadPolicy.Builder().permitAll().build()
StrictMode.setThreadPolicy(policy)
v2rayPoint.packageName = Utils.packagePath(applicationContext)
Seq.setContext(applicationContext)
}
override fun onRevoke() {

View File

@@ -13,7 +13,7 @@ import android.support.v7.widget.Toolbar
import android.util.Log
import android.view.MenuItem
import android.view.View
import com.v2ray.ang.InappBuyActivity
//import com.v2ray.ang.InappBuyActivity
import com.v2ray.ang.R
import org.jetbrains.anko.startActivity
@@ -63,7 +63,7 @@ abstract class BaseDrawerActivity : BaseActivity() {
return
}
R.id.donate -> {
startActivity<InappBuyActivity>()
// startActivity<InappBuyActivity>()
return
}
}

View File

@@ -27,7 +27,7 @@ import android.support.v4.view.GravityCompat
import android.support.v7.app.ActionBarDrawerToggle
import android.support.v7.widget.helper.ItemTouchHelper
import android.util.Log
import com.v2ray.ang.InappBuyActivity
//import com.v2ray.ang.InappBuyActivity
import rx.Observable
import rx.android.schedulers.AndroidSchedulers
import java.util.concurrent.TimeUnit
@@ -561,7 +561,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
Utils.openUri(this, AppConfig.promotionUrl)
}
R.id.donate -> {
startActivity<InappBuyActivity>()
// startActivity<InappBuyActivity>()
}
R.id.logcat -> {
startActivity<LogcatActivity>()

View File

@@ -9,7 +9,7 @@ import android.preference.EditTextPreference
import android.preference.Preference
import android.preference.PreferenceFragment
import com.v2ray.ang.BuildConfig
import com.v2ray.ang.InappBuyActivity
//import com.v2ray.ang.InappBuyActivity
import com.v2ray.ang.R
import com.v2ray.ang.AppConfig
import com.v2ray.ang.extension.defaultDPreference

View File

@@ -6,7 +6,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx1024m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
#
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit