[tbb-commits] [tor-browser-build/maint-8.5] Bug 30371 - Stop hard-coding the content provider name in tor-android-service

[gk at torproject.org]

commit cd0b5f890776447ec0c2cd7932fcb011517db6c7
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Thu May 2 20:47:44 2019 +0000

    Bug 30371 - Stop hard-coding the content provider name in tor-android-service
---
 projects/tor-android-service/build                  |  1 -
 projects/tor-android-service/config                 |  1 -
 projects/tor-android-service/content-provider.patch | 13 -------------
 3 files changed, 15 deletions(-)

diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build
index 7c5582a..10c2f04 100644
--- a/projects/tor-android-service/build
+++ b/projects/tor-android-service/build
@@ -18,7 +18,6 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 # Patch projects
 cd /var/tmp/build/[% project %]-[% c('version') %]
 patch -p1 < $rootdir/gradle.patch
-patch -p1 < $rootdir/content-provider.patch
 patch -p1 < $rootdir/require-api.patch
 
 # Remove native files, otherwise build will fail after gradle.patch
diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config
index e2304d1..5454c94 100644
--- a/projects/tor-android-service/config
+++ b/projects/tor-android-service/config
@@ -27,7 +27,6 @@ input_files:
     name: gradle-dependencies
     exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
   - filename: gradle.patch
-  - filename: content-provider.patch
   - filename: require-api.patch
   - project: tor-onion-proxy-library
     name: topl
diff --git a/projects/tor-android-service/content-provider.patch b/projects/tor-android-service/content-provider.patch
deleted file mode 100644
index b026728..0000000
--- a/projects/tor-android-service/content-provider.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/service/src/main/java/org/torproject/android/service/DataService.java b/service/src/main/java/org/torproject/android/service/DataService.java
-index 8f802ea..07e52f3 100644
---- a/service/src/main/java/org/torproject/android/service/DataService.java
-+++ b/service/src/main/java/org/torproject/android/service/DataService.java
-@@ -28,7 +28,7 @@ final class DataService {
-         this.torService = torService;
-         this.eventBroadcaster = eventBroadcaster;
-         this.torConfig = torConfig;
--        String packageName = context.getApplicationInfo().packageName;
-+        String packageName = "org.torproject.torbrowser";
-         COOKIE_CONTENT_URI = Uri.parse("content://" + packageName + ".ui.hiddenservices.providers.cookie/cookie");
-         HS_CONTENT_URI = Uri.parse("content://" + packageName + ".ui.hiddenservices.providers/hs");
-     }