Merge pull request #971 from hax0rbana-adam/vector-graphics-logo-with-CI

Fix CI/CD pipeline
guardianproject · Oct 5, 2023 · 2808663 · 2808663
2 parents 115c315 + 603a2ea
commit 2808663
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 16 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -16,9 +16,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 1.8
+    - name: set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 17
     - name: Build with Gradle
       run: ./gradlew build
diff --git a/app-tv/src/main/AndroidManifest.xml b/app-tv/src/main/AndroidManifest.xml
@@ -50,6 +50,9 @@
 
         </activity> <!-- This is for ensuring the background service still runs when/if the app is swiped away -->
 
+        <activity
+            android:name="org.torproject.android.core.ui.SettingsActivity"
+            android:label="@string/app_name" />
         <activity
             android:name=".ui.AppManagerActivity"
             android:label="@string/app_name"
@@ -89,4 +92,4 @@
 
 
 
-</manifest>
+</manifest>
diff --git a/app-tv/src/main/java/org/torproject/android/tv/TeeveeMainActivity.java b/app-tv/src/main/java/org/torproject/android/tv/TeeveeMainActivity.java
@@ -516,7 +516,8 @@ private synchronized void handleIntents() {
 
             if (urlString != null) {
 
-                if (urlString.toLowerCase().startsWith("bridge://")) {
+                var loc = new Locale.Builder().setLanguage(Prefs.getDefaultLocale()).build();
+                if (urlString.toLowerCase(loc).startsWith("bridge://")) {
                     String newBridgeValue = urlString.substring(9); //remove the bridge protocol piece
                     newBridgeValue = URLDecoder.decode(newBridgeValue); //decode the value here
 

diff --git a/appcore/src/main/AndroidManifest.xml b/appcore/src/main/AndroidManifest.xml
@@ -5,12 +5,12 @@
 
     <application>
         <activity
-            android:name=".BaseActivity"
+            android:name=".ui.BaseActivity"
             android:exported="false" />
         <activity
             android:name=".ui.SettingsActivity"
             android:exported="false"
             android:theme="@style/Theme.AppCompat"></activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -856,13 +856,17 @@ private void updateV3OnionNames() throws SecurityException {
         if (onionServices != null) {
             try {
                 while (onionServices.moveToNext()) {
-                    var domain = onionServices.getString(onionServices.getColumnIndex(OnionService.DOMAIN));
+                    var domain_index = onionServices.getColumnIndex(OnionService.DOMAIN);
+                    var path_index = onionServices.getColumnIndex(OnionService.PATH);
+                    var id_index = onionServices.getColumnIndex(OnionService._ID);
+                    if (domain_index < 0 || path_index < 0 || id_index < 0) continue;
+                    var domain = onionServices.getString(domain_index);
                     if (domain == null || TextUtils.isEmpty(domain)) {
-                        var path = onionServices.getString(onionServices.getColumnIndex(OnionService.PATH));
+                        var path = onionServices.getString(path_index);
                         var v3OnionDirPath = new File(mV3OnionBasePath.getAbsolutePath(), path).getCanonicalPath();
                         var hostname = new File(v3OnionDirPath, "hostname");
                         if (hostname.exists()) {
-                            int id = onionServices.getInt(onionServices.getColumnIndex(OnionService._ID));
+                            int id = onionServices.getInt(id_index);
                             domain = Utils.readString(new FileInputStream(hostname)).trim();
                             var fields = new ContentValues();
                             fields.put(OnionService.DOMAIN, domain);
@@ -1271,11 +1275,20 @@ private void addV3OnionServicesToTorrc(StringBuffer torrc, ContentResolver conte
             var onionServices = contentResolver.query(V3_ONION_SERVICES_CONTENT_URI, V3_ONION_SERVICE_PROJECTION, OnionService.ENABLED + "=1", null, null);
             if (onionServices != null) {
                 while (onionServices.moveToNext()) {
-                    var id = onionServices.getInt(onionServices.getColumnIndex(OnionService._ID));
-                    var localPort = onionServices.getInt(onionServices.getColumnIndex(OnionService.PORT));
-                    var onionPort = onionServices.getInt(onionServices.getColumnIndex(OnionService.ONION_PORT));
-                    var path = onionServices.getString(onionServices.getColumnIndex(OnionService.PATH));
-                    var domain = onionServices.getString(onionServices.getColumnIndex(OnionService.DOMAIN));
+                    var id_index = onionServices.getColumnIndex(OnionService._ID);
+                    var port_index = onionServices.getColumnIndex(OnionService.PORT);
+                    var onion_port_index = onionServices.getColumnIndex(OnionService.ONION_PORT);
+                    var path_index = onionServices.getColumnIndex(OnionService.PATH);
+                    var domain_index = onionServices.getColumnIndex(OnionService.DOMAIN);
+                    // Ensure that are have all the indexes before trying to use them
+                    if (id_index < 0 || port_index < 0 || onion_port_index < 0 || path_index < 0 || domain_index < 0)
+                      continue;
+
+                    var id = onionServices.getInt(id_index);
+                    var localPort = onionServices.getInt(port_index);
+                    var onionPort = onionServices.getInt(onion_port_index);
+                    var path = onionServices.getString(path_index);
+                    var domain = onionServices.getString(domain_index);
                     if (path == null) {
                         path = "v3";
                         if (domain == null)
@@ -1313,8 +1326,13 @@ private void addV3ClientAuthToTorrc(StringBuffer torrc, ContentResolver contentR
             try {
                 int i = 0;
                 while (v3auths.moveToNext()) {
-                    var domain = v3auths.getString(v3auths.getColumnIndex(V3ClientAuth.DOMAIN));
-                    var hash = v3auths.getString(v3auths.getColumnIndex(V3ClientAuth.HASH));
+                    var domain_index = v3auths.getColumnIndex(V3ClientAuth.DOMAIN);
+                    var hash_index = v3auths.getColumnIndex(V3ClientAuth.HASH);
+                    // Ensure that are have all the indexes before trying to use them
+                    if (domain_index < 0 || hash_index < 0 )
+                      continue;
+                    var domain = v3auths.getString(domain_index);
+                    var hash = v3auths.getString(hash_index);
                     var authFile = new File(mV3AuthBasePath, (i++) + ".auth_private");
                     authFile.createNewFile();
                     var fos = new FileOutputStream(authFile);