get geoip files as JARs from jcenter Maven repo

guardianproject · May 4, 2021 · 9b483cf · 9b483cf
1 parent afb3ae7
commit 9b483cf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/app-mini/src/main/assets/common/geoip b/app-mini/src/main/assets/common/geoip
diff --git a/app-mini/src/main/assets/common/geoip6 b/app-mini/src/main/assets/common/geoip6
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
@@ -64,6 +64,8 @@ dependencies {
 
     implementation 'com.offbynull.portmapper:portmapper:2.0.5'
 
+    implementation 'info.guardianproject:geoip:20191217'
+
     api 'info.guardianproject:jtorctl:0.4'
 
     implementation 'com.github.tladesignz:IPtProxy:0.5.2'

diff --git a/...service/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java b/...service/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java
@@ -4,6 +4,8 @@
 import android.content.pm.ApplicationInfo;
 import android.util.Log;
 
+import org.torproject.android.service.TorServiceConstants;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -16,12 +18,6 @@ public class CustomTorResourceInstaller {
 
     private static final String TAG = "CustomTorResourceInstaller";
 
-    String COMMON_ASSET_KEY = "common/";
-
-    //geoip data file asset key
-    String GEOIP_ASSET_KEY = "geoip";
-    String GEOIP6_ASSET_KEY = "geoip6";
-
     private File installFolder;
     private Context context;
 
@@ -98,15 +94,14 @@ private static File[] listf(String directoryName) {
         return fList;
     }
 
-    //
     /*
      * Extract the Tor resources from the APK file using ZIP
      */
     public void installGeoIP() throws IOException {
         if (!installFolder.exists())
             installFolder.mkdirs();
-        assetToFile(COMMON_ASSET_KEY + GEOIP_ASSET_KEY, GEOIP_ASSET_KEY, false, false);
-        assetToFile(COMMON_ASSET_KEY + GEOIP6_ASSET_KEY, GEOIP6_ASSET_KEY, false, false);
+        assetToFile(TorServiceConstants.GEOIP_ASSET_KEY, TorServiceConstants.GEOIP_ASSET_KEY, false, false);
+        assetToFile(TorServiceConstants.GEOIP6_ASSET_KEY, TorServiceConstants.GEOIP6_ASSET_KEY, false, false);
     }
 
     /*