Tribler Android App

.pylintrc

@@ -128,7 +128,7 @@ ignored-modules=
 # List of classes names for which member attributes should not be checked
 # (useful for classes with attributes dynamically set). This supports can work
 # with qualified names.
-ignored-classes=SQLObject,twisted.internet.reactor,ephem,libtorrent
+ignored-classes=SQLObject,twisted.internet.reactor,ephem,libtorrent,sh
 
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E1101 when accessed. Python regular

Tribler/Core/osutils.py

@@ -136,7 +136,7 @@ def get_home_dir():
         return os.path.realpath(unicode(os.environ['EXTERNAL_STORAGE']))
 
     def get_appstate_dir():
-        return os.path.realpath(os.path.join(unicode(os.environ['ANDROID_PRIVATE']), u'../.Tribler'))
+        return os.path.join(get_home_dir(), u'.Tribler')
 
     def get_picture_dir():
         return os.path.join(get_home_dir(), u'DCIM')

Tribler/community/tunnel/tunnel_community.py

@@ -218,7 +218,7 @@ def __init__(self, tribler_session=None):
 
         self.min_circuits = 4
         self.max_circuits = 8
-        self.max_relays_or_exits = 100
+        self.max_relays_or_exits = 10
 
         self.max_time = 10 * 60
         self.max_time_inactive = 20

android/TriblerApp/app/build.gradle

