Skip to content

Commit

Permalink
update to v6.3.1 based on NekoBoxForAndroid
Browse files Browse the repository at this point in the history
  • Loading branch information
bannedbook committed Nov 28, 2023
1 parent 771a2f7 commit 0c1f17e
Show file tree
Hide file tree
Showing 5,374 changed files with 49,633 additions and 1,348,389 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
39 changes: 0 additions & 39 deletions .circleci/config.yml

This file was deleted.

20 changes: 17 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,39 @@
# Gradle & Android Studio
local.properties
.gradle/
.externalNativeBuild/
build/

captures/
release/

.idea/
*.iml
.gradle
.idea
.vscode
/.idea
/local.properties
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
.DS_Store
/build
build/
/captures
.externalNativeBuild

.cxx
local.properties
# release apks
/app/libs/
/app/src/main/assets/sing-box
/app/src/main/java/SpeedUpVPN
/service_account_credentials.json
jniLibs/
/library/libcore_build/
.idea/deploymentTargetDropDown.xml
/nkmr

# submodules
/external
*.apk
*.bak
gitupdate.*
Expand Down
38 changes: 0 additions & 38 deletions .gitmodules

This file was deleted.

14 changes: 0 additions & 14 deletions .travis.yml

This file was deleted.

8 changes: 4 additions & 4 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Shadowsocks-android was originally created in late 2013, by
Max Lv <[email protected]>.
SagerNet was originally created in late 2021, by
nekohasekai <[email protected]>.

Here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
people who have submitted patches, fixed bugs, added translations, and
generally made shadowsocks-android that much better:
generally made SagerNet that much better:

https://github.com/shadowsocks/shadowsocks-android/graphs/contributors
https://github.com/SagerNet/SagerNet/graphs/contributors
10 changes: 0 additions & 10 deletions CONTRIBUTING.md

This file was deleted.

7 changes: 2 additions & 5 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@

Copyright (C) 2017 by Max Lv <[email protected]>
Copyright (C) 2017 by Mygod Studio <[email protected]>
Copyright (C) 2021 by nekohasekai <[email protected]>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -13,5 +11,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

along with this program. If not, see <http://www.gnu.org/licenses/>.
39 changes: 8 additions & 31 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,17 @@ https://www.youtube.com/watch?v=JE8xRj7_eBQ

