use a manifest permission to restrict access to internal broadcasts u…

…sed by notifications and other external sources
irccloud · Nov 6, 2017 · 857287d · 857287d
1 parent 4d4bcb2
commit 857287d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/com/irccloud/android/DashClock.java b/src/com/irccloud/android/DashClock.java
@@ -55,7 +55,7 @@ protected void onInitialize(boolean isReconnect) {
             }
         IntentFilter intentFilter = new IntentFilter(REFRESH_INTENT);
         receiver = new RefreshReceiver();
-        registerReceiver(receiver, intentFilter);
+        registerReceiver(receiver, intentFilter, BuildConfig.APPLICATION_ID + ".permission.BROADCAST", null);
     }
 
     @Override

diff --git a/src/com/irccloud/android/activity/MainActivity.java b/src/com/irccloud/android/activity/MainActivity.java
@@ -6055,7 +6055,7 @@ else if (lower.endsWith(".3gpp"))
 
             IntentFilter intentFilter = new IntentFilter();
             intentFilter.addAction(activity.getPackageName() + ".cancel_upload");
-            IRCCloudApplication.getInstance().getApplicationContext().registerReceiver(cancelListener, intentFilter);
+            IRCCloudApplication.getInstance().getApplicationContext().registerReceiver(cancelListener, intentFilter, BuildConfig.APPLICATION_ID + ".permission.BROADCAST", null);
 
             if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 NotificationChannel c = new NotificationChannel("upload_progress", "Upload Progress", NotificationManagerCompat.IMPORTANCE_LOW);

diff --git a/src/com/irccloud/android/data/collection/ImageList.java b/src/com/irccloud/android/data/collection/ImageList.java
@@ -407,7 +407,7 @@ public void run() {
                                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)
                                     https.setSSLSocketFactory(NetworkConnection.getInstance().IRCCloudSocketFactory);
                                 else if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
-                                    https.setSSLSocketFactory(TrustKit.getInstance().getSSLSocketFactory(NetworkConnection.IRCCLOUD_HOST));
+                                    https.setSSLSocketFactory(TrustKit.getInstance().getSSLSocketFactory(url.getHost()));
                                 conn = https;
                             } else {
                                 conn = (HttpURLConnection) ((proxy != null) ? url.openConnection(proxy) : url.openConnection(Proxy.NO_PROXY));