@@ -0,0 +1,281 @@
+// Automatically increment version code by 1 each build
+def Properties versionProps = new Properties()
+def versionPropsFile = file('version.properties')
+if (versionPropsFile.exists())
+    versionProps.load(new FileInputStream(versionPropsFile))
+def code = (versionProps['VERSION_CODE'] ?: "0").toInteger() + 1
+versionProps['VERSION_CODE'] = code.toString()
+versionProps.store(versionPropsFile.newWriter(), null)
+
+// Gradle experimental format
+apply plugin: 'com.android.model.application'
+//apply plugin: 'com.android.library'
+//apply plugin: 'com.jakewharton.butterknife'
+
+model {
+    android {
+        // Use latest and greatest version
+        buildToolsVersion "25.0.0"
+        compileSdkVersion 24
+
+        defaultConfig {
+            applicationId "org.tribler.android"
+            // Android Beam supports large payload transfers
+            // over Bluetooth since api level 16
+            // Dynamic linker works properly since api level 18
+            minSdkVersion.apiLevel 18
+            // Compatible up to api level 23
+            // Avoid new strict file security measures of api level 24
+            targetSdkVersion.apiLevel 23
+            // Auto increment, see above
+            versionCode code
+            // Used for python files versioning
+            versionName "build " + code
+            // Backwards compatibility for vector graphics
+            vectorDrawables.useSupportLibrary = true
+            // Java 8 features
+            jackOptions {
+                enabled = true
+            }
+            // Gradle experimental create build
+            buildConfigFields {
+                create() {
+                    type "int"
+                    name "VALUE"
+                    value "1"
+                }
+            }
+            testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        }
+        // NDK config mirrors python-for-android toolchain config
+        ndk {
+            abiFilters.add("armeabi-v7a")
+            moduleName = "main"
+            toolchain = "gcc"
+            toolchainVersion = "4.9"
+            platformVersion = 18
+            stl = "gnustl_shared"
+            renderscriptNdkMode = false
+            CFlags.add("-I" + file("src/main/jni/include/python2.7"))
+            ldFlags.add("-L" + file("src/main/jni/lib"))
+            ldLibs.addAll(["log", "python2.7"])
+        }
+        // Configures source set directory.
+        sources {
+            main {
+                // All native code is already compiled and in jniLibs
+                // start.c and pyjniusjni.c are still required for jni
+                jni {
+                    source {
+                        exclude "**/winsock_pointers.c"
+                        exclude "**/iocpsupport.c"
+                        exclude "**/portmap.c"
+                    }
+                }
+                // References prebuilt libraries defined below
+                jniLibs {
+                    dependencies {
+                        library "gnustl_shared"
+                        library "boost_system"
+                        library "boost_date_time"
+                        library "boost_python"
+                        library "crypto"
+                        library "ssl"
+                        library "ffi"
+                        library "sodium"
+                        library "torrent_rasterbar"
+                        library "leveldb"
+                        library "sqlite3"
+                        /*/ VLC
+                        library "cpp_shared"
+                        library "anw10"
+                        library "anw13"
+                        library "anw14"
+                        library "anw18"
+                        library "anw21"
+                        library "compat7"
+                        library "iomx10"
+                        library "iomx13"
+                        library "iomx14"
+                        library "vlc"
+                        library "vlc_jni"*/
+                    }
+                }
+            }
+        }
+    }
+    repositories {
+        // Prebuilt with python-for-android toolchain
+        libs(PrebuiltLibraries) {
+            gnustl_shared {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libgnustl_shared.so")
+                }
+            }
+            boost_date_time {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libboost_date_time.so")
+                }
+            }
+            boost_python {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libboost_python.so")
+                }
+            }
+            boost_system {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libboost_system.so")
+                }
+            }
+            crypto {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libcrypto1.0.2h.so")
+                }
+            }
+            ssl {
+                binaries.withType(SharedLibraryBinary) {
+                    // Android does not have regular versioning of .so files, but ships with an
+                    // old version of openssl which prevents the loading libssl.so bundled with
+                    // the app, therefore a custom name with version is introduced
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libssl1.0.2h.so")
+                }
+            }
+            ffi {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libffi.so")
+                }
+            }
+            sodium {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libsodium.so")
+                }
+            }
+            torrent_rasterbar {
+                binaries.withType(SharedLibraryBinary) {
+                    // When the python bindings shared library and the native one have the same name
+                    // it causes a cyclic dependency reference on runtime, therefore the native
+                    // .so file was renamed to include _rasterbar
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libtorrent_rasterbar.so")
+                }
+            }
+            leveldb {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libleveldb.so")
+                }
+            }
+            sqlite3 {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libsqlite3.so")
+                }
+            }
+            /*/ VLC binaries
+            cpp_shared {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libc++_shared.so")
+                }
+            }
+            anw10 {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libanw.10.so")
+                }
+            }
+            anw13 {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libanw.13.so")
+                }
+            }
+            anw14 {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libanw.14.so")
+                }
+            }
+            anw18 {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libanw.18.so")
+                }
+            }
+            anw21 {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libanw.21.so")
+                }
+            }
+            compat7 {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libcompat.7.so")
+                }
+            }
+            iomx10 {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libiomx.10.so")
+                }
+            }
+            iomx13 {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libiomx.13.so")
+                }
+            }
+            iomx14 {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libiomx.14.so")
+                }
+            }
+            vlc {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libvlc.so")
+                }
+            }
+            vlc_jni {
+                binaries.withType(SharedLibraryBinary) {
+                    sharedLibraryFile = file("src/main/jniLibs/armeabi-v7a/libvlcjni.so")
+                }
+            }*/
+        }
+    }
+}
+dependencies {
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile fileTree(include: ['*.jar'], dir: 'jniLibs')
+
+    compile 'com.android.support:support-v4:24.2.1'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:recyclerview-v7:24.2.1'
+    compile 'com.android.support:cardview-v7:24.2.1'
+
+    compile 'com.google.code.gson:gson:2.7'
+    compile 'xyz.danoz:recyclerviewfastscroller:0.1.3'
+    compile 'com.github.medyo:fancybuttons:1.8.2'
+    compile 'com.jakewharton:butterknife:8.4.0'
+
+    compile 'io.reactivex:rxandroid:1.2.1'
+    compile 'io.reactivex:rxjava:1.2.2'
+    compile 'com.cantrowitz:rxbroadcast:1.0.0'
+    compile 'com.jakewharton.rxbinding:rxbinding:0.4.0'
+    compile 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
+    compile 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
+    compile 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
+    compile 'com.jakewharton.rxbinding:rxbinding-recyclerview-v7:0.4.0'
+
+    compile 'com.squareup.okhttp3:okhttp:3.4.2'
+    compile 'com.squareup.retrofit2:retrofit:2.1.0'
+    compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
+    compile 'com.squareup.retrofit2:converter-gson:2.1.0'
+
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
+
+    //DEBUG
+    compile 'com.facebook.stetho:stetho:1.4.1'
+    compile 'com.facebook.stetho:stetho-okhttp3:1.4.1'
+    compile 'com.squareup.leakcanary:leakcanary-android:1.5'
+    //compile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+
+    androidTestCompile 'com.android.support:support-annotations:24.2.1'
+    androidTestCompile 'com.android.support.test:runner:0.5'
+    androidTestCompile 'com.android.support.test:rules:0.5'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+
+    testCompile 'junit:junit:4.12'
+    testCompile 'com.squareup.okhttp3:mockwebserver:3.4.2'
+    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+}

android/TriblerApp/app/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/paul/android-sdk-linux/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

android/TriblerApp/app/src/androidTest/java/org/tribler/android/ApplicationTest.java

@@ -0,0 +1,13 @@
+package org.tribler.android;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}