Commit bec2235c authored by sisbell's avatar sisbell
Browse files

Fixes #13: Methods/classes that Tor Browser Build uses are missing

parent f3899d45

jsocksAndroid/build.gradle

+3 −1
Original line number Diff line number Diff line 
apply plugin: 'com.android.library'



android {

    defaultConfig {

        consumerProguardFiles 'proguard-rules.pro'

    }

    buildTypes {

        release {

            minifyEnabled false

            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'

        }

    }

jsocksAndroid/proguard-rules.pro

0 → 100644
+3 −0
Original line number Diff line number Diff line 
-keep public class com.runjva.** {

  public protected *;

}
 
 No newline at end of file

service/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ android { 
        versionCode 1

        versionName "1.0"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

        consumerProguardFiles 'proguard-rules.pro'

    }

    buildTypes {

        release {

            minifyEnabled false

            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

        }

    }

service/proguard-rules.pro

+15 −0
Original line number Diff line number Diff line
@@ -19,3 +19,18 @@ 
# If you keep the line number information, uncomment this to

# hide the original source file name.

#-renamesourcefileattribute SourceFile

-keep class org.torproject.android.service.vpn.Tun2Socks {

    void logTun2Socks(java.lang.String, java.lang.String, java.lang.String);

}



-keepclassmembers class org.torproject.android.service.TorServiceConstants {

  public *;

}



-keepclassmembers class org.torproject.android.service.util.NotificationBuilderCompat {

  public *;

}



-keepclassmembers class org.torproject.android.service.util.Prefs {

  public *;

}
 
 No newline at end of file

service/src/main/java/org/torproject/android/service/TorService.java

+1 −1
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ import android.net.NetworkInfo; 
import android.os.Build;

import android.os.IBinder;

import android.support.annotation.RequiresApi;

import android.support.v4.app.NotificationCompat;

import android.text.TextUtils;

import android.util.Log;

import com.msopentech.thali.android.toronionproxy.AndroidOnionProxyManager;

import com.msopentech.thali.toronionproxy.TorConfigBuilder;

import org.torproject.android.service.util.NotificationBuilderCompat;

import org.torproject.android.service.util.Prefs;

import org.torproject.android.service.util.TorServiceUtils;

import org.torproject.android.service.vpn.TorVpnService;