diff --git a/README.md b/README.md index 68fc758..dfb71ff 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ https://github.com/user-attachments/assets/6182efdb-9862-47ee-9fa7-011a64ee87eb | Layer | Technology | |---|---| -| BitTorrent engine | [libtorrent-rasterbar](https://libtorrent.org) RC_2_0 (C++17, BSD-3-Clause) | +| BitTorrent engine | [libtorrent-rasterbar](https://libtorrent.org) RC_2_1 (C++17, BSD-3-Clause) | | Native bridge | Android NDK r29, JNI (`torrent_jni.cpp`) | | Build system | CMake 3.22, Gradle AGP 9.0.1 | | Language | Kotlin 2.3.20 | @@ -109,7 +109,7 @@ SimpleTorrent/ │ └── res/ │ ├── drawable/ # Adaptive icon (vector magnet) │ └── xml/file_provider_paths.xml -├── libs/libtorrent/ # Git submodule (RC_2_0 branch) +├── libs/libtorrent/ # Git submodule (RC_2_1 branch) ├── .github/workflows/android.yml # CI pipeline ├── LICENSE # MIT (app) + BSD-3-Clause (libtorrent) └── README.md diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index f42edc5..773d874 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -17,6 +17,8 @@ endif() set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) set(encryption OFF CACHE BOOL "" FORCE) +# WebTorrent (libtorrent 2.1+) needs libdatachannel + a TLS stack; staged for later +set(webtorrent OFF CACHE BOOL "" FORCE) set(dht ON CACHE BOOL "" FORCE) set(build_tests OFF CACHE BOOL "" FORCE) set(build_examples OFF CACHE BOOL "" FORCE) diff --git a/app/src/main/java/com/jpcottin/simpletorrent/data/SampleTorrents.kt b/app/src/main/java/com/jpcottin/simpletorrent/data/SampleTorrents.kt index 3b82826..42bec37 100644 --- a/app/src/main/java/com/jpcottin/simpletorrent/data/SampleTorrents.kt +++ b/app/src/main/java/com/jpcottin/simpletorrent/data/SampleTorrents.kt @@ -22,6 +22,11 @@ val SAMPLE_TORRENTS = listOf( "Blender film, CC BY 3.0", "magnet:?xt=urn:btih:08ada5a7a6183aae1e09d831df6748d566095a10&dn=Sintel&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fsintel.torrent", ), + SampleTorrent( + "Sintel as WebTorrent", + "Same film with wss:// trackers — WebTorrent demo, browser-peer support coming", + "magnet:?xt=urn:btih:08ada5a7a6183aae1e09d831df6748d566095a10&dn=Sintel&tr=wss%3A%2F%2Ftracker.webtorrent.dev&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.btorrent.xyz&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fsintel.torrent", + ), SampleTorrent( "Tears of Steel", "Blender film, CC BY 3.0, includes subtitles", diff --git a/libs/libtorrent b/libs/libtorrent index 8d58b0e..8726401 160000 --- a/libs/libtorrent +++ b/libs/libtorrent @@ -1 +1 @@ -Subproject commit 8d58b0e78b9d646c3ccce433bc52d58f341908ed +Subproject commit 87264011d17e167a50149a3b7e212f8205ca0416