From 0cb17a16bbeef9b60836f076754d2b427001bf39 Mon Sep 17 00:00:00 2001
From: Alexandr Stelnykovych <alexandr.stelnykovych@ivpn.net>
Date: Thu, 24 Apr 2025 14:36:00 +0300
Subject: [PATCH] Revert "[desktop] Force <img> elements to use Angular
 HttpClient for image downloads (bypassing WebView)"

This reverts commit 76289610eeb7fff8143807b76b4e36a3c339826c.
---
 .../pages/dashboard/feature-card/feature-card.component.html  | 2 +-
 desktop/angular/src/app/shared/app-icon/app-icon.html         | 2 +-
 desktop/angular/src/app/shared/app-icon/app-icon.module.ts    | 4 +---
 desktop/angular/src/app/shared/app-icon/app-icon.ts           | 4 ++--
 .../app/shared/edit-profile-dialog/edit-profile-dialog.html   | 4 ++--
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/desktop/angular/src/app/pages/dashboard/feature-card/feature-card.component.html b/desktop/angular/src/app/pages/dashboard/feature-card/feature-card.component.html
index 8d571b77..0695555e 100644
--- a/desktop/angular/src/app/pages/dashboard/feature-card/feature-card.component.html
+++ b/desktop/angular/src/app/pages/dashboard/feature-card/feature-card.component.html
@@ -15,7 +15,7 @@
       </ng-container>
 
       <header>
-        <img [attr.src]="feature?.IconURL | httpImgSrc | async">
+        <img [attr.src]="feature?.IconURL">
 
         <span>
           {{ feature?.Name }}
diff --git a/desktop/angular/src/app/shared/app-icon/app-icon.html b/desktop/angular/src/app/shared/app-icon/app-icon.html
index 854435f4..bc81164d 100644
--- a/desktop/angular/src/app/shared/app-icon/app-icon.html
+++ b/desktop/angular/src/app/shared/app-icon/app-icon.html
@@ -1,7 +1,7 @@
 <span *ngIf="!src && !isIgnoredProfile">
   {{letter}}
 </span>
-<img [attr.src]="src | httpImgSrc | async" *ngIf="!!src">
+<img [attr.src]="src" *ngIf="!!src" loading="lazy">
 <svg *ngIf="!src && isIgnoredProfile" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
   stroke-width="1.5" stroke="currentColor" class="w-full h-full text-gray-700">
   <path stroke-linecap="round" stroke-linejoin="round"
diff --git a/desktop/angular/src/app/shared/app-icon/app-icon.module.ts b/desktop/angular/src/app/shared/app-icon/app-icon.module.ts
index bdae8c39..939cac43 100644
--- a/desktop/angular/src/app/shared/app-icon/app-icon.module.ts
+++ b/desktop/angular/src/app/shared/app-icon/app-icon.module.ts
@@ -2,12 +2,10 @@ import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 import { AppIconComponent } from "./app-icon";
 import { AppIconResolver, DefaultIconResolver } from "./app-icon-resolver";
-import { CommonPipesModule } from "../pipes/common-pipes.module";
 
 @NgModule({
   imports: [
-    CommonModule,
-    CommonPipesModule,
+    CommonModule
   ],
   declarations: [
     AppIconComponent,
diff --git a/desktop/angular/src/app/shared/app-icon/app-icon.ts b/desktop/angular/src/app/shared/app-icon/app-icon.ts
index 28a2f134..e9a32ce1 100644
--- a/desktop/angular/src/app/shared/app-icon/app-icon.ts
+++ b/desktop/angular/src/app/shared/app-icon/app-icon.ts
@@ -245,7 +245,7 @@ export class AppIconComponent implements OnInit, OnDestroy {
           if (!!profile.Icons?.length) {
             const firstIcon = profile.Icons[0];
 
-            console.log(`profile '${profile.Name}' has icon of from source '${firstIcon.Source}' stored in '${firstIcon.Type}'`)
+            console.log(`profile ${profile.Name} has icon of from source ${firstIcon.Source} stored in ${firstIcon.Type}`)
 
             switch (firstIcon.Type) {
               case 'database':
@@ -292,7 +292,7 @@ export class AppIconComponent implements OnInit, OnDestroy {
             icon = '';
           }
           if (icon !== '') {
-            this.src = icon; // this.src = this.sanitzier.bypassSecurityTrustUrl(icon);
+            this.src = this.sanitzier.bypassSecurityTrustUrl(icon);
             this.color = 'unset';
           } else {
             this.src = '';
diff --git a/desktop/angular/src/app/shared/edit-profile-dialog/edit-profile-dialog.html b/desktop/angular/src/app/shared/edit-profile-dialog/edit-profile-dialog.html
index 518537c4..7b630621 100644
--- a/desktop/angular/src/app/shared/edit-profile-dialog/edit-profile-dialog.html
+++ b/desktop/angular/src/app/shared/edit-profile-dialog/edit-profile-dialog.html
@@ -1,6 +1,6 @@
 <h1 class="flex flex-row gap-2 items-center">
   <img
-    [src]="iconObjectURL | httpImgSrc | async"
+    [src]="iconObjectURL"
     *ngIf="imageError === null && !!iconData"
     class="w-8 h-8 rounded-full border border-gray-400"
   />
@@ -85,7 +85,7 @@
           </div>
 
           <img
-            [src]="iconObjectURL | httpImgSrc | async"
+            [src]="iconObjectURL"
             *ngIf="imageError === null && !!iconData"
             class="w-12 h-12 rounded-full border border-gray-400"
           />