[TF][FEATURE] Hide sponsored channels

Author: Kartatz

TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java

@@ -181,7 +181,6 @@
 import org.telegram.ui.Components.TypefaceSpan;
 import org.telegram.ui.Components.URLSpanReplacement;
 import org.telegram.ui.Components.UndoView;
-import org.telegram.ui.Components.spoilers.SpoilersTextView;
 import org.telegram.ui.DebugRecordingCanvasReplayFragment;
 import org.telegram.ui.LaunchActivity;
 import org.telegram.ui.Stories.PeerStoriesView;
@@ -4723,14 +4722,6 @@ public static void showProxyAlert(Activity activity, final String address, final
                     .show();
             }
         }));
-        if (!TextUtils.isEmpty(secret)) {
-            final TableView.TableRowFullContent tableRow = tableView.addFullRow(getString(R.string.UseProxyTelegramInfo2));
-            tableRow.setFilled(true);
-            final SpoilersTextView textView = (SpoilersTextView) tableRow.getChildAt(0);
-            textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 11);
-            textView.setGravity(Gravity.CENTER);
-        }
-
         final ButtonWithCounterView buttonView = new ButtonWithCounterView(activity, null).setRound();
         buttonView.setText(getString(R.string.ConnectingConnectProxy));
         buttonView.setOnClickListener(v -> {

TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java

@@ -1609,6 +1609,18 @@ public MessagesController(int num) {
         promoPsaMessage = mainPreferences.getString("promo_psa_message", null);
         promoPsaType = mainPreferences.getString("promo_psa_type", null);
         proxyDialogAddress = mainPreferences.getString("proxyDialogAddress", null);
+        if (promoDialogType == PROMO_TYPE_PROXY) {
+            // never show proxy sponsored channels in the chat list
+            promoDialogId = 0;
+            proxyDialogAddress = null;
+            promoDialogType = PROMO_TYPE_OTHER;
+            promoDialog = null;
+            mainPreferences.edit()
+                .putLong("proxy_dialog", 0)
+                .remove("proxyDialogAddress")
+                .putInt("promo_dialog_type", PROMO_TYPE_OTHER)
+                .commit();
+        }
         venueSearchBot = mainPreferences.getString("venueSearchBot", "foursquare");
         storyVenueSearchBot = mainPreferences.getString("storyVenueSearchBot", "foursquare");
         gifSearchBot = mainPreferences.getString("gifSearchBot", "gif");
@@ -9972,8 +9984,9 @@ public void hidePromoDialog() {
         Utilities.stageQueue.postRunnable(() -> {
             promoDialogId = 0;
             proxyDialogAddress = null;
+            promoDialogType = PROMO_TYPE_OTHER;
             nextPromoInfoCheckTime = getConnectionsManager().getCurrentTime() + 60 * 60;
-            getGlobalMainSettings().edit().putLong("proxy_dialog", promoDialogId).remove("proxyDialogAddress").putInt("nextPromoInfoCheckTime", nextPromoInfoCheckTime).commit();
+            getGlobalMainSettings().edit().putLong("proxy_dialog", promoDialogId).remove("proxyDialogAddress").putInt("promo_dialog_type", PROMO_TYPE_OTHER).putInt("nextPromoInfoCheckTime", nextPromoInfoCheckTime).commit();
         });
         removePromoDialog();
     }
@@ -10886,6 +10899,11 @@ private void checkPromoInfoInternal(boolean reset) {
                 TLRPC.TL_help_promoDataEmpty res = (TLRPC.TL_help_promoDataEmpty) response;
                 nextPromoInfoCheckTime = res.expires;
                 noDialog = true;
+            } else if (response instanceof TLRPC.TL_help_promoData && ((TLRPC.TL_help_promoData) response).proxy) {
+                // never show proxy sponsored channels in the chat list
+                TLRPC.TL_help_promoData res = (TLRPC.TL_help_promoData) response;
+                nextPromoInfoCheckTime = res.expires;
+                noDialog = true;
             } else if (response instanceof TLRPC.TL_help_promoData) {
                 TLRPC.TL_help_promoData res = (TLRPC.TL_help_promoData) response;
 
@@ -10920,6 +10938,7 @@ private void checkPromoInfoInternal(boolean reset) {
                 promoDialogId = did;
                 if (res.proxy) {
                     promoDialogType = PROMO_TYPE_PROXY;
+                    noDialog = true;
                 } else if (!TextUtils.isEmpty(res.psa_type)) {
                     promoDialogType = PROMO_TYPE_PSA;
                     promoPsaType = res.psa_type;
@@ -11126,7 +11145,8 @@ private void checkPromoInfoInternal(boolean reset) {
             }
             if (noDialog) {
                 promoDialogId = 0;
-                getGlobalMainSettings().edit().putLong("proxy_dialog", promoDialogId).remove("proxyDialogAddress").putInt("nextPromoInfoCheckTime", nextPromoInfoCheckTime).commit();
+                promoDialogType = PROMO_TYPE_OTHER;
+                getGlobalMainSettings().edit().putLong("proxy_dialog", promoDialogId).remove("proxyDialogAddress").putInt("promo_dialog_type", PROMO_TYPE_OTHER).putInt("nextPromoInfoCheckTime", nextPromoInfoCheckTime).commit();
                 checkingPromoInfoRequestId = 0;
                 checkingPromoInfo = false;
                 AndroidUtilities.runOnUIThread(this::removePromoDialog);
@@ -11135,8 +11155,9 @@ private void checkPromoInfoInternal(boolean reset) {
         if (removeCurrent != 0) {
             promoDialogId = 0;
             proxyDialogAddress = null;
+            promoDialogType = PROMO_TYPE_OTHER;
             nextPromoInfoCheckTime = getConnectionsManager().getCurrentTime() + 60 * 60;
-            getGlobalMainSettings().edit().putLong("proxy_dialog", promoDialogId).remove("proxyDialogAddress").putInt("nextPromoInfoCheckTime", nextPromoInfoCheckTime).commit();
+            getGlobalMainSettings().edit().putLong("proxy_dialog", promoDialogId).remove("proxyDialogAddress").putInt("promo_dialog_type", PROMO_TYPE_OTHER).putInt("nextPromoInfoCheckTime", nextPromoInfoCheckTime).commit();
             AndroidUtilities.runOnUIThread(this::removePromoDialog);
         }
     }
@@ -11159,7 +11180,7 @@ private void removePromoDialog() {
     }
 
     public boolean isPromoDialog(long did, boolean checkLeft) {
-        return promoDialog != null && promoDialog.id == did && (!checkLeft || isLeftPromoChannel);
+        return promoDialog != null && promoDialogType != PROMO_TYPE_PROXY && promoDialog.id == did && (!checkLeft || isLeftPromoChannel);
     }
 
     private String getUserNameForTyping(TLRPC.User user) {
@@ -22410,7 +22431,7 @@ public void sortDialogs(LongSparseArray<TLRPC.Chat> chatsDict) {
             }
 
         }
-        if (promoDialog != null && isLeftPromoChannel) {
+        if (promoDialog != null && isLeftPromoChannel && promoDialogType != PROMO_TYPE_PROXY) {
             allDialogs.add(0, promoDialog);
             addDialogToItsFolder(-2, promoDialog);
         }

TMessagesProj/src/main/java/org/telegram/ui/ProxySettingsActivity.java

@@ -442,7 +442,7 @@ public void afterTextChanged(Editable s) {
             if (i == 0) {
                 bottomCells[i].setText(LocaleController.getString(R.string.UseProxyInfo));
             } else {
-                bottomCells[i].setText(LocaleController.getString(R.string.UseProxyTelegramInfo) + "\n\n" + LocaleController.getString(R.string.UseProxyTelegramInfo2));
+                bottomCells[i].setText(LocaleController.getString(R.string.UseProxyTelegramInfo));
                 bottomCells[i].setVisibility(View.GONE);
             }
             linearLayout2.addView(bottomCells[i], LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));