更多翻墙信息,请访问[bannedbook翻墙主页](https://github.com/bannedbook/fanqiang/wiki)

### PREREQUISITES

* JDK 1.8
* Android SDK
- Android NDK

### BUILD

You can check whether the latest commit builds under UNIX environment by checking Travis status.

* Clone the repo using `git clone --recurse-submodules <repo>` or update submodules using `git submodule update --init --recursive`
* Build it using Android Studio or gradle script
### LICENSE

## OPEN SOURCE LICENSES
Copyright (C) [bannedbook fanqiang](https://github.com/bannedbook/fanqiang/wiki)

<ul>
<li>Shadowsocks-android: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/LICENSE">GPLv3</a></li>
<li>ShadowsocksRb: <a href="https://github.com/shadowsocksRb/shadowsocksRb-android/blob/master/LICENSE">GPLv3</a></li>
<li>Polipo: <a href="https://github.com/jech/polipo/blob/master/COPYING">MIT</a></li>
<li>V2rayNG: <a href="https://github.com/2dust/v2rayNG/blob/master/LICENSE">GPLv3</a></li>
</ul>
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

### LICENSE
Copyright (C) [bannedbook fanqiang](https://github.com/bannedbook/fanqiang/wiki)
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
### Credits

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
https://github.com/MatsuriDayo/NekoBoxForAndroid
File renamed without changes.
78 changes: 78 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
@file:Suppress("UnstableApiUsage")

plugins {
id("com.android.application")
id("kotlin-android")
id("kotlin-kapt")
id("kotlin-parcelize")
}

setupApp()

android {
compileOptions {
isCoreLibraryDesugaringEnabled = true
}
kapt.arguments {
arg("room.incremental", true)
arg("room.schemaLocation", "$projectDir/schemas")
}
bundle {
language {
enableSplit = false
}
}
buildFeatures {
viewBinding = true
}
namespace = "io.nekohasekai.sagernet"
}

dependencies {

implementation(fileTree("libs"))

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.recyclerview:recyclerview:1.3.0")
implementation("androidx.activity:activity-ktx:1.7.0")
implementation("androidx.fragment:fragment-ktx:1.5.6")
implementation("androidx.browser:browser:1.5.0")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.navigation:navigation-fragment-ktx:2.5.3")
implementation("androidx.navigation:navigation-ui-ktx:2.5.3")
implementation("androidx.preference:preference-ktx:1.2.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.work:work-runtime-ktx:2.8.1")
implementation("androidx.work:work-multiprocess:2.8.1")

implementation("com.google.android.material:material:1.8.0")
implementation("com.google.code.gson:gson:2.9.0")

implementation("com.github.jenly1314:zxing-lite:2.1.1")
implementation("com.blacksquircle.ui:editorkit:2.6.0")
implementation("com.blacksquircle.ui:language-base:2.6.0")
implementation("com.blacksquircle.ui:language-json:2.6.0")

implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.3")
implementation("org.yaml:snakeyaml:1.30")
implementation("com.github.daniel-stoneuk:material-about-library:3.2.0-rc01")
implementation("com.jakewharton:process-phoenix:2.1.2")
implementation("com.esotericsoftware:kryo:5.2.1")
implementation("com.google.guava:guava:31.0.1-android")
implementation("org.ini4j:ini4j:0.5.4")

implementation("com.simplecityapps:recyclerview-fastscroll:2.0.1") {
exclude(group = "androidx.recyclerview")
exclude(group = "androidx.appcompat")
}

implementation("androidx.room:room-runtime:2.5.1")
kapt("androidx.room:room-compiler:2.5.1")
implementation("androidx.room:room-ktx:2.5.1")
implementation("com.github.MatrixDev.Roomigrant:RoomigrantLib:0.3.4")
kapt("com.github.MatrixDev.Roomigrant:RoomigrantCompiler:0.3.4")
implementation ("com.google.android.gms:play-services-ads:22.5.0")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
}
1 change: 1 addition & 0 deletions app/executableSo/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.so
47 changes: 47 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
-repackageclasses ''
-allowaccessmodification

-keep class io.nekohasekai.sagernet.** { *;}
-keep class moe.matsuri.nb4a.** { *;}

# Clean Kotlin
-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
static void checkExpressionValueIsNotNull(java.lang.Object, java.lang.String);
static void checkNotNullExpressionValue(java.lang.Object, java.lang.String);
static void checkReturnedValueIsNotNull(java.lang.Object, java.lang.String, java.lang.String);
static void checkReturnedValueIsNotNull(java.lang.Object, java.lang.String);
static void checkFieldIsNotNull(java.lang.Object, java.lang.String, java.lang.String);
static void checkFieldIsNotNull(java.lang.Object, java.lang.String);
static void checkNotNull(java.lang.Object);
static void checkNotNull(java.lang.Object, java.lang.String);
static void checkNotNullParameter(java.lang.Object, java.lang.String);
static void throwUninitializedPropertyAccessException(java.lang.String);
}

# ini4j
-keep public class org.ini4j.spi.** { <init>(); }

# SnakeYaml
-keep class org.yaml.snakeyaml.** { *; }

-dontobfuscate
-keepattributes SourceFile

-dontwarn java.beans.BeanInfo
-dontwarn java.beans.FeatureDescriptor
-dontwarn java.beans.IntrospectionException
-dontwarn java.beans.Introspector
-dontwarn java.beans.PropertyDescriptor
-dontwarn java.beans.Transient
-dontwarn java.beans.VetoableChangeListener
-dontwarn java.beans.VetoableChangeSupport
-dontwarn org.apache.harmony.xnet.provider.jsse.SSLParametersImpl
-dontwarn org.bouncycastle.jce.provider.BouncyCastleProvider
-dontwarn org.bouncycastle.jsse.BCSSLParameters
-dontwarn org.bouncycastle.jsse.BCSSLSocket
-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
-dontwarn org.openjsse.javax.net.ssl.SSLParameters
-dontwarn org.openjsse.javax.net.ssl.SSLSocket
-dontwarn org.openjsse.net.ssl.OpenJSSE
-dontwarn java.beans.PropertyVetoException
Loading

0 comments on commit 0c1f17e

Please sign in to comment.