apk update

app/package-lock.json

@@ -246,7 +246,7 @@
       "dependencies": {
         "whatwg-fetch": {
           "version": "2.0.4",
-          "resolved": "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
           "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="
         }
       }

app/src/components/tweet-actions/tweet-actions.html

@@ -8,10 +8,11 @@
   </div>
   <div class="likes" *ngIf="!data.private_tweet">
     <span class="icon-stack" (click)="toggleLike(id)">
-      <ion-icon class="primary-icon" *ngIf="data.favorited" name="ios-heart" color="danger"></ion-icon>
-      <ion-icon class="primary-icon" *ngIf="!data.favorited" name="ios-heart-outline"></ion-icon>
-      <ion-icon class="secondary-icon" name="logo-twitter"></ion-icon>
-    </span>
+  <ion-icon class="primary-icon" *ngIf="data.favorited" name="ios-heart" color="danger"></ion-icon>
+  <ion-icon class="primary-icon" *ngIf="!data.favorited" name="ios-heart-outline"></ion-icon>
+  <ion-icon class="secondary-icon" name="logo-twitter"></ion-icon>
+</span>
+
     <span>{{ favoriteCount | friendlyNumber }}</span>
   </div>
   <div class="private-likes" *ngIf="!data.private_tweet">

app/src/pages/about/about.html

@@ -3,9 +3,13 @@
     <ion-title>About HybridOSN</ion-title>
   </ion-navbar>
 </ion-header>
-
-
 <ion-content padding>
-  <p>Hybrid OSN is a hybrid Twitter client for Android. While Twitter can be used as usual, data can also be securely exchanged with other users via a P2P network. Therefore Twitter is not able to analyse, sell or censor this data.</p>
+  <p>HOSN is an open source app that allows you to use Twitter with additional means of
+    PRIVACY control. Besides using Twitter normally, HOSN provides you with the ability to
+    tweet privately and like tweets anonymously. Your private actions are encrypted and
+    securely stored in a private network, which is accessible only to your followers away from the commercial service providers.</p>
+  <div class="about-image">
+    <img src="assets/imgs/about.PNG" alt="About">
+  </div>
   <p>Hybrid OSN was developed by Carsten Porth under the supervision of Aidmar Wainakh and Jörg Daubert as part of a master thesis at TU Darmstadt. It is a prototype which was created as proof of concept.</p>
-</ion-content>
+</ion-content>

app/src/pages/about/about.scss

@@ -1,3 +1,36 @@
-page-about {
+about {
 
+    display: flex;
+    flex-direction: row;
+
+    div {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      flex-grow: 1;
+      text-align: center;
+      margin-top: 8px;
+
+      span {
+        margin-left: 5px;
+        font-size: 12px;
+        font-weight: 300;
+        color: #333;
+      }
+    }
+
+    .icon-stack {
+      position: relative;
+
+      .secondary-icon {
+        font-size: 0.7em;
+        position: absolute;
+        bottom: 10%;
+        left: 50%;
+        background: #fff;
+        border-radius: 50%;
+        padding: 1px;
+      }
+    }
 }

app/src/pages/about/about.ts

@@ -3,7 +3,7 @@ import { IonicPage, NavController, NavParams } from "ionic-angular";
 
 @IonicPage()
 @Component({
-  selector: "page-about",
+  selector: "about",
   templateUrl: "about.html"
 })
 export class AboutPage {

app/src/providers/pgp-key-server/pgp-key-server.ts

@@ -5,7 +5,7 @@ import * as openpgp from 'openpgp';
 @Injectable()
 export class PgpKeyServerProvider {
 
-  hkp = new openpgp.HKP('https://sks-keyservers.net/');
+  hkp = new openpgp.HKP('https://keys.openpgp.org/');
   pk: any[] = [];
   passphrase = "passphrase";