Release 3.3.0 (#780)

Release 3.3.0

Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/780

.gitignore

@@ -195,6 +195,3 @@ crowdin.yml
 !/gradle/wrapper/gradle-wrapper.jar
 
 # End of https://www.gitignore.io/api/android,androidstudio
-
-# Crowdin Config
-crowdin.yml

.gitlab-ci.yml

@@ -1,23 +1,20 @@
 stages:
+  - test
   - build
   - sign
   - publish
 
-on_setup:
-  image: tutum/curl
-  stage: .pre
+test:
+  image: nextcloudci/android:android-49
+  stage: test
   only:
     - master
     - tags
-  variables:
-    INSTANCE: "https://codeberg.org"
-    MAIN_REPO: gitnex/GitNex
-    STATE: pending
   script:
-    - ./scripts/add-commit-status.sh
+    - ./gradlew test
 
 build:
-  image: nextcloudci/android:android-54
+  image: nextcloudci/android:android-49
   stage: build
   only:
     - master
@@ -30,7 +27,7 @@ build:
     expire_in: 15 minutes
 
 sign:
-  image: nextcloudci/android:android-54
+  image: nextcloudci/android:android-49
   stage: sign
   only:
     - master
@@ -70,31 +67,3 @@ release:
   script:
     - "[[ $CI_COMMIT_REF_NAME == *'-rc'* ]] && echo 'Upload blocked. Build seems to be a release candidate.' && exit 0"
     - curl -T "$PLUGIN_FILE" -u "$WEBDAV_USERNAME":"$WEBDAV_PASSWORD" 'https://cloud.swatian.com/remote.php/dav/files/GitNexBot/gitnex/releases/'"$CI_COMMIT_REF_NAME"'.apk'
-
-on_success:
-  image: tutum/curl
-  stage: .post
-  only:
-    - master
-    - tags
-  variables:
-    INSTANCE: "https://codeberg.org"
-    MAIN_REPO: gitnex/GitNex
-    STATE: success
-  script:
-    - ./scripts/add-commit-status.sh
-  when: on_success
-
-on_failure:
-  image: tutum/curl
-  stage: .post
-  only:
-    - master
-    - tags
-  variables:
-    INSTANCE: "https://codeberg.org"
-    MAIN_REPO: gitnex/GitNex
-    STATE: failure
-  script:
-    - ./scripts/add-commit-status.sh
-  when: on_failure

README.md

@@ -6,7 +6,7 @@
 
 GitNex is a free/paid, open-source Android client for Git repository management tool Gitea. Gitea is a community managed fork of Gogs, lightweight code hosting solution written in Go.
 
-GitNex is licensed under GPLv3 License. See the LICENSE file for the full license text. **No trackers are used** and source code is available here for anyone to audit.
+GitNex is licensed under GPLv3 License. See the LICENSE file for the full license text. No trackers are used and source code is available here for anyone to audit.
 
 ## Downloads
 [<img alt='Get it on F-droid' src='https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png' height="80"/>](https://f-droid.org/en/packages/org.mian.gitnex/)
@@ -52,6 +52,10 @@ We use [Crowdin](https://crowdin.com/project/gitnex) for translation. If your la
 ---|---|---|---
 <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/005.png" alt="005.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/006.png" alt="006.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/007.png" alt="007.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/008.png" alt="008.png" width="200"/>
 
+
+## FAQ
+[Faq](https://codeberg.org/gitnex/GitNex/wiki/FAQ)
+
 ## Links
 [Website](https://gitnex.com)
 
@@ -61,39 +65,29 @@ We use [Crowdin](https://crowdin.com/project/gitnex) for translation. If your la
 
 [Troubleshoot Guide](https://codeberg.org/gitnex/GitNex/wiki/Troubleshoot-Guide)
 
-[Faq](https://codeberg.org/gitnex/GitNex/wiki/FAQ)
-
-[Release Blog](https://gitnex.codeberg.page)
-
 ## Thanks
 Thanks to all the open source libraries, contributors and donators.
 
 #### Open source libraries
-- [square/retrofit](https://github.com/square/retrofit)
-- [google/gson](https://github.com/google/gson)
-- [square/okhttp](https://github.com/square/okhttp)
-- [square/picasso](https://github.com/square/picasso)
-- [wasabeef/picasso-transformations](https://github.com/wasabeef/picasso-transformations)
-- [cats-oss/android-gpuimage](https://github.com/cats-oss/android-gpuimage)
-- [noties/Markwon](https://github.com/noties/Markwon)
-- [noties/Prism4j](https://github.com/noties/Prism4j)
-- [ocpsoft/prettytime](https://github.com/ocpsoft/prettytime)
-- [amulyakhare/TextDrawable](https://github.com/amulyakhare/TextDrawable)
-- [vdurmont/emoji-java](https://github.com/vdurmont/emoji-java)
-- [Pes8/android-material-color-picker-dialog](https://github.com/Pes8/android-material-color-picker-dialog)
-- [HamidrezaAmz/BreadcrumbsView](https://github.com/HamidrezaAmz/BreadcrumbsView)
-- [Baseflow/PhotoView](https://github.com/Baseflow/PhotoView)
-- [apache/commons](https://github.com/apache/commons-io)
-- [barteksc/AndroidPdfViewer](https://github.com/barteksc/AndroidPdfViewer)
-- [ge0rg/MemorizingTrustManager](https://github.com/ge0rg/MemorizingTrustManager)
-- [mikaelhg/urlbuilder](https://github.com/mikaelhg/urlbuilder)
-- [ACRA/acra](https://github.com/ACRA/acra)
-
-#### Icon sets
-- [feathericons/feather](https://github.com/feathericons/feather)
-- [primer/octicons](https://github.com/primer/octicons)
-- [google/material-design-icons](https://github.com/google/material-design-icons)
+- Retrofit
+- Gson
+- Okhttp
+- Picasso
+- Markwon
+- Prism4j
+- Prettytime
+- Amulyakhare/textdrawable
+- Vdurmont/emoji-java
+- Pes/materialcolorpicker
+- HamidrezaAmz/BreadcrumbsView
+- Chrisbanes/PhotoView
+- Pddstudio/highlightjs-android
+- Apache/commons-io
+- Caverock/androidsvg
+- Droidsonroids.gif/android-gif-drawable
+- Barteksc/androidPdfViewer
+- Ge0rg/memorizingTrustManager
+- Dimezis/blurView
+- Mikaelhg/urlbuilder
 
 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)
-
-*All trademarks and logos are the properties of their respective owners.*

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 350
-        versionName "3.5.0"
+        versionCode 330
+        versionName "3.3.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -30,7 +30,7 @@ android {
         release {
             minifyEnabled false
             shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
     lintOptions {
@@ -54,31 +54,29 @@ configurations {
 }
 
 dependencies {
-    def lifecycle_version = '2.3.0'
-    def markwon_version = '4.6.2'
-    def work_version = "2.5.0"
+    def lifecycle_version = '2.3.0-beta01'
+    def markwon_version = '4.6.0'
+    def work_version = "2.4.0"
     def acra = "5.7.0"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation "com.google.code.gson:gson:2.8.6"
     implementation "com.squareup.picasso:picasso:2.71828"
-    implementation 'jp.wasabeef:picasso-transformations:2.4.0'
-    implementation 'jp.co.cyberagent.android:gpuimage:2.1.0'
     implementation "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1"
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2'
-    implementation 'org.ocpsoft.prettytime:prettytime:5.0.0.Final'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.6.Final'
     implementation "com.pes.materialcolorpicker:library:1.2.5"
     implementation "io.noties.markwon:core:$markwon_version"
     implementation "io.noties.markwon:ext-latex:$markwon_version"
@@ -96,21 +94,22 @@ dependencies {
     implementation "io.noties.markwon:image-picasso:$markwon_version"
     implementation "io.noties:prism4j:2.0.0"
     annotationProcessor "io.noties:prism4j-bundler:2.0.0"
+    implementation "com.caverock:androidsvg:1.4"
+    implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.21"
     implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9"
     implementation "commons-io:commons-io:20030203.000550"
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.apache.commons:commons-lang3:3.11'
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
     implementation "com.github.barteksc:android-pdf-viewer:3.2.0-beta.1"
     implementation "ch.acra:acra-mail:$acra"
     implementation "ch.acra:acra-limiter:$acra"
     implementation "ch.acra:acra-notification:$acra"
-    implementation 'androidx.room:room-runtime:2.2.6'
-    annotationProcessor 'androidx.room:room-compiler:2.2.6'
+    implementation "androidx.room:room-runtime:2.2.5"
+    annotationProcessor "androidx.room:room-compiler:2.2.5"
     implementation "androidx.work:work-runtime:$work_version"
+    implementation "com.eightbitlab:blurview:1.6.4"
     implementation "io.mikael:urlbuilder:2.0.9"
     implementation "org.codeberg.gitnex-garage:emoji-java:v5.1.2"
-    implementation "org.codeberg.gitnex:tea4j:1.0.5"
-    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
-    implementation 'androidx.biometric:biometric:1.1.0'
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.0"
 
 }

app/proguard-rules.pro

@@ -19,5 +19,3 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--optimizationpasses 30
--allowaccessmodification

app/src/main/AndroidManifest.xml

@@ -6,13 +6,11 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
 
     <application
-        android:name=".core.MainApplication"
         android:allowBackup="true"
         android:icon="@mipmap/app_logo"
-        android:label="@string/appName"
+        android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:resizeableActivity="true"
         android:roundIcon="@mipmap/app_logo_round"
@@ -65,7 +63,7 @@
         <activity
             android:name=".activities.OrganizationDetailActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
-            android:label="@string/titleActivityOrgDetail"
+            android:label="@string/title_activity_org_detail"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.CreateLabelActivity"
@@ -83,7 +81,7 @@
         <activity
             android:name=".activities.RepoDetailActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
-            android:label="@string/titleActivityRepoDetail"
+            android:label="@string/title_activity_repo_detail"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.MainActivity"
@@ -159,10 +157,6 @@
             android:name=".activities.SettingsNotificationsActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
 
-        <activity
-            android:name=".activities.AdminCronTasksActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-
         <!-- Version < 3.0. DeX Mode and Screen Mirroring support -->
         <meta-data android:name="com.samsung.android.keepalive.density" android:value="true"/>
         <!-- Version >= 3.0. DeX Dual Mode support -->

app/src/main/assets/highlightjs/highlightjs-line-numbers.min.js

@@ -0,0 +1 @@
+!function(e){"use strict";function t(){"complete"===document.readyState?n():e.addEventListener("DOMContentLoaded",n)}function n(){try{var e=document.querySelectorAll("code.hljs");for(var t in e)e.hasOwnProperty(t)&&r(e[t])}catch(n){console.error("LineNumbers error: ",n)}}function r(e){if("object"==typeof e){var t=e.parentNode,n=o(t.textContent);if(n>1){for(var r="",c=0;n>c;c++)r+=c+1+"\n";var l=document.createElement("code");l.className="hljs hljs-line-numbers",l.style["float"]="left",l.textContent=r,t.insertBefore(l,e)}}}function o(e){if(0===e.length)return 0;var t=/\r\n|\r|\n/g,n=e.match(t);return n=n?n.length:0,e[e.length-1].match(t)||(n+=1),n}"undefined"==typeof e.hljs?console.error("highlight.js not detected!"):(e.hljs.initLineNumbersOnLoad=t,e.hljs.lineNumbersBlock=r)}(window);

app/src/main/assets/highlightjs/themes/androidstudio.css

@@ -0,0 +1,66 @@
+/*
+Date: 24 Fev 2015
+Author: Pedro Oliveira <kanytu@gmail . com>
+*/
+
+.hljs {
+  color: #a9b7c6;
+  background: #282b2e;
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+}
+
+.hljs-number,
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet {
+  color: #6897BB;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-deletion {
+  color: #cc7832;
+}
+
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link {
+  color: #629755;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #808080;
+}
+
+.hljs-meta {
+  color: #bbb529;
+}
+
+.hljs-string,
+.hljs-attribute,
+.hljs-addition {
+  color: #6A8759;
+}
+
+.hljs-section,
+.hljs-title,
+.hljs-type {
+  color: #ffc66d;
+}
+
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
+  color: #e8bf6a;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}

app/src/main/assets/highlightjs/themes/arduino-light.css

@@ -0,0 +1,87 @@
+/*
+
+Arduino® Light Theme - Stefania Mellai <s.mellai@arduino.cc>
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #FFFFFF;
+}
+
+.hljs,
+.hljs-subst {
+  color: #434f54;
+}
+
+.hljs-keyword,
+.hljs-attribute,
+.hljs-selector-tag,
+.hljs-doctag,
+.hljs-name {
+  color: #00979D;
+}
+
+.hljs-built_in,
+.hljs-literal,
+.hljs-bullet,
+.hljs-code,
+.hljs-addition {
+  color: #D35400;
+}
+
+.hljs-regexp,
+.hljs-symbol,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #00979D;
+}
+
+.hljs-type,
+.hljs-string,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-quote,
+.hljs-template-tag,
+.hljs-deletion {
+  color: #005C5F;
+}
+
+.hljs-title,
+.hljs-section {
+  color: #880000;
+  font-weight: bold;
+}
+
+.hljs-comment {
+  color: rgba(149,165,166,.8);
+}
+
+.hljs-meta-keyword {
+  color: #728E00;
+}
+
+.hljs-meta {
+  color: #434f54;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-function {
+  color: #728E00;
+}
+
+.hljs-number {
+  color: #8A7B52;  
+}

app/src/main/assets/highlightjs/themes/far.css

@@ -0,0 +1,71 @@
+/*
+
+FAR Style (c) MajestiC <majestic2k@gmail.com>
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #000080;
+}
+
+.hljs,
+.hljs-subst {
+  color: #0ff;
+}
+
+.hljs-string,
+.hljs-attribute,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-built_in,
+.hljs-builtin-name,
+.hljs-template-tag,
+.hljs-template-variable,
+.hljs-addition {
+  color: #ff0;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-section,
+.hljs-type,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-variable {
+  color: #fff;
+}
+
+.hljs-comment,
+.hljs-quote,
+.hljs-doctag,
+.hljs-deletion {
+  color: #888;
+}
+
+.hljs-number,
+.hljs-regexp,
+.hljs-literal,
+.hljs-link {
+  color: #0f0;
+}
+
+.hljs-meta {
+  color: #008080;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-title,
+.hljs-section,
+.hljs-name,
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}

app/src/main/assets/highlightjs/themes/github.css

@@ -0,0 +1,99 @@
+/*
+
+github.com style (c) Vasily Polovnyov <vast@whiteants.net>
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  color: #333;
+  background: #f8f8f8;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #998;
+  font-style: italic;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-subst {
+  color: #333;
+  font-weight: bold;
+}
+
+.hljs-number,
+.hljs-literal,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-tag .hljs-attr {
+  color: #008080;
+}
+
+.hljs-string,
+.hljs-doctag {
+  color: #d14;
+}
+
+.hljs-title,
+.hljs-section,
+.hljs-selector-id {
+  color: #900;
+  font-weight: bold;
+}
+
+.hljs-subst {
+  font-weight: normal;
+}
+
+.hljs-type,
+.hljs-class .hljs-title {
+  color: #458;
+  font-weight: bold;
+}
+
+.hljs-tag,
+.hljs-name,
+.hljs-attribute {
+  color: #000080;
+  font-weight: normal;
+}
+
+.hljs-regexp,
+.hljs-link {
+  color: #009926;
+}
+
+.hljs-symbol,
+.hljs-bullet {
+  color: #990073;
+}
+
+.hljs-built_in,
+.hljs-builtin-name {
+  color: #0086b3;
+}
+
+.hljs-meta {
+  color: #999;
+  font-weight: bold;
+}
+
+.hljs-deletion {
+  background: #fdd;
+}
+
+.hljs-addition {
+  background: #dfd;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}

app/src/main/assets/highlightjs/themes/ir-black.css

@@ -0,0 +1,73 @@
+/*
+  IR_Black style (c) Vasily Mikhailitchenko <vaskas@programica.ru>
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #000;
+  color: #f8f8f8;
+}
+
+.hljs-comment,
+.hljs-quote,
+.hljs-meta {
+  color: #7c7c7c;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-tag,
+.hljs-name {
+  color: #96cbfe;
+}
+
+.hljs-attribute,
+.hljs-selector-id {
+  color: #ffffb6;
+}
+
+.hljs-string,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-addition {
+  color: #a8ff60;
+}
+
+.hljs-subst {
+  color: #daefa3;
+}
+
+.hljs-regexp,
+.hljs-link {
+  color: #e9c062;
+}
+
+.hljs-title,
+.hljs-section,
+.hljs-type,
+.hljs-doctag {
+  color: #ffffb6;
+}
+
+.hljs-symbol,
+.hljs-bullet,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-literal {
+  color: #c6c5fe;
+}
+
+.hljs-number,
+.hljs-deletion {
+  color:#ff73fd;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}

app/src/main/assets/highlightjs/themes/monokai-sublime.css

@@ -0,0 +1,83 @@
+/*
+
+Monokai Sublime style. Derived from Monokai by noformnocontent http://nn.mit-license.org/
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #23241f;
+}
+
+.hljs,
+.hljs-tag,
+.hljs-subst {
+  color: #f8f8f2;
+}
+
+.hljs-strong,
+.hljs-emphasis {
+  color: #a8a8a2;
+}
+
+.hljs-bullet,
+.hljs-quote,
+.hljs-number,
+.hljs-regexp,
+.hljs-literal,
+.hljs-link {
+  color: #ae81ff;
+}
+
+.hljs-code,
+.hljs-title,
+.hljs-section,
+.hljs-selector-class {
+  color: #a6e22e;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-name,
+.hljs-attr {
+  color: #f92672;
+}
+
+.hljs-symbol,
+.hljs-attribute {
+  color: #66d9ef;
+}
+
+.hljs-params,
+.hljs-class .hljs-title {
+  color: #f8f8f2;
+}
+
+.hljs-string,
+.hljs-type,
+.hljs-built_in,
+.hljs-builtin-name,
+.hljs-selector-id,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-addition,
+.hljs-variable,
+.hljs-template-variable {
+  color: #e6db74;
+}
+
+.hljs-comment,
+.hljs-deletion,
+.hljs-meta {
+  color: #75715e;
+}

app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java

@@ -5,8 +5,6 @@ import android.content.Context;
 import android.util.Log;
 import android.view.View;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Collaborators;
-import org.gitnex.tea4j.models.Issues;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.AssigneesListAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -14,6 +12,8 @@ import org.mian.gitnex.databinding.CustomAssigneesSelectionDialogBinding;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.Issues;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;

app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java

@@ -3,8 +3,6 @@ package org.mian.gitnex.actions;
 import android.content.Context;
 import android.util.Log;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Collaborators;
-import org.gitnex.tea4j.models.Permission;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.AddCollaboratorToRepositoryActivity;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -12,6 +10,8 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.Permission;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;

app/src/main/java/org/mian/gitnex/actions/IssueActions.java

@@ -3,15 +3,15 @@ package org.mian.gitnex.actions;
 import android.content.Context;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.IssueComments;
-import org.gitnex.tea4j.models.Issues;
-import org.gitnex.tea4j.models.UpdateIssueState;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.IssueComments;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.models.UpdateIssueState;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -254,7 +254,7 @@ public class IssueActions {
 				}
 				else {
 
-					Toasty.error(ctx, ctx.getString(R.string.unSubscriptionError));
+					Toasty.error(ctx, ctx.getString(R.string.unsubscriptionError));
 
 				}
 

app/src/main/java/org/mian/gitnex/actions/LabelsActions.java

@@ -5,13 +5,13 @@ import android.content.Context;
 import android.util.Log;
 import android.view.View;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Labels;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.LabelsListAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Labels;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;

app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java

@@ -4,12 +4,12 @@ import android.content.Context;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.Milestones;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Milestones;
 import retrofit2.Call;
 import retrofit2.Callback;
 

app/src/main/java/org/mian/gitnex/actions/NotificationsActions.java

@@ -1,12 +1,13 @@
 package org.mian.gitnex.actions;
 
 import android.content.Context;
-import org.gitnex.tea4j.models.NotificationThread;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.NotificationThread;
 import java.io.IOException;
 import java.util.Date;
+import okhttp3.ResponseBody;
 import retrofit2.Call;
 
 /**
@@ -34,7 +35,7 @@ public class NotificationsActions {
 
 	public void setNotificationStatus(NotificationThread notificationThread, NotificationStatus notificationStatus) throws IOException {
 
-		Call<Void> call = RetrofitClient.getApiInterface(context)
+		Call<ResponseBody> call = RetrofitClient.getApiInterface(context)
 			.markNotificationThreadAsRead(instanceToken, notificationThread.getId(), notificationStatus.name());
 
 		if(!call.execute().isSuccessful()) {
@@ -45,7 +46,7 @@ public class NotificationsActions {
 
 	public boolean setAllNotificationsRead(Date date) throws IOException {
 
-		Call<Void> call = RetrofitClient.getApiInterface(context)
+		Call<ResponseBody> call = RetrofitClient.getApiInterface(context)
 			.markNotificationThreadsAsRead(instanceToken, AppUtil.getTimestampFromDate(context, date), true,
 				new String[]{"unread", "pinned"}, "read");
 

app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java

@@ -13,12 +13,12 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserInfo;
-import org.gitnex.tea4j.models.UserSearch;
+import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.UserSearchAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityAddCollaboratorToRepositoryBinding;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.models.UserSearch;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -37,21 +37,23 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 
     private RecyclerView mRecyclerView;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_add_collaborator_to_repository;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityAddCollaboratorToRepositoryBinding activityAddCollaboratorToRepositoryBinding = ActivityAddCollaboratorToRepositoryBinding.inflate(getLayoutInflater());
-		setContentView(activityAddCollaboratorToRepositoryBinding.getRoot());
-
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        ImageView closeActivity = activityAddCollaboratorToRepositoryBinding.close;
-        addCollaboratorSearch = activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch;
-        mRecyclerView = activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch;
-        mProgressBar = activityAddCollaboratorToRepositoryBinding.progressBar;
-        noData = activityAddCollaboratorToRepositoryBinding.noData;
+        ImageView closeActivity = findViewById(R.id.close);
+        addCollaboratorSearch = findViewById(R.id.addCollaboratorSearch);
+        mRecyclerView = findViewById(R.id.recyclerViewUserSearch);
+        mProgressBar = findViewById(R.id.progressBar);
+        noData = findViewById(R.id.noData);
 
         addCollaboratorSearch.requestFocus();
         assert imm != null;

app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java

@@ -8,8 +8,6 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import org.gitnex.tea4j.models.GiteaVersion;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.UserAccountsApi;
@@ -19,6 +17,8 @@ import org.mian.gitnex.helpers.PathsHelper;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.UrlHelper;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.GiteaVersion;
+import org.mian.gitnex.models.UserInfo;
 import java.net.URI;
 import io.mikael.urlbuilder.UrlBuilder;
 import retrofit2.Call;
@@ -36,13 +36,20 @@ public class AddNewAccountActivity extends BaseActivity {
 	private enum Protocol {HTTPS, HTTP}
 	private String spinnerSelectedValue;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_add_new_account;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
 		viewBinding = ActivityAddNewAccountBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);
 
 		getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
@@ -50,9 +57,10 @@ public class AddNewAccountActivity extends BaseActivity {
 		viewBinding.close.setOnClickListener(onClickListener);
 
 		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(ctx, R.layout.list_spinner_items, Protocol.values());
-
 		viewBinding.protocolSpinner.setAdapter(adapterProtocols);
+
 		viewBinding.protocolSpinner.setOnItemClickListener((parent, view1, position, id) -> spinnerSelectedValue = String.valueOf(parent.getItemAtPosition(position)));
+
 		viewBinding.addNewAccount.setOnClickListener(login -> {
 
 			boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);

app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java

@@ -14,12 +14,12 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserInfo;
-import org.gitnex.tea4j.models.UserSearch;
+import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.UserSearchForTeamMemberAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityAddNewTeamMemberBinding;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.models.UserSearch;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -44,21 +44,23 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 
 	private String teamId;
 
+	@Override
+	protected int getLayoutResourceId() {
+		return R.layout.activity_add_new_team_member;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityAddNewTeamMemberBinding activityAddNewTeamMemberBinding = ActivityAddNewTeamMemberBinding.inflate(getLayoutInflater());
-		setContentView(activityAddNewTeamMemberBinding.getRoot());
-
 		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-		ImageView closeActivity = activityAddNewTeamMemberBinding.close;
-		addNewTeamMember = activityAddNewTeamMemberBinding.addNewTeamMember;
-		mRecyclerView = activityAddNewTeamMemberBinding.recyclerViewUserSearch;
-		mProgressBar = activityAddNewTeamMemberBinding.progressBar;
-		noData = activityAddNewTeamMemberBinding.noData;
+		ImageView closeActivity = findViewById(R.id.close);
+		addNewTeamMember = findViewById(R.id.addNewTeamMember);
+		mRecyclerView = findViewById(R.id.recyclerViewUserSearch);
+		mProgressBar = findViewById(R.id.progress_bar);
+		noData = findViewById(R.id.noData);
 
 		addNewTeamMember.requestFocus();
 		assert imm != null;

app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java

@@ -1,89 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.view.View;
-import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import org.mian.gitnex.adapters.AdminCronTasksAdapter;
-import org.mian.gitnex.databinding.ActivityAdminCronTasksBinding;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.viewmodels.AdminCronTasksViewModel;
-
-/**
- * Author M M Arif
- */
-
-public class AdminCronTasksActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-	private AdminCronTasksAdapter adapter;
-
-	private ActivityAdminCronTasksBinding activityAdminCronTasksBinding;
-
-	public static final int PAGE = 1;
-	public static final int LIMIT = 50;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		activityAdminCronTasksBinding = ActivityAdminCronTasksBinding.inflate(getLayoutInflater());
-		setContentView(activityAdminCronTasksBinding.getRoot());
-
-		initCloseListener();
-		activityAdminCronTasksBinding.close.setOnClickListener(onClickListener);
-
-		Toolbar toolbar = activityAdminCronTasksBinding.toolbar;
-		setSupportActionBar(toolbar);
-
-		activityAdminCronTasksBinding.recyclerView.setHasFixedSize(true);
-		activityAdminCronTasksBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(activityAdminCronTasksBinding.recyclerView.getContext(),
-			DividerItemDecoration.VERTICAL);
-		activityAdminCronTasksBinding.recyclerView.addItemDecoration(dividerItemDecoration);
-
-		activityAdminCronTasksBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			activityAdminCronTasksBinding.pullToRefresh.setRefreshing(false);
-			AdminCronTasksViewModel.loadCronTasksList(ctx, Authorization.get(ctx), PAGE, LIMIT);
-
-		}, 500));
-
-		fetchDataAsync(ctx, Authorization.get(ctx));
-	}
-
-	private void fetchDataAsync(Context ctx, String instanceToken) {
-
-		AdminCronTasksViewModel cronTasksViewModel = new ViewModelProvider(this).get(AdminCronTasksViewModel.class);
-
-		cronTasksViewModel.getCronTasksList(ctx, instanceToken, PAGE, LIMIT).observe(this, cronTasksListMain -> {
-
-			adapter = new AdminCronTasksAdapter(ctx, cronTasksListMain);
-
-			if(adapter.getItemCount() > 0) {
-
-				activityAdminCronTasksBinding.recyclerView.setVisibility(View.VISIBLE);
-				activityAdminCronTasksBinding.recyclerView.setAdapter(adapter);
-				activityAdminCronTasksBinding.noData.setVisibility(View.GONE);
-			}
-			else {
-
-				activityAdminCronTasksBinding.recyclerView.setVisibility(View.GONE);
-				activityAdminCronTasksBinding.noData.setVisibility(View.VISIBLE);
-			}
-
-		});
-
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
-}

app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java

@@ -21,7 +21,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.AdminGetUsersAdapter;
-import org.mian.gitnex.databinding.ActivityAdminGetUsersBinding;
 import org.mian.gitnex.fragments.BottomSheetAdminUsersFragment;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
@@ -39,21 +38,23 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
     private TextView noDataUsers;
     private Boolean searchFilter = false;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_admin_get_users;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityAdminGetUsersBinding activityAdminGetUsersBinding = ActivityAdminGetUsersBinding.inflate(getLayoutInflater());
-	    setContentView(activityAdminGetUsersBinding.getRoot());
+        ImageView closeActivity = findViewById(R.id.close);
+        noDataUsers = findViewById(R.id.noDataUsers);
+        mRecyclerView = findViewById(R.id.recyclerView);
 
-        ImageView closeActivity = activityAdminGetUsersBinding.close;
-        noDataUsers = activityAdminGetUsersBinding.noDataUsers;
-        mRecyclerView = activityAdminGetUsersBinding.recyclerView;
+        final SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
 
-        final SwipeRefreshLayout swipeRefresh = activityAdminGetUsersBinding.pullToRefresh;
-
-        Toolbar toolbar = activityAdminGetUsersBinding.toolbar;
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         initCloseListener();

app/src/main/java/org/mian/gitnex/activities/BaseActivity.java

@@ -1,17 +1,39 @@
 package org.mian.gitnex.activities;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
+import org.acra.ACRA;
+import org.acra.BuildConfig;
+import org.acra.annotation.AcraCore;
+import org.acra.annotation.AcraNotification;
+import org.acra.config.CoreConfigurationBuilder;
+import org.acra.config.LimiterConfigurationBuilder;
+import org.acra.config.MailSenderConfigurationBuilder;
+import org.acra.data.StringFormat;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.FontsOverride;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.notifications.NotificationsMaster;
+import static org.acra.ReportField.ANDROID_VERSION;
+import static org.acra.ReportField.PHONE_MODEL;
+import static org.acra.ReportField.STACK_TRACE;
 
 /**
  * Author M M Arif
  */
 
+@SuppressLint("NonConstantResourceId")
+@AcraNotification(resIcon = R.drawable.gitnex_transparent,
+		resTitle = R.string.crashTitle,
+		resChannelName = R.string.setCrashReports,
+		resText = R.string.crashMessage)
+@AcraCore(reportContent = { ANDROID_VERSION, PHONE_MODEL, STACK_TRACE })
+
 public abstract class BaseActivity extends AppCompatActivity {
 
 	protected TinyDB tinyDB;
@@ -22,63 +44,130 @@ public abstract class BaseActivity extends AppCompatActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
-		super.onCreate(savedInstanceState);
-
 		this.appCtx = getApplicationContext();
 		this.tinyDB = TinyDB.getInstance(appCtx);
 
 		switch(tinyDB.getInt("themeId")) {
 
 			case 1:
-
 				tinyDB.putString("currentTheme", "light");
 				setTheme(R.style.AppThemeLight);
 				break;
+
 			case 2:
-
 				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
-
 					tinyDB.putString("currentTheme", "dark");
 					setTheme(R.style.AppTheme);
-				}
-				else {
-
+				} else {
 					tinyDB.putString("currentTheme", "light");
 					setTheme(R.style.AppThemeLight);
 				}
 				break;
-			case 3:
 
+			case 3:
 				tinyDB.putString("currentTheme", "light");
 				setTheme(R.style.AppThemeRetro);
 				break;
+
 			case 4:
 				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
-
 					tinyDB.putString("currentTheme", "dark");
 					setTheme(R.style.AppTheme);
-				}
-				else {
-
+				} else {
 					tinyDB.putString("currentTheme", "light");
 					setTheme(R.style.AppThemeRetro);
 				}
 				break;
-			case 5:
 
-				tinyDB.putString("currentTheme", "dark");
-				setTheme(R.style.AppThemePitchBlack);
-				break;
 			default:
-
 				tinyDB.putString("currentTheme", "dark");
 				setTheme(R.style.AppTheme);
 
 		}
 
-		AppUtil.setAppLocale(getResources(), tinyDB.getString("locale"));
+		String appLocale = tinyDB.getString("locale");
+		AppUtil.setAppLocale(getResources(), appLocale);
+
+		super.onCreate(savedInstanceState);
+		setContentView(getLayoutResourceId());
+
+		// FIXME Performance nightmare
+		switch(tinyDB.getInt("customFontId", -1)) {
+
+			case 0:
+				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
+				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf");
+				FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf");
+				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf");
+				break;
+
+			case 2:
+				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf");
+				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf");
+				FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf");
+				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf");
+				break;
+
+			default:
+				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf");
+				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf");
+				FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf");
+				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf");
+
+		}
+
+		if(tinyDB.getInt("pollingDelayMinutes", 0) <= 0) {
+
+			tinyDB.putInt("pollingDelayMinutes", StaticGlobalVariables.defaultPollingDelay);
+        }
+
+		// FIXME Performance nightmare
+        NotificationsMaster.hireWorker(appCtx);
+
+        // enabling counter badges by default
+        if(tinyDB.getString("enableCounterBadgesInit").isEmpty()) {
+
+            tinyDB.putBoolean("enableCounterBadges", true);
+            tinyDB.putString("enableCounterBadgesInit", "yes");
+        }
+
+		// enable crash reports by default
+		if(tinyDB.getString("crashReportingEnabledInit").isEmpty()) {
+
+			tinyDB.putBoolean("crashReportingEnabled", true);
+			tinyDB.putString("crashReportingEnabledInit", "yes");
+		}
+
+		// default cache setter
+		if(tinyDB.getString("cacheSizeStr").isEmpty()) {
+
+			tinyDB.putString("cacheSizeStr", getResources().getString(R.string.cacheSizeDataSelectionSelectedText));
+		}
+		if(tinyDB.getString("cacheSizeImagesStr").isEmpty()) {
+
+			tinyDB.putString("cacheSizeImagesStr", getResources().getString(R.string.cacheSizeImagesSelectionSelectedText));
+		}
+
+		// enable comment drafts by default
+		if(tinyDB.getString("draftsCommentsDeletionEnabledInit").isEmpty()) {
+
+			tinyDB.putBoolean("draftsCommentsDeletionEnabled", true);
+			tinyDB.putString("draftsCommentsDeletionEnabledInit", "yes");
+		}
+
+		// FIXME Performance nightmare
+		if (tinyDB.getBoolean("crashReportingEnabled")) {
+
+			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);
+			ACRABuilder.setBuildConfigClass(BuildConfig.class).setReportFormat(StringFormat.KEY_VALUE_LIST);
+			ACRABuilder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).setReportAsFile(true).setMailTo(getResources().getString(R.string.appEmail)).setSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil.getAppBuildNo(getApplicationContext()))).setEnabled(true);
+			ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class).setEnabled(true);
+			ACRA.init(getApplication(), ACRABuilder);
+		}
 	}
 
+	protected abstract int getLayoutResourceId();
+
 }
 
 

app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java

@@ -18,15 +18,14 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import org.gitnex.tea4j.models.Commits;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.CommitsAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCommitsBinding;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Commits;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@@ -43,7 +42,7 @@ public class CommitsActivity extends BaseActivity {
 	private TextView noData;
 	private ProgressBar progressBar;
 	private String TAG = "CommitsActivity";
-	private int resultLimit = Constants.resultLimitOldGiteaInstances;
+	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 	private int pageSize = 1;
 
 	private RecyclerView recyclerView;
@@ -51,15 +50,17 @@ public class CommitsActivity extends BaseActivity {
 	private CommitsAdapter adapter;
 	private ProgressBar progressLoadMore;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_commits;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
-
-		ActivityCommitsBinding activityCommitsBinding = ActivityCommitsBinding.inflate(getLayoutInflater());
-		setContentView(activityCommitsBinding.getRoot());
-
-		Toolbar toolbar = activityCommitsBinding.toolbar;
+		Toolbar toolbar = findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
 
 		String repoFullName = tinyDB.getString("repoFullName");
@@ -69,15 +70,15 @@ public class CommitsActivity extends BaseActivity {
 
 		String branchName = getIntent().getStringExtra("branchName");
 
-		TextView toolbar_title = activityCommitsBinding.toolbarTitle;
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
 		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
 		toolbar_title.setText(branchName);
 
-		ImageView closeActivity = activityCommitsBinding.close;
-		noData = activityCommitsBinding.noDataCommits;
-		progressLoadMore = activityCommitsBinding.progressLoadMore;
-		progressBar = activityCommitsBinding.progressBar;
-		SwipeRefreshLayout swipeRefresh = activityCommitsBinding.pullToRefresh;
+		ImageView closeActivity = findViewById(R.id.close);
+		noData = findViewById(R.id.noDataCommits);
+		progressLoadMore = findViewById(R.id.progressLoadMore);
+		progressBar = findViewById(R.id.progress_bar);
+		SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
@@ -85,10 +86,10 @@ public class CommitsActivity extends BaseActivity {
 		// if gitea is 1.12 or higher use the new limit (resultLimitNewGiteaInstances)
 		if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12")) {
 
-			resultLimit = Constants.resultLimitNewGiteaInstances;
+			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
 		}
 
-		recyclerView = activityCommitsBinding.recyclerView;
+		recyclerView = findViewById(R.id.recyclerView);
 		commitsList = new ArrayList<>();
 
 		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {

app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java

@@ -8,21 +8,23 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.Branches;
-import org.gitnex.tea4j.models.DeleteFile;
-import org.gitnex.tea4j.models.EditFile;
-import org.gitnex.tea4j.models.NewFile;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateFileBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.NetworkStatusObserver;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.DeleteFile;
+import org.mian.gitnex.models.EditFile;
+import org.mian.gitnex.models.NewFile;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@@ -34,21 +36,32 @@ import retrofit2.Callback;
 
 public class CreateFileActivity extends BaseActivity {
 
-	private ActivityCreateFileBinding binding;
-
-	public static final int FILE_ACTION_CREATE = 0;
-	public static final int FILE_ACTION_DELETE = 1;
-	public static final int FILE_ACTION_EDIT = 2;
-
-	private int fileAction = FILE_ACTION_CREATE;
+    public ImageView closeActivity;
+    private View.OnClickListener onClickListener;
+    private Button newFileCreate;
 
+    private EditText newFileName;
+    private EditText newFileContent;
+    private EditText newFileBranchName;
+    private EditText newFileCommitMessage;
+    private AutoCompleteTextView newFileBranchesSpinner;
 	private String filePath;
 	private String fileSha;
+	private int fileAction = 0; // 0 = create, 1 = delete, 2 = edit
 
-    private final List<String> branches = new ArrayList<>();
+    List<Branches> branchesList = new ArrayList<>();
 
+	private String loginUid;
 	private String repoOwner;
 	private String repoName;
+	private String instanceToken;
+
+	private String selectedBranch;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_file;
+    }
 
     @SuppressLint("ClickableViewAccessibility")
     @Override
@@ -56,168 +69,219 @@ public class CreateFileActivity extends BaseActivity {
 
         super.onCreate(savedInstanceState);
 
-        binding = ActivityCreateFileBinding.inflate(getLayoutInflater());
-	    setContentView(binding.getRoot());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
+        loginUid = tinyDB.getString("loginUid");
         String repoFullName = tinyDB.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         repoOwner = parts[0];
         repoName = parts[1];
+        instanceToken = "token " + tinyDB.getString(loginUid + "-token");
 
-	    TextView toolbarTitle = binding.toolbarTitle;
+        closeActivity = findViewById(R.id.close);
+        newFileName = findViewById(R.id.newFileName);
+        newFileContent = findViewById(R.id.newFileContent);
+        newFileBranchName = findViewById(R.id.newFileBranchName);
+        newFileCommitMessage = findViewById(R.id.newFileCommitMessage);
+	    TextView toolbarTitle = findViewById(R.id.toolbarTitle);
 
-        binding.newFileName.requestFocus();
+        newFileName.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(newFileName, InputMethodManager.SHOW_IMPLICIT);
 
-	    InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        assert inputMethodManager != null;
-        inputMethodManager.showSoftInput(binding.newFileName, InputMethodManager.SHOW_IMPLICIT);
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
 
-	    binding.close.setOnClickListener(view -> finish());
-	    binding.newFileContent.setOnTouchListener((touchView, motionEvent) -> {
+        newFileCreate = findViewById(R.id.newFileCreate);
+
+	    newFileContent.setOnTouchListener((touchView, motionEvent) -> {
 
 		    touchView.getParent().requestDisallowInterceptTouchEvent(true);
 
-		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 &&
-			    (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
+		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
 
 			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
 		    }
-
 		    return false;
-
 	    });
 
-	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", FILE_ACTION_DELETE) == FILE_ACTION_DELETE) {
+	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 1) == 1) {
+
+		    fileAction = getIntent().getIntExtra("fileAction", 1);
 
-		    fileAction = getIntent().getIntExtra("fileAction", FILE_ACTION_DELETE);
 		    filePath = getIntent().getStringExtra("filePath");
+		    String fileContents = getIntent().getStringExtra("fileContents");
 		    fileSha = getIntent().getStringExtra("fileSha");
 
 		    toolbarTitle.setText(getString(R.string.deleteFileText, filePath));
 
-		    binding.newFileCreate.setText(R.string.deleteFile);
-
-		    binding.newFileNameLayout.setVisibility(View.GONE);
-		    binding.newFileContentLayout.setVisibility(View.GONE);
+		    newFileCreate.setText(R.string.deleteFile);
+		    newFileName.setText(filePath);
+		    newFileName.setEnabled(false);
+		    newFileName.setFocusable(false);
 
+		    newFileContent.setText(fileContents);
+		    newFileContent.setEnabled(false);
+		    newFileContent.setFocusable(false);
 	    }
 
-	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", FILE_ACTION_EDIT) == FILE_ACTION_EDIT) {
+	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 2) == 2) {
+
+		    fileAction = getIntent().getIntExtra("fileAction", 2);
 
-		    fileAction = getIntent().getIntExtra("fileAction", FILE_ACTION_EDIT);
 		    filePath = getIntent().getStringExtra("filePath");
+		    String fileContents = getIntent().getStringExtra("fileContents");
 		    fileSha = getIntent().getStringExtra("fileSha");
 
 		    toolbarTitle.setText(getString(R.string.editFileText, filePath));
 
-		    binding.newFileCreate.setText(R.string.editFile);
-		    binding.newFileName.setText(filePath);
-		    binding.newFileName.setEnabled(false);
-		    binding.newFileName.setFocusable(false);
-
-		    binding.newFileContent.setText(getIntent().getStringExtra("fileContents"));
+		    newFileCreate.setText(R.string.editFile);
+		    newFileName.setText(filePath);
+		    newFileName.setEnabled(false);
+		    newFileName.setFocusable(false);
 
+		    newFileContent.setText(fileContents);
 	    }
 
-        getBranches(repoOwner, repoName);
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        newFileBranchesSpinner = findViewById(R.id.newFileBranchesSpinner);
+        getBranches(instanceToken, repoOwner, repoName, loginUid);
 
         disableProcessButton();
 
-	    NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
-	    networkStatusObserver.registerNetworkStatusListener(binding.newFileCreate::setEnabled);
+        if(!connToInternet) {
 
-	    binding.newFileCreate.setOnClickListener(v -> processNewFile());
+            newFileCreate.setEnabled(false);
+        }
+        else {
+
+            newFileCreate.setOnClickListener(createFileListener);
+        }
 
     }
 
+    private final View.OnClickListener createFileListener = v -> processNewFile();
+
     private void processNewFile() {
 
-        String newFileName = binding.newFileName.getText() != null ? binding.newFileName.getText().toString() : "";
-        String newFileContent = binding.newFileContent.getText() != null ? binding.newFileContent.getText().toString() : "";
-        String newFileBranchName = binding.newFileBranches.getText() != null ? binding.newFileBranches.getText().toString() : "";
-        String newFileCommitMessage = binding.newFileCommitMessage.getText() != null ? binding.newFileCommitMessage.getText().toString() : "";
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        AppUtil appUtil = new AppUtil();
+
+        String newFileName_ = newFileName.getText().toString();
+        String newFileContent_ = newFileContent.getText().toString();
+        String newFileBranchName_ = newFileBranchName.getText().toString();
+        String newFileCommitMessage_ = newFileCommitMessage.getText().toString();
+
+        if(!connToInternet) {
 
-        if(!AppUtil.hasNetworkConnection(appCtx)) {
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
         }
 
-        if(((newFileName.isEmpty() || newFileContent.isEmpty()) && fileAction != FILE_ACTION_DELETE) || newFileCommitMessage.isEmpty()) {
+        if(newFileName_.equals("") || newFileContent_.equals("") || newFileCommitMessage_.equals("")) {
+
             Toasty.error(ctx, getString(R.string.newFileRequiredFields));
             return;
         }
 
-	    if(!AppUtil.checkStringsWithDash(newFileBranchName)) {
-		    Toasty.error(ctx, getString(R.string.newFileInvalidBranchName));
-		    return;
-	    }
+        if(selectedBranch.equals("No branch")) {
+
+            if(newFileBranchName_.equals("")) {
+
+                Toasty.error(ctx, getString(R.string.newFileRequiredFieldNewBranchName));
+                return;
+            }
+            else {
+
+                if(!appUtil.checkStringsWithDash(newFileBranchName_)) {
+
+                    Toasty.error(ctx, getString(R.string.newFileInvalidBranchName));
+                    return;
+                }
+            }
+
+        }
+
+        if(appUtil.charactersLength(newFileCommitMessage_) > 255) {
 
-        if(newFileCommitMessage.length() > 255) {
             Toasty.warning(ctx, getString(R.string.newFileCommitMessageError));
-            return;
+        }
+        else {
+
+            disableProcessButton();
+
+            if(fileAction == 1) {
+
+	            deleteFile(Authorization.get(ctx), repoOwner, repoName, filePath,
+		            newFileBranchName_, newFileCommitMessage_, selectedBranch, fileSha);
+            }
+            else if(fileAction == 2) {
+
+	            editFile(Authorization.get(ctx), repoOwner, repoName, filePath,
+		           appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, selectedBranch, fileSha);
+            }
+            else {
+
+	            createNewFile(Authorization.get(ctx), repoOwner, repoName, newFileName_,
+		            appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, selectedBranch);
+            }
+
         }
 
-        disableProcessButton();
-
-        switch(fileAction) {
-
-            case FILE_ACTION_CREATE:
-	            createNewFile(repoOwner, repoName, newFileName, AppUtil.encodeBase64(newFileContent), newFileCommitMessage, newFileBranchName);
-	            break;
-
-            case FILE_ACTION_DELETE:
-	            deleteFile(repoOwner, repoName, filePath, newFileCommitMessage, newFileBranchName, fileSha);
-	            break;
-
-            case FILE_ACTION_EDIT:
-	            editFile(repoOwner, repoName, filePath, AppUtil.encodeBase64(newFileContent), newFileCommitMessage, newFileBranchName, fileSha);
-                break;
-
-        }
     }
 
-    private void createNewFile(String repoOwner, String repoName, String fileName, String fileContent, String fileCommitMessage, String branchName) {
+    private void createNewFile(final String token, String repoOwner, String repoName, String fileName, String fileContent, String fileBranchName, String fileCommitMessage, String currentBranch) {
 
-        NewFile createNewFileJsonStr = branches.contains(branchName) ?
-	        new NewFile(branchName, fileContent, fileCommitMessage, "") :
-	        new NewFile("", fileContent, fileCommitMessage, branchName);
+        NewFile createNewFileJsonStr;
+        if(currentBranch.equals("No branch")) {
+
+            createNewFileJsonStr = new NewFile("", fileContent, fileCommitMessage, fileBranchName);
+        }
+        else {
+
+            createNewFileJsonStr = new NewFile(currentBranch, fileContent, fileCommitMessage, "");
+        }
 
         Call<JsonElement> call = RetrofitClient
                 .getApiInterface(ctx)
-                .createNewFile(Authorization.get(ctx), repoOwner, repoName, fileName, createNewFileJsonStr);
+                .createNewFile(token, repoOwner, repoName, fileName, createNewFileJsonStr);
 
         call.enqueue(new Callback<JsonElement>() {
 
             @Override
             public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
 
-            	switch(response.code()) {
+                if(response.code() == 201) {
 
-		            case 201:
-			            enableProcessButton();
-			            Toasty.success(ctx, getString(R.string.newFileSuccessMessage));
-			            finish();
-		            	break;
+                    enableProcessButton();
+                    Toasty.success(ctx, getString(R.string.newFileSuccessMessage));
+                    finish();
+                }
+                else if(response.code() == 401) {
 
-		            case 401:
-			            enableProcessButton();
-			            AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-				            getResources().getString(R.string.alertDialogTokenRevokedMessage),
-				            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-				            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-		            	break;
+                    enableProcessButton();
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+                }
+                else {
 
-		            case 404:
-			            enableProcessButton();
-			            Toasty.warning(ctx, getString(R.string.apiNotFound));
-		            	break;
+                    if(response.code() == 404) {
 
-		            default:
-			            enableProcessButton();
-			            Toasty.error(ctx, getString(R.string.orgCreatedError));
-		            	break;
+                        enableProcessButton();
+                        Toasty.warning(ctx, getString(R.string.apiNotFound));
+                    }
+                    else {
 
-	            }
+                        enableProcessButton();
+                        Toasty.error(ctx, getString(R.string.orgCreatedError));
+                    }
+                }
             }
 
             @Override
@@ -225,56 +289,65 @@ public class CreateFileActivity extends BaseActivity {
 
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
-
             }
         });
 
     }
 
-	private void deleteFile(String repoOwner, String repoName, String fileName, String fileCommitMessage, String branchName, String fileSha) {
+	private void deleteFile(final String token, String repoOwner, String repoName, String fileName, String fileBranchName, String fileCommitMessage, String currentBranch, String fileSha) {
 
-    	DeleteFile deleteFileJsonStr = branches.contains(branchName) ?
-		    new DeleteFile(branchName, fileCommitMessage, "", fileSha) :
-		    new DeleteFile("", fileCommitMessage, branchName, fileSha);
+    	String branchName;
+		DeleteFile deleteFileJsonStr;
+
+		if(currentBranch.equals("No branch")) {
+
+			branchName = fileBranchName;
+			deleteFileJsonStr = new DeleteFile("", fileCommitMessage, fileBranchName, fileSha);
+		}
+		else {
+
+			branchName = currentBranch;
+			deleteFileJsonStr = new DeleteFile(currentBranch, fileCommitMessage, "", fileSha);
+		}
 
 		Call<JsonElement> call = RetrofitClient
 			.getApiInterface(ctx)
-			.deleteFile(Authorization.get(ctx), repoOwner, repoName, fileName, deleteFileJsonStr);
+			.deleteFile(token, repoOwner, repoName, fileName, deleteFileJsonStr);
 
 		call.enqueue(new Callback<JsonElement>() {
 
 			@Override
 			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
 
-				switch(response.code()) {
+				if(response.code() == 200) {
 
-					case 200:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.deleteFileMessage, tinyDB.getString("repoBranch")));
-						getIntent().removeExtra("filePath");
-						getIntent().removeExtra("fileSha");
-						getIntent().removeExtra("fileContents");
-						finish();
-						break;
+					enableProcessButton();
+					Toasty.info(ctx, getString(R.string.deleteFileMessage, branchName));
+					getIntent().removeExtra("filePath");
+					getIntent().removeExtra("fileSha");
+					getIntent().removeExtra("fileContents");
+					finish();
+				}
+				else if(response.code() == 401) {
 
-					case 401:
-						enableProcessButton();
-						AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-							getResources().getString(R.string.alertDialogTokenRevokedMessage),
-							getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-						break;
+					enableProcessButton();
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+						getResources().getString(R.string.alertDialogTokenRevokedMessage),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+				}
+				else {
+
+					if(response.code() == 404) {
 
-					case 404:
 						enableProcessButton();
 						Toasty.info(ctx, getString(R.string.apiNotFound));
-						break;
+					}
+					else {
 
-					default:
 						enableProcessButton();
 						Toasty.info(ctx, getString(R.string.genericError));
-						break;
-
+					}
 				}
 			}
 
@@ -288,51 +361,61 @@ public class CreateFileActivity extends BaseActivity {
 
 	}
 
-	private void editFile(String repoOwner, String repoName, String fileName, String fileContent, String fileCommitMessage, String branchName, String fileSha) {
+	private void editFile(final String token, String repoOwner, String repoName, String fileName, String fileContent, String fileBranchName, String fileCommitMessage, String currentBranch, String fileSha) {
 
-		EditFile editFileJsonStr = branches.contains(branchName) ?
-			new EditFile(branchName, fileCommitMessage, "", fileSha, fileContent) :
-			new EditFile("", fileCommitMessage, branchName, fileSha, fileContent);
+		String branchName;
+		EditFile editFileJsonStr;
+
+		if(currentBranch.equals("No branch")) {
+
+			branchName = fileBranchName;
+			editFileJsonStr = new EditFile("", fileCommitMessage, fileBranchName, fileSha, fileContent);
+		}
+		else {
+
+			branchName = currentBranch;
+			editFileJsonStr = new EditFile(currentBranch, fileCommitMessage, "", fileSha, fileContent);
+		}
 
 		Call<JsonElement> call = RetrofitClient
 			.getApiInterface(ctx)
-			.editFile(Authorization.get(ctx), repoOwner, repoName, fileName, editFileJsonStr);
+			.editFile(token, repoOwner, repoName, fileName, editFileJsonStr);
 
 		call.enqueue(new Callback<JsonElement>() {
 
 			@Override
 			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
 
-				switch(response.code()) {
+				if(response.code() == 200) {
 
-					case 200:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.editFileMessage, branchName));
-						getIntent().removeExtra("filePath");
-						getIntent().removeExtra("fileSha");
-						getIntent().removeExtra("fileContents");
-						tinyDB.putBoolean("fileModified", true);
-						finish();
-						break;
+					enableProcessButton();
+					Toasty.info(ctx, getString(R.string.editFileMessage, branchName));
+					getIntent().removeExtra("filePath");
+					getIntent().removeExtra("fileSha");
+					getIntent().removeExtra("fileContents");
+					tinyDB.putBoolean("fileModified", true);
+					finish();
+				}
+				else if(response.code() == 401) {
 
-					case 401:
-						enableProcessButton();
-						AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-							getResources().getString(R.string.alertDialogTokenRevokedMessage),
-							getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-						break;
+					enableProcessButton();
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+						getResources().getString(R.string.alertDialogTokenRevokedMessage),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+				}
+				else {
+
+					if(response.code() == 404) {
 
-					case 404:
 						enableProcessButton();
 						Toasty.info(ctx, getString(R.string.apiNotFound));
-						break;
+					}
+					else {
 
-					default:
 						enableProcessButton();
 						Toasty.info(ctx, getString(R.string.genericError));
-						break;
-
+					}
 				}
 			}
 
@@ -341,13 +424,12 @@ public class CreateFileActivity extends BaseActivity {
 
 				Log.e("onFailure", t.toString());
 				enableProcessButton();
-
 			}
 		});
 
 	}
 
-    private void getBranches(String repoOwner, String repoName) {
+    private void getBranches(String instanceToken, String repoOwner, String repoName, String loginUid) {
 
         Call<List<Branches>> call = RetrofitClient
                 .getApiInterface(ctx)
@@ -358,18 +440,48 @@ public class CreateFileActivity extends BaseActivity {
             @Override
             public void onResponse(@NonNull Call<List<Branches>> call, @NonNull retrofit2.Response<List<Branches>> response) {
 
-                if(response.code() == 200) {
+                if(response.isSuccessful()) {
 
-                	assert response.body() != null;
-                    for(Branches branch : response.body()) branches.add(branch.getName());
+                    if(response.code() == 200) {
 
-                    ArrayAdapter<String> adapter = new ArrayAdapter<>(CreateFileActivity.this, R.layout.list_spinner_items, branches);
+                        List<Branches> branchesList_ = response.body();
 
-	                binding.newFileBranches.setAdapter(adapter);
-	                binding.newFileBranches.setText(tinyDB.getString("repoBranch"), false);
+                        branchesList.add(new Branches("No branch"));
+                        assert branchesList_ != null;
 
-	                enableProcessButton();
+                        if(branchesList_.size() > 0) {
 
+                            for (int i = 0; i < branchesList_.size(); i++) {
+
+                                Branches data = new Branches(branchesList_.get(i).getName());
+                                branchesList.add(data);
+                            }
+                        }
+
+                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateFileActivity.this,
+                                R.layout.list_spinner_items, branchesList);
+
+                        newFileBranchesSpinner.setAdapter(adapter);
+                        enableProcessButton();
+
+	                    newFileBranchesSpinner.setOnItemClickListener ((parent, view, position, id) -> {
+
+		                    selectedBranch = branchesList.get(position).getName();
+
+		                    if(selectedBranch.equals("No branch")) {
+
+			                    newFileBranchName.setEnabled(true);
+			                    newFileBranchName.setVisibility(View.VISIBLE);
+		                    }
+		                    else {
+
+			                    newFileBranchName.setEnabled(false);
+			                    newFileBranchName.setVisibility(View.GONE);
+			                    newFileBranchName.setText("");
+		                    }
+
+	                    });
+                    }
                 }
             }
 
@@ -382,7 +494,19 @@ public class CreateFileActivity extends BaseActivity {
 
     }
 
-    private void disableProcessButton() { binding.newFileCreate.setEnabled(false); }
-    private void enableProcessButton() { binding.newFileCreate.setEnabled(true); }
+    private void initCloseListener() {
+
+        onClickListener = view -> finish();
+    }
+
+    private void disableProcessButton() {
+
+        newFileCreate.setEnabled(false);
+    }
+
+    private void enableProcessButton() {
+
+        newFileCreate.setEnabled(true);
+    }
 
 }

app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java

@@ -14,10 +14,6 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.Collaborators;
-import org.gitnex.tea4j.models.CreateIssue;
-import org.gitnex.tea4j.models.Labels;
-import org.gitnex.tea4j.models.Milestones;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.AssigneesActions;
 import org.mian.gitnex.actions.LabelsActions;
@@ -30,10 +26,14 @@ import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.CreateIssue;
+import org.mian.gitnex.models.Labels;
+import org.mian.gitnex.models.Milestones;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
@@ -51,7 +51,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 	private CustomLabelsSelectionDialogBinding labelsBinding;
 	private CustomAssigneesSelectionDialogBinding assigneesBinding;
     private View.OnClickListener onClickListener;
-    private int resultLimit = Constants.resultLimitOldGiteaInstances;
+    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 	private Dialog dialogLabels;
 	private Dialog dialogAssignees;
 	private String labelsSetter;
@@ -71,6 +71,11 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 	private List<Collaborators> assigneesList = new ArrayList<>();
 	private List<String> assigneesListData = new ArrayList<>();
 
+    @Override
+    protected int getLayoutResourceId() {
+        return R.layout.activity_create_issue;
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -78,7 +83,8 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         super.onCreate(savedInstanceState);
 
 	    viewBinding = ActivityCreateIssueBinding.inflate(getLayoutInflater());
-	    setContentView(viewBinding.getRoot());
+	    View view = viewBinding.getRoot();
+	    setContentView(view);
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
@@ -93,7 +99,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         // require gitea 1.12 or higher
         if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {
 
-            resultLimit = Constants.resultLimitNewGiteaInstances;
+            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
         }
 
 	    viewBinding.newIssueTitle.requestFocus();

app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java

@@ -13,18 +13,16 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import com.pes.androidmaterialcolorpickerdialog.ColorPicker;
-import org.gitnex.tea4j.models.CreateLabel;
-import org.gitnex.tea4j.models.Labels;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateLabelBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.CreateLabel;
+import org.mian.gitnex.models.Labels;
 import org.mian.gitnex.viewmodels.LabelsViewModel;
-import org.mian.gitnex.viewmodels.OrganizationLabelsViewModel;
 import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -39,37 +37,41 @@ public class CreateLabelActivity extends BaseActivity {
     private TextView colorPicker;
     private EditText labelName;
     private Button createLabelButton;
-    private TinyDB tinyDB;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_label;
+    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityCreateLabelBinding activityCreateLabelBinding = ActivityCreateLabelBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateLabelBinding.getRoot());
-
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        tinyDB = TinyDB.getInstance(appCtx);
-        String repoFullName = tinyDB.getString("repoFullName");
+        final TinyDB tinyDb = TinyDB.getInstance(appCtx);
+        String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
         final String repoName = parts[1];
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("delete")) {
 
-            deleteLabel(repoOwner, repoName, Integer.parseInt(Objects.requireNonNull(getIntent().getStringExtra("labelId"))));
+            deleteLabel(instanceToken, repoOwner, repoName, Integer.parseInt(Objects.requireNonNull(getIntent().getStringExtra("labelId"))), loginUid);
             finish();
             return;
+
         }
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-        ImageView closeActivity = activityCreateLabelBinding.close;
-        colorPicker = activityCreateLabelBinding.colorPicker;
-        labelName = activityCreateLabelBinding.labelName;
-        createLabelButton = activityCreateLabelBinding.createLabelButton;
+        ImageView closeActivity = findViewById(R.id.close);
+        colorPicker = findViewById(R.id.colorPicker);
+        labelName = findViewById(R.id.labelName);
+        createLabelButton = findViewById(R.id.createLabelButton);
 
         labelName.requestFocus();
         assert imm != null;
@@ -85,7 +87,7 @@ public class CreateLabelActivity extends BaseActivity {
 
             //Log.i("#Hex no alpha", String.format("#%06X", (0xFFFFFF & color)));
             colorPicker.setBackgroundColor(color);
-	        tinyDB.putString("labelColor", String.format("#%06X", (0xFFFFFF & color)));
+            tinyDb.putString("labelColor", String.format("#%06X", (0xFFFFFF & color)));
             cp.dismiss();
         });
 
@@ -94,9 +96,9 @@ public class CreateLabelActivity extends BaseActivity {
             labelName.setText(getIntent().getStringExtra("labelTitle"));
             int labelColor_ = Color.parseColor("#" + getIntent().getStringExtra("labelColor"));
             colorPicker.setBackgroundColor(labelColor_);
-	        tinyDB.putString("labelColorDefault", "#" + getIntent().getStringExtra("labelColor"));
+            tinyDb.putString("labelColorDefault", "#" + getIntent().getStringExtra("labelColor"));
 
-            TextView toolbar_title = activityCreateLabelBinding.toolbarTitle;
+            TextView toolbar_title = findViewById(R.id.toolbar_title);
             toolbar_title.setText(getResources().getString(R.string.pageTitleLabelUpdate));
             createLabelButton.setText(getResources().getString(R.string.newUpdateButtonCopy));
 
@@ -121,23 +123,26 @@ public class CreateLabelActivity extends BaseActivity {
 
     private void processUpdateLabel() {
 
+        final TinyDB tinyDb = TinyDB.getInstance(appCtx);
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        String repoFullName = tinyDB.getString("repoFullName");
+        AppUtil appUtil = new AppUtil();
+        String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
         final String repoName = parts[1];
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         String updateLabelName = labelName.getText().toString();
 
         String updateLabelColor;
-        if(tinyDB.getString("labelColor").isEmpty()) {
+        if(tinyDb.getString("labelColor").isEmpty()) {
 
-            updateLabelColor = tinyDB.getString("labelColorDefault");
+            updateLabelColor = tinyDb.getString("labelColorDefault");
         }
         else {
 
-            updateLabelColor = tinyDB.getString("labelColor");
+            updateLabelColor = tinyDb.getString("labelColor");
         }
 
         if(!connToInternet) {
@@ -152,37 +157,40 @@ public class CreateLabelActivity extends BaseActivity {
             return;
         }
 
-        if(!AppUtil.checkStrings(updateLabelName)) {
+        if(!appUtil.checkStrings(updateLabelName)) {
 
             Toasty.error(ctx, getString(R.string.labelNameError));
             return;
         }
 
         disableProcessButton();
-        patchLabel(repoOwner, repoName, updateLabelName, updateLabelColor, Integer.parseInt(
-	        Objects.requireNonNull(getIntent().getStringExtra("labelId"))));
+        patchLabel(instanceToken, repoOwner, repoName, updateLabelName, updateLabelColor, Integer.parseInt(
+	        Objects.requireNonNull(getIntent().getStringExtra("labelId"))), loginUid);
 
     }
 
     private void processCreateLabel() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        String repoFullName = tinyDB.getString("repoFullName");
+        AppUtil appUtil = new AppUtil();
+        TinyDB tinyDb = TinyDB.getInstance(appCtx);
+        String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
         final String repoName = parts[1];
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         String newLabelName = labelName.getText().toString();
         String newLabelColor;
 
-        if(tinyDB.getString("labelColor").isEmpty()) {
+        if(tinyDb.getString("labelColor").isEmpty()) {
 
             newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(ctx, R.color.releasePre)));
         }
         else {
 
-            newLabelColor = tinyDB.getString("labelColor");
+            newLabelColor = tinyDb.getString("labelColor");
         }
 
         if(!connToInternet) {
@@ -197,30 +205,26 @@ public class CreateLabelActivity extends BaseActivity {
             return;
         }
 
-        if(!AppUtil.checkStrings(newLabelName)) {
+        if(!appUtil.checkStrings(newLabelName)) {
 
             Toasty.error(ctx, getString(R.string.labelNameError));
             return;
         }
 
         disableProcessButton();
-        createNewLabel(repoOwner, repoName, newLabelName, newLabelColor);
+        createNewLabel(instanceToken, repoOwner, repoName, newLabelName, newLabelColor, loginUid);
     }
 
-    private void createNewLabel(String repoOwner, String repoName, String newLabelName, String newLabelColor) {
+    private void createNewLabel(final String instanceToken, String repoOwner, String repoName, String newLabelName, String newLabelColor, String loginUid) {
 
         CreateLabel createLabelFunc = new CreateLabel(newLabelName, newLabelColor);
+        final TinyDB tinyDb = TinyDB.getInstance(appCtx);
 
         Call<CreateLabel> call;
 
-	    if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
-
-	    	call = RetrofitClient.getApiInterface(ctx).createOrganizationLabel(Authorization.get(ctx), getIntent().getStringExtra("orgName"), createLabelFunc);
-	    }
-	    else {
-
-		    call = RetrofitClient.getApiInterface(ctx).createLabel(Authorization.get(ctx), repoOwner, repoName, createLabelFunc);
-	    }
+        call = RetrofitClient
+                .getApiInterface(ctx)
+                .createLabel(Authorization.get(ctx), repoOwner, repoName, createLabelFunc);
 
         call.enqueue(new Callback<CreateLabel>() {
 
@@ -230,8 +234,8 @@ public class CreateLabelActivity extends BaseActivity {
                 if(response.code() == 201) {
 
                     Toasty.success(ctx, getString(R.string.labelCreated));
-	                tinyDB.putString("labelColor", "");
-	                tinyDB.putBoolean("labelsRefresh", true);
+                    tinyDb.putString("labelColor", "");
+                    tinyDb.putBoolean("labelsRefresh", true);
                     finish();
                 }
                 else if(response.code() == 401) {
@@ -245,7 +249,7 @@ public class CreateLabelActivity extends BaseActivity {
                 else {
 
                     enableProcessButton();
-	                tinyDB.putString("labelColor", "");
+                    tinyDb.putString("labelColor", "");
                     Toasty.error(ctx, getString(R.string.labelGeneralError));
                 }
             }
@@ -253,7 +257,7 @@ public class CreateLabelActivity extends BaseActivity {
             @Override
             public void onFailure(@NonNull Call<CreateLabel> call, @NonNull Throwable t) {
 
-	            tinyDB.putString("labelColor", "");
+                tinyDb.putString("labelColor", "");
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -261,20 +265,16 @@ public class CreateLabelActivity extends BaseActivity {
 
     }
 
-    private void patchLabel(String repoOwner, String repoName, String updateLabelName, String updateLabelColor, int labelId) {
+    private void patchLabel(final String instanceToken, String repoOwner, String repoName, String updateLabelName, String updateLabelColor, int labelId, String loginUid) {
 
         CreateLabel createLabelFunc = new CreateLabel(updateLabelName, updateLabelColor);
+        final TinyDB tinyDb = TinyDB.getInstance(appCtx);
 
         Call<CreateLabel> call;
 
-	    if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
-
-		    call = RetrofitClient.getApiInterface(ctx).patchOrganizationLabel(Authorization.get(ctx), getIntent().getStringExtra("orgName"), labelId, createLabelFunc);
-	    }
-	    else {
-
-		    call = RetrofitClient.getApiInterface(appCtx).patchLabel(Authorization.get(ctx), repoOwner, repoName, labelId, createLabelFunc);
-	    }
+        call = RetrofitClient
+                .getApiInterface(appCtx)
+                .patchLabel(Authorization.get(ctx), repoOwner, repoName, labelId, createLabelFunc);
 
         call.enqueue(new Callback<CreateLabel>() {
 
@@ -286,14 +286,13 @@ public class CreateLabelActivity extends BaseActivity {
                     if(response.code() == 200) {
 
                         Toasty.success(ctx, getString(R.string.labelUpdated));
-	                    tinyDB.putString("labelColor", "");
-	                    tinyDB.putBoolean("labelsRefresh", true);
-	                    tinyDB.putString("labelColorDefault", "");
+                        tinyDb.putString("labelColor", "");
+                        tinyDb.putBoolean("labelsRefresh", true);
+                        tinyDb.putString("labelColorDefault", "");
                         getIntent().removeExtra("labelAction");
                         getIntent().removeExtra("labelId");
                         getIntent().removeExtra("labelTitle");
                         getIntent().removeExtra("labelColor");
-	                    getIntent().removeExtra("type");
                         finish();
                     }
                 }
@@ -308,8 +307,8 @@ public class CreateLabelActivity extends BaseActivity {
                 else {
 
                     enableProcessButton();
-	                tinyDB.putString("labelColor", "");
-	                tinyDB.putString("labelColorDefault", "");
+                    tinyDb.putString("labelColor", "");
+                    tinyDb.putString("labelColorDefault", "");
                     Toasty.error(ctx, getString(R.string.labelGeneralError));
                 }
             }
@@ -317,8 +316,8 @@ public class CreateLabelActivity extends BaseActivity {
             @Override
             public void onFailure(@NonNull Call<CreateLabel> call, @NonNull Throwable t) {
 
-	            tinyDB.putString("labelColor", "");
-	            tinyDB.putString("labelColorDefault", "");
+                tinyDb.putString("labelColor", "");
+                tinyDb.putString("labelColorDefault", "");
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -334,23 +333,17 @@ public class CreateLabelActivity extends BaseActivity {
             getIntent().removeExtra("labelId");
             getIntent().removeExtra("labelTitle");
             getIntent().removeExtra("labelColor");
-	        getIntent().removeExtra("type");
             finish();
         };
     }
 
-    private void deleteLabel(final String repoOwner, final String repoName, int labelId) {
+    private void deleteLabel(final String instanceToken, final String repoOwner, final String repoName, int labelId, String loginUid) {
 
         Call<Labels> call;
 
-	    if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
-
-		    call = RetrofitClient.getApiInterface(appCtx).deleteOrganizationLabel(Authorization.get(ctx), getIntent().getStringExtra("orgName"), labelId);
-	    }
-	    else {
-
-		    call = RetrofitClient.getApiInterface(appCtx).deleteLabel(Authorization.get(ctx), repoOwner, repoName, labelId);
-	    }
+        call = RetrofitClient
+                .getApiInterface(appCtx)
+                .deleteLabel(Authorization.get(ctx), repoOwner, repoName, labelId);
 
         call.enqueue(new Callback<Labels>() {
 
@@ -362,17 +355,9 @@ public class CreateLabelActivity extends BaseActivity {
                     if(response.code() == 204) {
 
                         Toasty.success(ctx, getString(R.string.labelDeleteText));
-	                    if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
-
-	                    	OrganizationLabelsViewModel.loadOrgLabelsList(Authorization.get(ctx), getIntent().getStringExtra("orgName"), ctx, null, null);
-	                    }
-	                    else {
-
-		                    LabelsViewModel.loadLabelsList(Authorization.get(ctx), repoOwner, repoName, ctx);
-	                    }
+                        LabelsViewModel.loadLabelsList(instanceToken, repoOwner, repoName, ctx);
                         getIntent().removeExtra("labelAction");
                         getIntent().removeExtra("labelId");
-	                    getIntent().removeExtra("type");
                     }
                 }
                 else if(response.code() == 401) {

app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java

@@ -12,16 +12,15 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Milestones;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateMilestoneBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Milestones;
 import java.util.Calendar;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -38,24 +37,26 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
     private EditText milestoneDescription;
     private Button createNewMilestoneButton;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_milestone;
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityCreateMilestoneBinding activityCreateMilestoneBinding = ActivityCreateMilestoneBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateMilestoneBinding.getRoot());
-
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        milestoneDueDate = activityCreateMilestoneBinding.milestoneDueDate;
-        ImageView closeActivity = activityCreateMilestoneBinding.close;
-        createNewMilestoneButton = activityCreateMilestoneBinding.createNewMilestoneButton;
-        milestoneTitle = activityCreateMilestoneBinding.milestoneTitle;
-        milestoneDescription = activityCreateMilestoneBinding.milestoneDescription;
+        milestoneDueDate = findViewById(R.id.milestoneDueDate);
+        ImageView closeActivity = findViewById(R.id.close);
+        createNewMilestoneButton = findViewById(R.id.createNewMilestoneButton);
+        milestoneTitle = findViewById(R.id.milestoneTitle);
+        milestoneDescription = findViewById(R.id.milestoneDescription);
 
         milestoneTitle.requestFocus();
         assert imm != null;
@@ -92,7 +93,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
     private void processNewMilestone() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
+        AppUtil appUtil = new AppUtil();
         TinyDB tinyDb = TinyDB.getInstance(appCtx);
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
@@ -117,7 +118,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
         if(!newMilestoneDescription.equals("")) {
 
-            if (newMilestoneDescription.length() > 255) {
+            if (appUtil.charactersLength(newMilestoneDescription) > 255) {
 
                 Toasty.warning(ctx, getString(R.string.milestoneDescError));
                 return;

app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java

@@ -10,14 +10,14 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateNewUserBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserInfo;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -34,24 +34,26 @@ public class CreateNewUserActivity extends BaseActivity {
     private EditText userPassword;
     private Button createUserButton;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_new_user;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityCreateNewUserBinding activityCreateNewUserBinding = ActivityCreateNewUserBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateNewUserBinding.getRoot());
-
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        ImageView closeActivity = activityCreateNewUserBinding.close;
-        createUserButton = activityCreateNewUserBinding.createUserButton;
-        fullName = activityCreateNewUserBinding.fullName;
-        userUserName = activityCreateNewUserBinding.userUserName;
-        userEmail = activityCreateNewUserBinding.userEmail;
-        userPassword = activityCreateNewUserBinding.userPassword;
+        ImageView closeActivity = findViewById(R.id.close);
+        createUserButton = findViewById(R.id.createUserButton);
+        fullName = findViewById(R.id.fullName);
+        userUserName = findViewById(R.id.userUserName);
+        userEmail = findViewById(R.id.userEmail);
+        userPassword = findViewById(R.id.userPassword);
 
         fullName.requestFocus();
         assert imm != null;
@@ -73,6 +75,8 @@ public class CreateNewUserActivity extends BaseActivity {
     private void processCreateNewUser() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        AppUtil appUtil = new AppUtil();
+        TinyDB tinyDb = TinyDB.getInstance(appCtx);
 
         String newFullName = fullName.getText().toString().trim();
         String newUserName = userUserName.getText().toString().trim();
@@ -91,13 +95,13 @@ public class CreateNewUserActivity extends BaseActivity {
             return;
         }
 
-        if(!AppUtil.checkStrings(newFullName)) {
+        if(!appUtil.checkStrings(newFullName)) {
 
             Toasty.error(ctx, getString(R.string.userInvalidFullName));
             return;
         }
 
-        if(!AppUtil.checkStringsWithAlphaNumeric(newUserName)) {
+        if(!appUtil.checkStringsWithAlphaNumeric(newUserName)) {
 
             Toasty.error(ctx, getString(R.string.userInvalidUserName));
             return;

app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java

@@ -11,15 +11,14 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.UserOrganizations;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateOrganizationBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserOrganizations;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -36,22 +35,24 @@ public class CreateOrganizationActivity extends BaseActivity {
     private EditText orgName;
     private EditText orgDesc;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_organization;
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityCreateOrganizationBinding activityCreateOrganizationBinding = ActivityCreateOrganizationBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateOrganizationBinding.getRoot());
-
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        closeActivity = activityCreateOrganizationBinding.close;
-        orgName = activityCreateOrganizationBinding.newOrganizationName;
-        orgDesc = activityCreateOrganizationBinding.newOrganizationDescription;
+        closeActivity = findViewById(R.id.close);
+        orgName = findViewById(R.id.newOrganizationName);
+        orgDesc = findViewById(R.id.newOrganizationDescription);
 
         orgName.requestFocus();
         assert imm != null;
@@ -71,7 +72,7 @@ public class CreateOrganizationActivity extends BaseActivity {
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
-        createOrganizationButton = activityCreateOrganizationBinding.createNewOrganizationButton;
+        createOrganizationButton = findViewById(R.id.createNewOrganizationButton);
 
         if(!connToInternet) {
 
@@ -94,6 +95,8 @@ public class CreateOrganizationActivity extends BaseActivity {
     private void processNewOrganization() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        AppUtil appUtil = new AppUtil();
+        TinyDB tinyDb = TinyDB.getInstance(appCtx);
 
         String newOrgName = orgName.getText().toString();
         String newOrgDesc = orgDesc.getText().toString();
@@ -106,7 +109,7 @@ public class CreateOrganizationActivity extends BaseActivity {
 
         if(!newOrgDesc.equals("")) {
 
-            if (newOrgDesc.length() > 255) {
+            if (appUtil.charactersLength(newOrgDesc) > 255) {
 
                 Toasty.warning(ctx, getString(R.string.orgDescError));
                 return;
@@ -117,7 +120,7 @@ public class CreateOrganizationActivity extends BaseActivity {
 
             Toasty.error(ctx, getString(R.string.orgNameErrorEmpty));
         }
-        else if(!AppUtil.checkStrings(newOrgName)) {
+        else if(!appUtil.checkStrings(newOrgName)) {
 
             Toasty.warning(ctx, getString(R.string.orgNameErrorInvalid));
         }

app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java

@@ -12,10 +12,6 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Branches;
-import org.gitnex.tea4j.models.CreatePullRequest;
-import org.gitnex.tea4j.models.Labels;
-import org.gitnex.tea4j.models.Milestones;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.LabelsActions;
 import org.mian.gitnex.adapters.LabelsListAdapter;
@@ -24,12 +20,17 @@ import org.mian.gitnex.databinding.ActivityCreatePrBinding;
 import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.CreatePullRequest;
+import org.mian.gitnex.models.Labels;
+import org.mian.gitnex.models.Milestones;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
+import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -42,7 +43,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 	private View.OnClickListener onClickListener;
 	private ActivityCreatePrBinding viewBinding;
 	private CustomLabelsSelectionDialogBinding labelsBinding;
-	private int resultLimit = Constants.resultLimitOldGiteaInstances;
+	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 	private Dialog dialogLabels;
 	private String labelsSetter;
 	private List<Integer> labelsIds = new ArrayList<>();
@@ -60,6 +61,14 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 	List<Branches> branchesList = new ArrayList<>();
 	List<Labels> labelsList = new ArrayList<>();
 
+	public CreatePullRequestActivity() {
+	}
+
+	@Override
+	protected int getLayoutResourceId(){
+		return R.layout.activity_create_pr;
+	}
+
 	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -67,7 +76,8 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 		super.onCreate(savedInstanceState);
 
 		viewBinding = ActivityCreatePrBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);
 
 		loginUid = tinyDB.getString("loginUid");
 		String repoFullName = tinyDB.getString("repoFullName");
@@ -79,7 +89,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 		// require gitea 1.12 or higher
 		if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {
 
-			resultLimit = Constants.resultLimitNewGiteaInstances;
+			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
 		}
 
 		viewBinding.prBody.setOnTouchListener((touchView, motionEvent) -> {
@@ -164,14 +174,14 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 
 		CreatePullRequest createPullRequest = new CreatePullRequest(prTitle, prDescription, loginUid, mergeInto, pullFrom, milestoneId, dueDate, assignees, labelsIds);
 
-		Call<Void> transferCall = RetrofitClient
+		Call<ResponseBody> transferCall = RetrofitClient
 			.getApiInterface(appCtx)
 			.createPullRequest(instanceToken, repoOwner, repoName, createPullRequest);
 
-		transferCall.enqueue(new Callback<Void>() {
+		transferCall.enqueue(new Callback<ResponseBody>() {
 
 			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+			public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
 
 				disableProcessButton();
 
@@ -198,7 +208,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 			}
 
 			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
 
 				enableProcessButton();
 				Toasty.error(ctx, getString(R.string.genericServerResponseError));

app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java

@@ -14,15 +14,14 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Branches;
-import org.gitnex.tea4j.models.Releases;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateReleaseBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.Releases;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@@ -50,15 +49,17 @@ public class CreateReleaseActivity extends BaseActivity {
 
     List<Branches> branchesList = new ArrayList<>();
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_release;
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityCreateReleaseBinding activityCreateReleaseBinding = ActivityCreateReleaseBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateReleaseBinding.getRoot());
-
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
@@ -68,12 +69,12 @@ public class CreateReleaseActivity extends BaseActivity {
         repoOwner = parts[0];
         repoName = parts[1];
 
-        closeActivity = activityCreateReleaseBinding.close;
-        releaseTagName = activityCreateReleaseBinding.releaseTagName;
-        releaseTitle = activityCreateReleaseBinding.releaseTitle;
-        releaseContent = activityCreateReleaseBinding.releaseContent;
-        releaseType = activityCreateReleaseBinding.releaseType;
-        releaseDraft = activityCreateReleaseBinding.releaseDraft;
+        closeActivity = findViewById(R.id.close);
+        releaseTagName = findViewById(R.id.releaseTagName);
+        releaseTitle = findViewById(R.id.releaseTitle);
+        releaseContent = findViewById(R.id.releaseContent);
+        releaseType = findViewById(R.id.releaseType);
+        releaseDraft = findViewById(R.id.releaseDraft);
 
 	    releaseTitle.requestFocus();
         assert imm != null;
@@ -93,10 +94,10 @@ public class CreateReleaseActivity extends BaseActivity {
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
-        releaseBranch = activityCreateReleaseBinding.releaseBranch;
+        releaseBranch = findViewById(R.id.releaseBranch);
         getBranches(Authorization.get(ctx), repoOwner, repoName);
 
-        createNewRelease = activityCreateReleaseBinding.createNewRelease;
+        createNewRelease = findViewById(R.id.createNewRelease);
         disableProcessButton();
 
         if(!connToInternet) {

app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java

@@ -14,16 +14,15 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.OrgOwner;
-import org.gitnex.tea4j.models.OrganizationRepository;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateRepoBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.OrgOwner;
+import org.mian.gitnex.models.OrganizationRepository;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -56,14 +55,16 @@ public class CreateRepoActivity extends BaseActivity {
     final List<String> reservedRepoNames = Arrays.asList(".", "..");
     final Pattern reservedRepoPatterns = Pattern.compile("\\.(git|wiki)$");
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_repo;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityCreateRepoBinding activityCreateRepoBinding = ActivityCreateRepoBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateRepoBinding.getRoot());
-
         boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
 
         loginUid = tinyDB.getString("loginUid");
@@ -71,10 +72,10 @@ public class CreateRepoActivity extends BaseActivity {
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        closeActivity = activityCreateRepoBinding.close;
-        repoName = activityCreateRepoBinding.newRepoName;
-        repoDesc = activityCreateRepoBinding.newRepoDescription;
-        repoAccess = activityCreateRepoBinding.newRepoPrivate;
+        closeActivity = findViewById(R.id.close);
+        repoName = findViewById(R.id.newRepoName);
+        repoDesc = findViewById(R.id.newRepoDescription);
+        repoAccess = findViewById(R.id.newRepoPrivate);
 
         repoName.requestFocus();
         assert imm != null;
@@ -83,10 +84,10 @@ public class CreateRepoActivity extends BaseActivity {
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
-        spinner = activityCreateRepoBinding.ownerSpinner;
+        spinner = findViewById(R.id.ownerSpinner);
         getOrganizations(Authorization.get(ctx), userLogin);
 
-        createRepo = activityCreateRepoBinding.createNewRepoButton;
+        createRepo = findViewById(R.id.createNewRepoButton);
         disableProcessButton();
 
         if(!connToInternet) {
@@ -104,6 +105,7 @@ public class CreateRepoActivity extends BaseActivity {
     private void processNewRepo() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        AppUtil appUtil = new AppUtil();
 
         String newRepoName = repoName.getText().toString();
         String newRepoDesc = repoDesc.getText().toString();
@@ -117,7 +119,7 @@ public class CreateRepoActivity extends BaseActivity {
 
         if(!newRepoDesc.equals("")) {
 
-            if (newRepoDesc.length() > 255) {
+            if (appUtil.charactersLength(newRepoDesc) > 255) {
 
                 Toasty.warning(ctx, getString(R.string.repoDescError));
                 return;
@@ -128,7 +130,7 @@ public class CreateRepoActivity extends BaseActivity {
 
             Toasty.error(ctx, getString(R.string.repoNameErrorEmpty));
         }
-        else if(!AppUtil.checkStrings(newRepoName)) {
+        else if(!appUtil.checkStrings(newRepoName)) {
 
             Toasty.warning(ctx, getString(R.string.repoNameErrorInvalid));
         }

app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java

@@ -11,16 +11,14 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.res.ResourcesCompat;
-import org.gitnex.tea4j.models.Teams;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateTeamByOrgBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Teams;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -44,6 +42,11 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
     private final String[] permissionList = {"Read", "Write", "Admin"};
     public int permissionSelectedChoice = -1;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_team_by_org;
+    }
+
     private final String[] accessControlsList = new String[] {
             "Code",
             "Issues",
@@ -71,21 +74,18 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
         super.onCreate(savedInstanceState);
 
-	    ActivityCreateTeamByOrgBinding activityCreateTeamByOrgBinding = ActivityCreateTeamByOrgBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateTeamByOrgBinding.getRoot());
-
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        ImageView closeActivity = activityCreateTeamByOrgBinding.close;
-        teamName = activityCreateTeamByOrgBinding.teamName;
-        teamDesc = activityCreateTeamByOrgBinding.teamDesc;
-        teamPermission = activityCreateTeamByOrgBinding.teamPermission;
-        teamPermissionDetail = activityCreateTeamByOrgBinding.teamPermissionDetail;
-        teamAccessControls = activityCreateTeamByOrgBinding.teamAccessControls;
-        teamAccessControlsArray = activityCreateTeamByOrgBinding.teamAccessControlsArray;
-        createTeamButton = activityCreateTeamByOrgBinding.createTeamButton;
+        ImageView closeActivity = findViewById(R.id.close);
+        teamName = findViewById(R.id.teamName);
+        teamDesc = findViewById(R.id.teamDesc);
+        teamPermission = findViewById(R.id.teamPermission);
+        teamPermissionDetail = findViewById(R.id.teamPermissionDetail);
+        teamAccessControls = findViewById(R.id.teamAccessControls);
+        teamAccessControlsArray = findViewById(R.id.teamAccessControlsArray);
+        createTeamButton = findViewById(R.id.createTeamButton);
 
         teamName.requestFocus();
         assert imm != null;
@@ -210,9 +210,9 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
         if(!connToInternet) {
 
             createTeamButton.setEnabled(false);
-            GradientDrawable shape = new GradientDrawable();
-            shape.setCornerRadius(8);
-            shape.setColor(ResourcesCompat.getColor(getResources(), R.color.hintColor, null));
+            GradientDrawable shape =  new GradientDrawable();
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
             createTeamButton.setBackground(shape);
         }
         else {
@@ -224,6 +224,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
     private void processCreateTeam() {
 
+        AppUtil appUtil = new AppUtil();
         final TinyDB tinyDb = TinyDB.getInstance(appCtx);
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@@ -247,7 +248,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
             return;
         }
 
-        if(!AppUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {
+        if(!appUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {
 
             Toasty.warning(ctx, getString(R.string.teamNameError));
             return;
@@ -255,7 +256,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
         if(!newTeamDesc.equals("")) {
 
-            if(!AppUtil.checkStrings(newTeamDesc)) {
+            if(!appUtil.checkStrings(newTeamDesc)) {
 
                 Toasty.warning(ctx, getString(R.string.teamDescError));
                 return;

app/src/main/java/org/mian/gitnex/activities/DeepLinksActivity.java

@@ -9,8 +9,6 @@ import android.util.Log;
 import android.view.View;
 import androidx.annotation.NonNull;
 import org.apache.commons.lang3.StringUtils;
-import org.gitnex.tea4j.models.PullRequests;
-import org.gitnex.tea4j.models.UserRepositories;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.RepositoriesApi;
@@ -19,6 +17,8 @@ import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.database.models.UserAccount;
 import org.mian.gitnex.databinding.ActivityDeeplinksBinding;
 import org.mian.gitnex.helpers.UrlHelper;
+import org.mian.gitnex.models.PullRequests;
+import org.mian.gitnex.models.UserRepositories;
 import java.net.URI;
 import java.util.List;
 import java.util.Objects;
@@ -41,13 +41,20 @@ public class DeepLinksActivity extends BaseActivity {
 	private Intent issueIntent;
 	private Intent repoIntent;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_deeplinks;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
 		viewBinding = ActivityDeeplinksBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);
 
 		mainIntent = new Intent(ctx, MainActivity.class);
 		issueIntent = new Intent(ctx, IssueDetailActivity.class);
@@ -78,13 +85,6 @@ public class DeepLinksActivity extends BaseActivity {
 			if(hostUri.toLowerCase().contains(Objects.requireNonNull(data.getHost().toLowerCase()))) {
 
 				accountFound = true;
-
-				tinyDB.putString("loginUid", userAccount.getUserName());
-				tinyDB.putString("userLogin", userAccount.getUserName());
-				tinyDB.putString(userAccount.getUserName() + "-token", userAccount.getToken());
-				tinyDB.putString("instanceUrl", userAccount.getInstanceUrl());
-				tinyDB.putInt("currentActiveAccountId", userAccount.getAccountId());
-
 				break;
 			}
 		}
@@ -333,7 +333,7 @@ public class DeepLinksActivity extends BaseActivity {
 
 							// pull was done from a deleted fork
 							tinyDB.putString("prIsFork", "true");
-							tinyDB.putString("prForkFullName", ctx.getString(R.string.prDeletedFork));
+							tinyDB.putString("prForkFullName", ctx.getString(R.string.prDeletedFrok));
 						}
 					}
 

app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java

@@ -18,18 +18,17 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.CreateIssue;
-import org.gitnex.tea4j.models.Issues;
-import org.gitnex.tea4j.models.Milestones;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityEditIssueBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.CreateIssue;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.models.Milestones;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -45,7 +44,7 @@ import retrofit2.Callback;
 public class EditIssueActivity extends BaseActivity implements View.OnClickListener {
 
     private View.OnClickListener onClickListener;
-    private int resultLimit = Constants.resultLimitOldGiteaInstances;
+    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 
     private EditText editIssueTitle;
     private EditText editIssueDescription;
@@ -64,15 +63,17 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 	private String repoName;
 	private int issueIndex;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_edit_issue;
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityEditIssueBinding activityEditIssueBinding = ActivityEditIssueBinding.inflate(getLayoutInflater());
-	    setContentView(activityEditIssueBinding.getRoot());
-
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
         loginUid = tinyDB.getString("loginUid");
@@ -83,17 +84,17 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         repoName = parts[1];
         issueIndex = Integer.parseInt(tinyDB.getString("issueNumber"));
 
-        ImageView closeActivity = activityEditIssueBinding.close;
-        editIssueButton = activityEditIssueBinding.editIssueButton;
-        TextView toolbar_title = activityEditIssueBinding.toolbarTitle;
-        editIssueTitle = activityEditIssueBinding.editIssueTitle;
-        editIssueDescription = activityEditIssueBinding.editIssueDescription;
-        editIssueDueDate = activityEditIssueBinding.editIssueDueDate;
+        ImageView closeActivity = findViewById(R.id.close);
+        editIssueButton = findViewById(R.id.editIssueButton);
+        TextView toolbar_title = findViewById(R.id.toolbar_title);
+        editIssueTitle = findViewById(R.id.editIssueTitle);
+        editIssueDescription = findViewById(R.id.editIssueDescription);
+        editIssueDueDate = findViewById(R.id.editIssueDueDate);
 
         // if gitea is 1.12 or higher use the new limit
         if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {
 
-            resultLimit = Constants.resultLimitNewGiteaInstances;
+            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
         }
 
         editIssueTitle.requestFocus();

app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java

@@ -1,28 +1,28 @@
 package org.mian.gitnex.activities;
 
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
-import org.gitnex.tea4j.models.FileDiffView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.FilesDiffAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityFileDiffBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.ParseDiff;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.FileDiffView;
 import java.io.IOException;
 import java.util.List;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
-import retrofit2.Response;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -35,15 +35,18 @@ public class FileDiffActivity extends BaseActivity {
 	private ListView mListView;
 	private ProgressBar mProgressBar;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_file_diff;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityFileDiffBinding activityFileDiffBinding = ActivityFileDiffBinding.inflate(getLayoutInflater());
-		setContentView(activityFileDiffBinding.getRoot());
-
-		Toolbar toolbar = activityFileDiffBinding.toolbar;
+		Toolbar toolbar = findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
 
 		final TinyDB tinyDb = TinyDB.getInstance(appCtx);
@@ -51,11 +54,13 @@ public class FileDiffActivity extends BaseActivity {
 		String[] parts = repoFullName.split("/");
 		final String repoOwner = parts[0];
 		final String repoName = parts[1];
+		final String loginUid = tinyDb.getString("loginUid");
+		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-		ImageView closeActivity = activityFileDiffBinding.close;
-		toolbarTitle = activityFileDiffBinding.toolbarTitle;
-		mListView = activityFileDiffBinding.listView;
-		mProgressBar = activityFileDiffBinding.progressBar;
+		ImageView closeActivity = findViewById(R.id.close);
+		toolbarTitle = findViewById(R.id.toolbar_title);
+		mListView = findViewById(R.id.listView);
+		mProgressBar = findViewById(R.id.progress_bar);
 
 		mListView.setDivider(null);
 
@@ -68,69 +73,80 @@ public class FileDiffActivity extends BaseActivity {
 		String pullIndex = tinyDb.getString("issueNumber");
 
 		boolean apiCall = !new Version(tinyDb.getString("giteaVersion")).less("1.13.0");
-		getPullDiffContent(repoOwner, repoName, pullIndex, apiCall);
+		getPullDiffContent(repoOwner, repoName, pullIndex, instanceToken, apiCall);
 
 	}
 
-	private void getPullDiffContent(String owner, String repo, String pullIndex, boolean apiCall) {
+	private void getPullDiffContent(String owner, String repo, String pullIndex, String token, boolean apiCall) {
 
-		Thread thread = new Thread(() -> {
+		Call<ResponseBody> call;
+		if(apiCall) {
 
-			Call<ResponseBody> call = apiCall ?
-				RetrofitClient.getApiInterface(ctx).getPullDiffContent(Authorization.get(ctx), owner, repo, pullIndex) :
-				RetrofitClient.getWebInterface(ctx).getPullDiffContent(Authorization.getWeb(ctx), owner, repo, pullIndex);
+			call = RetrofitClient.getApiInterface(ctx).getPullDiffContent(token, owner, repo, pullIndex);
+		}
+		else {
 
-			try {
+			call = RetrofitClient.getWebInterface(ctx).getPullDiffContent(owner, repo, pullIndex);
+		}
 
-				Response<ResponseBody> response = call.execute();
-				assert response.body() != null;
+		call.enqueue(new Callback<ResponseBody>() {
 
-				switch(response.code()) {
+			@Override
+			public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
 
-					case 200:
-						List<FileDiffView> fileDiffViews = ParseDiff.getFileDiffViewArray(response.body().string());
+				if(response.code() == 200) {
 
-						int filesCount = fileDiffViews.size();
+					try {
 
-						String toolbarTitleText = (filesCount > 1) ?
-							getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)) :
-							getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount));
+						assert response.body() != null;
 
-						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, getSupportFragmentManager(), fileDiffViews);
+						List<FileDiffView> fileContentsArray = ParseDiff.getFileDiffViewArray(response.body().string());
 
-						runOnUiThread(() -> {
-							toolbarTitle.setText(toolbarTitleText);
-							mListView.setAdapter(adapter);
-							mProgressBar.setVisibility(View.GONE);
-						});
-						break;
+						int filesCount = fileContentsArray.size();
+						if(filesCount > 1) {
 
-					case 401:
-						AlertDialogs.authorizationTokenRevokedDialog(ctx,
-							getString(R.string.alertDialogTokenRevokedTitle),
-							getString(R.string.alertDialogTokenRevokedMessage),
-							getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-						break;
+							toolbarTitle.setText(getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)));
+						}
+						else {
 
-					case 403:
-						Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-						break;
+							toolbarTitle.setText(getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount)));
+						}
 
-					case 404:
-						Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-						break;
+						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, getSupportFragmentManager(), fileContentsArray);
+						mListView.setAdapter(adapter);
 
-					default:
-						Toasty.error(ctx, getString(R.string.labelGeneralError));
+						mProgressBar.setVisibility(View.GONE);
+					}
+					catch(IOException e) {
 
+						e.printStackTrace();
+					}
 				}
-			} catch(IOException ignored) {}
+				else if(response.code() == 401) {
 
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+				}
+				else if(response.code() == 403) {
+
+					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+				}
+				else if(response.code() == 404) {
+
+					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+				}
+				else {
+
+					Toasty.error(ctx, getString(R.string.labelGeneralError));
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+			}
 		});
 
-		thread.start();
-
 	}
 
 	private void initCloseListener() {
@@ -139,7 +155,6 @@ public class FileDiffActivity extends BaseActivity {
 
 			getIntent().removeExtra("singleFileName");
 			finish();
-
 		};
 	}
 

app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java

@@ -1,42 +1,53 @@
 package org.mian.gitnex.activities;
 
 import android.app.Activity;
-import android.app.NotificationManager;
-import android.content.Context;
 import android.content.Intent;
+import android.graphics.BitmapFactory;
 import android.graphics.Typeface;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.text.method.ScrollingMovementMethod;
+import android.util.Base64;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.core.app.NotificationCompat;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import com.github.barteksc.pdfviewer.PDFView;
 import com.github.barteksc.pdfviewer.util.FitPolicy;
-import com.vdurmont.emoji.EmojiParser;
+import com.github.chrisbanes.photoview.PhotoView;
 import org.apache.commons.io.FileUtils;
-import org.gitnex.tea4j.models.Files;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityFileViewBinding;
 import org.mian.gitnex.fragments.BottomSheetFileViewerFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
-import org.mian.gitnex.helpers.Images;
 import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.notifications.Notifications;
+import org.mian.gitnex.helpers.highlightjs.HighlightJsView;
+import org.mian.gitnex.helpers.highlightjs.models.Theme;
+import org.mian.gitnex.models.Files;
+import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Arrays;
-import okhttp3.ResponseBody;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Objects;
 import retrofit2.Call;
-import retrofit2.Response;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -44,38 +55,79 @@ import retrofit2.Response;
 
 public class FileViewActivity extends BaseActivity implements BottomSheetFileViewerFragment.BottomSheetListener {
 
-	private ActivityFileViewBinding binding;
+	private View.OnClickListener onClickListener;
+	private TextView singleFileContents;
+	private LinearLayout singleFileContentsFrame;
+	private HighlightJsView singleCodeContents;
+	private PhotoView imageView;
+	private ProgressBar mProgressBar;
+	private byte[] imageData;
+	private PDFView pdfView;
+	private LinearLayout pdfViewFrame;
+	private byte[] decodedPdf;
 	private Boolean pdfNightMode;
+	private String singleFileName;
+	private String fileSha;
+	private AppUtil appUtil;
 
-	private Files file;
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_file_view;
+	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
+		appUtil = new AppUtil();
 
-		binding = ActivityFileViewBinding.inflate(getLayoutInflater());
-		setContentView(binding.getRoot());
-
-		setSupportActionBar(binding.toolbar);
-
-		tinyDB.putBoolean("enableMarkdownInFileView", false);
-
-		file = (Files) getIntent().getSerializableExtra("file");
-
-		binding.close.setOnClickListener(view -> finish());
-
-		binding.toolbarTitle.setMovementMethod(new ScrollingMovementMethod());
-		binding.toolbarTitle.setText(file.getPath());
+		Toolbar toolbar = findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
 
 		String repoFullName = tinyDB.getString("repoFullName");
 		String repoBranch = tinyDB.getString("repoBranch");
 		String[] parts = repoFullName.split("/");
-		String repoOwner = parts[0];
-		String repoName = parts[1];
+		final String repoOwner = parts[0];
+		final String repoName = parts[1];
+		final String loginUid = tinyDB.getString("loginUid");
+		final String instanceToken = "token " + tinyDB.getString(loginUid + "-token");
 
-		getSingleFileContents(repoOwner, repoName, file.getPath(), repoBranch);
+		tinyDB.putBoolean("enableMarkdownInFileView", false);
 
+		ImageView closeActivity = findViewById(R.id.close);
+		singleFileContents = findViewById(R.id.singleFileContents);
+		singleCodeContents = findViewById(R.id.singleCodeContents);
+		imageView = findViewById(R.id.imageView);
+		mProgressBar = findViewById(R.id.progress_bar);
+		pdfView = findViewById(R.id.pdfView);
+		pdfViewFrame = findViewById(R.id.pdfViewFrame);
+		singleFileContentsFrame = findViewById(R.id.singleFileContentsFrame);
+
+		singleFileName = getIntent().getStringExtra("singleFileName");
+
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
+		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+
+		initCloseListener();
+		closeActivity.setOnClickListener(onClickListener);
+
+		tinyDB.putString("downloadFileContents", "");
+
+		try {
+
+			singleFileName = URLDecoder.decode(singleFileName, "UTF-8");
+			singleFileName = singleFileName.replaceAll("//", "/");
+			singleFileName = singleFileName.startsWith("/") ? singleFileName.substring(1) : singleFileName;
+		}
+		catch(UnsupportedEncodingException e) {
+
+			Log.i("singleFileName", singleFileName);
+		}
+
+		toolbar_title.setText(singleFileName);
+
+		getSingleFileContents(instanceToken, repoOwner, repoName, singleFileName, repoBranch);
 	}
 
 	@Override
@@ -83,189 +135,158 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 		super.onResume();
 
+		String repoFullName = tinyDB.getString("repoFullName");
+		String repoBranch = tinyDB.getString("repoBranch");
+		String[] parts = repoFullName.split("/");
+		String repoOwner = parts[0];
+		String repoName = parts[1];
+		String loginUid = tinyDB.getString("loginUid");
+		String instanceToken = "token " + tinyDB.getString(loginUid + "-token");
+
 		if(tinyDB.getBoolean("fileModified")) {
 
-			String repoFullName = tinyDB.getString("repoFullName");
-			String repoBranch = tinyDB.getString("repoBranch");
-			String[] parts = repoFullName.split("/");
-			String repoOwner = parts[0];
-			String repoName = parts[1];
-
-			getSingleFileContents(repoOwner, repoName, file.getPath(), repoBranch);
+			getSingleFileContents(instanceToken, repoOwner, repoName, singleFileName, repoBranch);
 			tinyDB.putBoolean("fileModified", false);
-
 		}
 	}
 
-	private void getSingleFileContents(final String owner, String repo, final String filename, String ref) {
 
-		Thread thread = new Thread(() -> {
+	private void getSingleFileContents(String token, final String owner, String repo, final String filename, String ref) {
 
-			Call<ResponseBody> call = RetrofitClient
-				.getWebInterface(ctx)
-				.getFileContents(Authorization.getWeb(ctx), owner, repo, ref, filename);
+		Call<Files> call = RetrofitClient.getApiInterface(ctx).getSingleFileContents(token, owner, repo, filename, ref);
 
-			try {
+		call.enqueue(new Callback<Files>() {
 
-				Response<ResponseBody> response = call.execute();
+			@Override
+			public void onResponse(@NonNull Call<Files> call, @NonNull retrofit2.Response<Files> response) {
 
 				if(response.code() == 200) {
 
-					ResponseBody responseBody = response.body();
+					assert response.body() != null;
 
-					if(responseBody != null) {
-
-						runOnUiThread(() -> binding.progressBar.setVisibility(View.GONE));
+					if(!response.body().getContent().equals("")) {
 
 						String fileExtension = FileUtils.getExtension(filename);
+						mProgressBar.setVisibility(View.GONE);
 
-						boolean processable = false;
+						fileSha = response.body().getSha();
 
-						switch(AppUtil.getFileType(fileExtension)) {
+						// download file meta
+						tinyDB.putString("downloadFileName", filename);
+						tinyDB.putString("downloadFileContents", response.body().getContent());
 
-							case IMAGE:
+						if(appUtil.imageExtension(fileExtension)) { // file is image
 
-								// See https://developer.android.com/guide/topics/media/media-formats#core
-								if(Arrays.asList("bmp", "gif", "jpg", "jpeg", "png", "webp", "heic", "heif").contains(fileExtension.toLowerCase())) {
+							singleFileContentsFrame.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							imageView.setVisibility(View.VISIBLE);
 
-									processable = true;
+							imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
+							Drawable imageDrawable = new BitmapDrawable(getResources(), BitmapFactory.decodeByteArray(imageData, 0, imageData.length));
+							imageView.setImageDrawable(imageDrawable);
+						}
+						else if(appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode
 
-									byte[] pictureBytes = responseBody.bytes();
+							imageView.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.VISIBLE);
 
-									runOnUiThread(() -> {
+							switch(tinyDB.getInt("fileviewerSourceCodeThemeId")) {
 
-										binding.contents.setVisibility(View.GONE);
-										binding.pdfViewFrame.setVisibility(View.GONE);
-										binding.markdownFrame.setVisibility(View.GONE);
+								case 1:
 
-										binding.photoView.setVisibility(View.VISIBLE);
-										binding.photoView.setImageBitmap(Images.scaleImage(pictureBytes, 1920));
-
-									});
-								}
-								break;
-
-							case UNKNOWN:
-							case TEXT:
-
-								if(file.getSize() > Constants.maximumFileViewerSize) {
+									singleCodeContents.setTheme(Theme.ARDUINO_LIGHT);
 									break;
-								}
+								case 2:
 
-								processable = true;
+									singleCodeContents.setTheme(Theme.GITHUB);
+									break;
+								case 3:
 
-								String text = responseBody.string();
+									singleCodeContents.setTheme(Theme.FAR);
+									break;
+								case 4:
 
-								runOnUiThread(() -> {
+									singleCodeContents.setTheme(Theme.IR_BLACK);
+									break;
+								case 5:
 
-									binding.photoView.setVisibility(View.GONE);
-									binding.markdownFrame.setVisibility(View.GONE);
-									binding.pdfViewFrame.setVisibility(View.GONE);
+									singleCodeContents.setTheme(Theme.ANDROID_STUDIO);
+									break;
+								default:
 
-									binding.contents.setVisibility(View.VISIBLE);
-									binding.contents.setContent(text, fileExtension);
+									singleCodeContents.setTheme(Theme.MONOKAI_SUBLIME);
+							}
 
-								});
-								break;
+							singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
+						}
+						else if(appUtil.pdfExtension(fileExtension)) { // file is pdf
 
-							case DOCUMENT:
+							imageView.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.VISIBLE);
 
-								if(fileExtension.equalsIgnoreCase("pdf")) {
+							pdfNightMode = tinyDB.getBoolean("enablePdfMode");
 
-									processable = true;
-
-									byte[] documentBytes = responseBody.bytes();
-
-									runOnUiThread(() -> {
-
-										binding.photoView.setVisibility(View.GONE);
-										binding.markdownFrame.setVisibility(View.GONE);
-										binding.contents.setVisibility(View.GONE);
-
-										pdfNightMode = tinyDB.getBoolean("enablePdfMode");
-
-										binding.pdfViewFrame.setVisibility(View.VISIBLE);
-										binding.pdfView.fromBytes(documentBytes)
-											.enableSwipe(true)
-											.swipeHorizontal(false)
-											.enableDoubletap(true)
-											.defaultPage(0)
-											.enableAnnotationRendering(false)
-											.password(null)
-											.scrollHandle(null)
-											.enableAntialiasing(true)
-											.spacing(0)
-											.autoSpacing(true)
-											.pageFitPolicy(FitPolicy.WIDTH)
-											.fitEachPage(true)
-											.pageSnap(false)
-											.pageFling(true)
-											.nightMode(pdfNightMode).load();
-
-									});
-								}
-
-								break;
+							decodedPdf = Base64.decode(response.body().getContent(), Base64.DEFAULT);
+							pdfView.fromBytes(decodedPdf).enableSwipe(true).swipeHorizontal(false).enableDoubletap(true).defaultPage(0).enableAnnotationRendering(false).password(null).scrollHandle(null).enableAntialiasing(true).spacing(0).autoSpacing(true).pageFitPolicy(FitPolicy.WIDTH).fitEachPage(true).pageSnap(false).pageFling(true).nightMode(pdfNightMode).load();
 
 						}
+						else if(appUtil.excludeFilesInFileViewerExtension(fileExtension)) { // files need to be excluded
 
-						if(!processable) { // While the file could still be non-binary,
-							// it's better we don't show it (to prevent any crashes and/or unwanted behavior) and let the user download it instead.
+							imageView.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.VISIBLE);
 
-							responseBody.close();
-
-							runOnUiThread(() -> {
-
-								binding.photoView.setVisibility(View.GONE);
-								binding.contents.setVisibility(View.GONE);
-								binding.pdfViewFrame.setVisibility(View.GONE);
-
-								binding.markdownFrame.setVisibility(View.VISIBLE);
-								binding.markdown.setText(getString(R.string.excludeFilesInFileViewer));
-								binding.markdown.setGravity(Gravity.CENTER);
-								binding.markdown.setTypeface(null, Typeface.BOLD);
-
-							});
+							singleFileContents.setText(getResources().getString(R.string.excludeFilesInFileviewer));
+							singleFileContents.setGravity(Gravity.CENTER);
+							singleFileContents.setTypeface(null, Typeface.BOLD);
 						}
-					} else {
+						else { // file type not known - plain text view
 
-						runOnUiThread(() -> {
-							binding.markdown.setText("");
-							binding.progressBar.setVisibility(View.GONE);
-						});
+							imageView.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.VISIBLE);
 
+							singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
+						}
 					}
-				} else {
-
-					switch(response.code()) {
-
-						case 401:
-							AlertDialogs.authorizationTokenRevokedDialog(ctx,
-								getResources().getString(R.string.alertDialogTokenRevokedTitle),
-								getResources().getString(R.string.alertDialogTokenRevokedMessage),
-								getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-								getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-							break;
-
-						case 403:
-							Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-							break;
-
-						case 404:
-							Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-							break;
-
-						default:
-							Toasty.error(ctx, getString(R.string.labelGeneralError));
+					else {
 
+						singleFileContents.setText("");
+						mProgressBar.setVisibility(View.GONE);
 					}
 				}
-			} catch(IOException ignored) {}
+				else if(response.code() == 401) {
 
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+				}
+				else if(response.code() == 403) {
+
+					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+				}
+				else if(response.code() == 404) {
+
+					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+				}
+				else {
+
+					Toasty.error(ctx, getString(R.string.labelGeneralError));
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<Files> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+			}
 		});
 
-		thread.start();
-
 	}
 
 	@Override
@@ -275,11 +296,11 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
 		inflater.inflate(R.menu.files_view_menu, menu);
 
-		if(!FileUtils.getExtension(file.getName())
-			.equalsIgnoreCase("md")) {
+		String fileExtension = FileUtils.getExtension(singleFileName);
 
-			menu.getItem(0)
-				.setVisible(false);
+		if(!fileExtension.equalsIgnoreCase("md")) {
+
+			menu.getItem(0).setVisible(false);
 		}
 
 		return true;
@@ -294,36 +315,35 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 			finish();
 			return true;
-
-		} else if(id == R.id.genericMenu) {
+		}
+		else if(id == R.id.genericMenu) {
 
 			BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
 			bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
 			return true;
+		}
+		else if(id == R.id.markdown) {
 
-		} else if(id == R.id.markdown) {
+			new Markdown(ctx, appUtil.decodeBase64(tinyDB.getString("downloadFileContents")), singleFileContents);
 
 			if(!tinyDB.getBoolean("enableMarkdownInFileView")) {
 
-				new Markdown(ctx, EmojiParser.parseToUnicode(binding.contents.getContent()), binding.markdown);
-
-				binding.contents.setVisibility(View.GONE);
-				binding.markdownFrame.setVisibility(View.VISIBLE);
-
+				singleCodeContents.setVisibility(View.GONE);
+				singleFileContentsFrame.setVisibility(View.VISIBLE);
+				singleFileContents.setVisibility(View.VISIBLE);
 				tinyDB.putBoolean("enableMarkdownInFileView", true);
-
-			} else {
-
-				binding.markdownFrame.setVisibility(View.GONE);
-				binding.contents.setVisibility(View.VISIBLE);
-
-				tinyDB.putBoolean("enableMarkdownInFileView", false);
-
 			}
+			else {
 
+				singleCodeContents.setVisibility(View.VISIBLE);
+				singleFileContentsFrame.setVisibility(View.GONE);
+				singleFileContents.setVisibility(View.GONE);
+				singleCodeContents.setSource(appUtil.decodeBase64(tinyDB.getString("downloadFileContents")));
+				tinyDB.putBoolean("enableMarkdownInFileView", false);
+			}
 			return true;
-
-		} else {
+		}
+		else {
 
 			return super.onOptionsItemSelected(item);
 		}
@@ -339,118 +359,110 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 		if("deleteFile".equals(text)) {
 
+			String fileExtension = FileUtils.getExtension(singleFileName);
+			String data = appUtil.decodeBase64(tinyDB.getString("downloadFileContents"));
 			Intent intent = new Intent(ctx, CreateFileActivity.class);
-			intent.putExtra("fileAction", CreateFileActivity.FILE_ACTION_DELETE);
-			intent.putExtra("filePath", file.getPath());
-			intent.putExtra("fileSha", file.getSha());
+			intent.putExtra("fileAction", 1);
+			intent.putExtra("filePath", singleFileName);
+			intent.putExtra("fileSha", fileSha);
+
+			if(!appUtil.imageExtension(fileExtension)) {
+
+				intent.putExtra("fileContents", data);
+			}
+			else {
+
+				intent.putExtra("fileContents", "");
+			}
 
 			ctx.startActivity(intent);
-
 		}
 
 		if("editFile".equals(text)) {
 
-			if(binding.contents.getContent() != null &&
-				!binding.contents.getContent().isEmpty()) {
+			String fileExtension = FileUtils.getExtension(singleFileName);
+			String data = appUtil.decodeBase64(tinyDB.getString("downloadFileContents"));
+			Intent intent = new Intent(ctx, CreateFileActivity.class);
+			intent.putExtra("fileAction", 2);
+			intent.putExtra("filePath", singleFileName);
+			intent.putExtra("fileSha", fileSha);
 
-				Intent intent = new Intent(ctx, CreateFileActivity.class);
+			if(!appUtil.imageExtension(fileExtension)) {
 
-				intent.putExtra("fileAction", CreateFileActivity.FILE_ACTION_EDIT);
-				intent.putExtra("filePath", file.getPath());
-				intent.putExtra("fileSha", file.getSha());
-				intent.putExtra("fileContents", binding.contents.getContent());
-
-				ctx.startActivity(intent);
-
-			} else {
-
-				Toasty.error(ctx, getString(R.string.fileTypeCannotBeEdited));
+				intent.putExtra("fileContents", data);
 			}
+			else {
+
+				intent.putExtra("fileContents", "");
+			}
+
+			ctx.startActivity(intent);
 		}
+
 	}
 
 	private void requestFileDownload() {
 
-		Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+		if(!tinyDB.getString("downloadFileContents").isEmpty()) {
 
-		intent.addCategory(Intent.CATEGORY_OPENABLE);
-		intent.putExtra(Intent.EXTRA_TITLE, file.getName());
-		intent.setType("*/*");
+			File outputFileName = new File(tinyDB.getString("downloadFileName"));
 
-		activityResultLauncher.launch(intent);
+			Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
 
+			intent.addCategory(Intent.CATEGORY_OPENABLE);
+			intent.setType("*/*");
+			intent.putExtra(Intent.EXTRA_TITLE, outputFileName.getName());
+
+			fileDownloadActivityResultLauncher.launch(intent);
+		}
+		else {
+
+			Toasty.warning(ctx, getString(R.string.waitLoadingDownloadFile));
+		}
 	}
 
-	ActivityResultLauncher<Intent> activityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+	ActivityResultLauncher<Intent> fileDownloadActivityResultLauncher = registerForActivityResult(
+		new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
 
-		if (result.getResultCode() == Activity.RESULT_OK) {
+		@Override
+		public void onActivityResult(ActivityResult result) {
 
-			assert result.getData() != null;
+			if (result.getResultCode() == Activity.RESULT_OK) {
 
-			try {
+				Intent data = result.getData();
 
-				OutputStream outputStream = getContentResolver().openOutputStream(result.getData().getData());
+				try {
 
-				NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx, ctx.getPackageName())
-					.setContentTitle(getString(R.string.fileViewerNotificationTitleStarted))
-					.setContentText(getString(R.string.fileViewerNotificationDescriptionStarted, file.getName()))
-					.setSmallIcon(R.drawable.gitnex_transparent)
-					.setPriority(NotificationCompat.PRIORITY_LOW)
-					.setChannelId(Constants.downloadNotificationChannelId)
-					.setProgress(100, 0, false)
-					.setOngoing(true);
+					assert data != null;
+					Uri uri = data.getData();
 
-				int notificationId = Notifications.uniqueNotificationId(ctx);
+					assert uri != null;
+					OutputStream outputStream = getContentResolver().openOutputStream(uri);
 
-				NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);;
-				notificationManager.notify(notificationId, builder.build());
+					byte[] dataAsBytes = Base64.decode(tinyDB.getString("downloadFileContents"), 0);
 
-				String repoFullName = tinyDB.getString("repoFullName");
-				String repoBranch = tinyDB.getString("repoBranch");
-				String[] parts = repoFullName.split("/");
-				String repoOwner = parts[0];
-				String repoName = parts[1];
+					assert outputStream != null;
+					outputStream.write(dataAsBytes);
+					outputStream.close();
 
-				Thread thread = new Thread(() -> {
+					Toasty.success(ctx, getString(R.string.downloadFileSaved));
 
-					try {
+				}
+				catch(IOException e) {
 
-						Call<ResponseBody> call = RetrofitClient
-							.getWebInterface(ctx)
-							.getFileContents(Authorization.getWeb(ctx), repoOwner, repoName, repoBranch, file.getPath());
-
-						Response<ResponseBody> response = call.execute();
-
-						assert response.body() != null;
-
-						AppUtil.copyProgress(response.body().byteStream(), outputStream, file.getSize(), progress -> {
-							builder.setProgress(100, progress, false);
-							notificationManager.notify(notificationId, builder.build());
-						});
-
-						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFinished))
-							.setContentText(getString(R.string.fileViewerNotificationDescriptionFinished, file.getName()));
-
-					} catch(IOException ignored) {
-
-						builder.setContentTitle(getString(R.string.fileViewerNotificationTitleFailed))
-							.setContentText(getString(R.string.fileViewerNotificationDescriptionFailed, file.getName()));
-
-					} finally {
-
-						builder.setProgress(0,0,false)
-							.setOngoing(false);
-
-						notificationManager.notify(notificationId, builder.build());
-
-					}
-				});
-
-				thread.start();
-
-			} catch(IOException ignored) {}
+					Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
+				}
+			}
 		}
-
 	});
 
+	private void initCloseListener() {
+
+		onClickListener = view -> {
+
+			getIntent().removeExtra("singleFileName");
+			finish();
+		};
+	}
+
 }

app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java

@@ -9,6 +9,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.text.Html;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -21,19 +22,12 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.Collaborators;
-import org.gitnex.tea4j.models.Issues;
-import org.gitnex.tea4j.models.Labels;
-import org.gitnex.tea4j.models.UpdateIssueAssignees;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.AssigneesActions;
 import org.mian.gitnex.actions.LabelsActions;
@@ -59,6 +53,11 @@ import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.models.Labels;
+import org.mian.gitnex.models.UpdateIssueAssignees;
+import org.mian.gitnex.models.WatchInfo;
 import org.mian.gitnex.viewmodels.IssueCommentsViewModel;
 import org.mian.gitnex.views.ReactionList;
 import java.text.DateFormat;
@@ -90,8 +89,8 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 	private List<Integer> currentLabelsIds = new ArrayList<>();
 	private List<Integer> labelsIds = new ArrayList<>();
-	private final List<Labels> labelsList = new ArrayList<>();
-	private final List<Collaborators> assigneesList = new ArrayList<>();
+	private List<Labels> labelsList = new ArrayList<>();
+	private List<Collaborators> assigneesList = new ArrayList<>();
 	private List<String> assigneesListData = new ArrayList<>();
 	private List<String> currentAssignees = new ArrayList<>();
 
@@ -102,13 +101,20 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 	private CustomAssigneesSelectionDialogBinding assigneesBinding;
 	private ActivityIssueDetailBinding viewBinding;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_issue_detail;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
 		viewBinding = ActivityIssueDetailBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);
 
 		String repoFullName = tinyDB.getString("repoFullName");
 		String[] parts = repoFullName.split("/");
@@ -577,9 +583,9 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 					PicassoService.getInstance(ctx).get().load(singleIssue.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated)
 						.transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewBinding.assigneeAvatar);
-					String issueNumber_ = "<font color='" + ResourcesCompat.getColor(getResources(), R.color.lightGray, null) + "'>" + appCtx.getResources()
+					String issueNumber_ = "<font color='" + appCtx.getResources().getColor(R.color.lightGray) + "'>" + appCtx.getResources()
 						.getString(R.string.hash) + singleIssue.getNumber() + "</font>";
-					viewBinding.issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + EmojiParser.parseToUnicode(singleIssue.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
+					viewBinding.issueTitle.setText(Html.fromHtml(issueNumber_ + " " + singleIssue.getTitle()));
 					String cleanIssueDescription = singleIssue.getBody().trim();
 
 					new Markdown(ctx, EmojiParser.parseToUnicode(cleanIssueDescription), viewBinding.issueDescription);
@@ -729,17 +735,9 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 					bundle.putInt("issueId", singleIssue.getNumber());
 
 					ReactionList reactionList = new ReactionList(ctx, bundle);
-
 					viewBinding.commentReactionBadges.removeAllViews();
 					viewBinding.commentReactionBadges.addView(reactionList);
 
-					reactionList.setOnReactionAddedListener(() -> {
-
-						if(viewBinding.commentReactionBadges.getVisibility() != View.VISIBLE) {
-							viewBinding.commentReactionBadges.post(() -> viewBinding.commentReactionBadges.setVisibility(View.VISIBLE));
-						}
-					});
-
 					if(singleIssue.getMilestone() != null) {
 
 						viewBinding.issueMilestone.setVisibility(View.VISIBLE);

app/src/main/java/org/mian/gitnex/activities/LoginActivity.java

@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
@@ -10,23 +9,23 @@ import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RadioGroup;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import org.gitnex.tea4j.models.GiteaVersion;
-import org.gitnex.tea4j.models.UserInfo;
-import org.gitnex.tea4j.models.UserTokens;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.databinding.ActivityLoginBinding;
 import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.NetworkStatusObserver;
+import org.mian.gitnex.helpers.NetworkObserver;
 import org.mian.gitnex.helpers.PathsHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.UrlHelper;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.GiteaVersion;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.models.UserTokens;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -53,31 +52,34 @@ public class LoginActivity extends BaseActivity {
 	private String device_id = "token";
 	private String selectedProtocol;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_login;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityLoginBinding activityLoginBinding = ActivityLoginBinding.inflate(getLayoutInflater());
-		setContentView(activityLoginBinding.getRoot());
+		NetworkObserver networkMonitor = new NetworkObserver(ctx);
 
-		NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
+		loginButton = findViewById(R.id.login_button);
+		instanceUrlET = findViewById(R.id.instance_url);
+		loginUidET = findViewById(R.id.login_uid);
+		loginPassword = findViewById(R.id.login_passwd);
+		otpCode = findViewById(R.id.otpCode);
+		protocolSpinner = findViewById(R.id.httpsSpinner);
+		loginMethod = findViewById(R.id.loginMethod);
+		loginTokenCode = findViewById(R.id.loginTokenCode);
 
-		loginButton = activityLoginBinding.loginButton;
-		instanceUrlET = activityLoginBinding.instanceUrl;
-		loginUidET = activityLoginBinding.loginUid;
-		loginPassword = activityLoginBinding.loginPasswd;
-		otpCode = activityLoginBinding.otpCode;
-		protocolSpinner = activityLoginBinding.httpsSpinner;
-		loginMethod = activityLoginBinding.loginMethod;
-		loginTokenCode = activityLoginBinding.loginTokenCode;
-
-		activityLoginBinding.appVersion.setText(AppUtil.getAppVersion(appCtx));
+		((TextView) findViewById(R.id.appVersion)).setText(AppUtil.getAppVersion(appCtx));
 
 		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(LoginActivity.this, R.layout.list_spinner_items, Protocol.values());
 
 		protocolSpinner.setAdapter(adapterProtocols);
-		protocolSpinner.setSelection(0);
+
 		protocolSpinner.setOnItemClickListener((parent, view, position, id) -> {
 
 			selectedProtocol = String.valueOf(parent.getItemAtPosition(position));
@@ -113,24 +115,18 @@ public class LoginActivity extends BaseActivity {
 			}
 		});
 
-		Handler handler = new Handler(getMainLooper());
+		networkMonitor.onInternetStateListener(isAvailable -> {
 
-		networkStatusObserver.registerNetworkStatusListener(hasNetworkConnection -> {
+			if(isAvailable) {
 
-			handler.post(() -> {
+				enableProcessButton();
+			}
+			else {
 
-				if(hasNetworkConnection) {
-
-					enableProcessButton();
-				}
-				else {
-
-					disableProcessButton();
-					loginButton.setText(getResources().getString(R.string.btnLogin));
-					Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-				}
-
-			});
+				disableProcessButton();
+				loginButton.setText(getResources().getString(R.string.btnLogin));
+				Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+			}
 		});
 
 		loadDefaults();
@@ -271,10 +267,8 @@ public class LoginActivity extends BaseActivity {
 
 					if(gitea_version.less(getString(R.string.versionLow))) {
 
-						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx)
-							.setTitle(getString(R.string.versionAlertDialogHeader))
-							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion()))
-							.setIcon(R.drawable.ic_warning)
+						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
+							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning)
 							.setCancelable(true);
 
 						alertDialogBuilder.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {

app/src/main/java/org/mian/gitnex/activities/MainActivity.java

@@ -3,13 +3,15 @@ package org.mian.gitnex.activities;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.text.Html;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
@@ -17,25 +19,18 @@ import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.biometric.BiometricPrompt;
-import androidx.core.content.ContextCompat;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.navigation.NavigationView;
-import org.gitnex.tea4j.models.GiteaVersion;
-import org.gitnex.tea4j.models.NotificationCount;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.UserAccountsNavAdapter;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.databinding.ActivityMainBinding;
 import org.mian.gitnex.fragments.AdministrationFragment;
 import org.mian.gitnex.fragments.BottomSheetDraftsFragment;
 import org.mian.gitnex.fragments.DraftsFragment;
@@ -57,10 +52,14 @@ import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.GiteaVersion;
+import org.mian.gitnex.models.NotificationCount;
+import org.mian.gitnex.models.UserInfo;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Executor;
-import jp.wasabeef.picasso.transformations.BlurTransformation;
+import java.util.Objects;
+import eightbitlab.com.blurview.BlurView;
+import eightbitlab.com.blurview.RenderScriptBlur;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -71,10 +70,12 @@ import retrofit2.Callback;
 public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener, BottomSheetDraftsFragment.BottomSheetListener {
 
 	private DrawerLayout drawer;
+	private BlurView blurView;
 	private TextView userFullName;
 	private TextView userEmail;
 	private ImageView userAvatar;
 	private ImageView userAvatarBackground;
+	private ViewGroup navHeaderFrame;
 	private TextView toolbarTitle;
 	private Typeface myTypeface;
 
@@ -85,14 +86,17 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 	private MenuItem navNotifications;
 	private TextView notificationCounter;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_main;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityMainBinding activityMainBinding = ActivityMainBinding.inflate(getLayoutInflater());
-		setContentView(activityMainBinding.getRoot());
-
 		tinyDB.putBoolean("noConnection", false);
 
 		String currentVersion = tinyDB.getString("giteaVersion");
@@ -110,8 +114,8 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 		if(tinyDB.getString("codeBlockStr").isEmpty()) {
 
-			tinyDB.putInt("codeBlockColor", ResourcesCompat.getColor(getResources(), R.color.colorLightGreen, null));
-			tinyDB.putInt("codeBlockBackground", ResourcesCompat.getColor(getResources(), R.color.black, null));
+			tinyDB.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
+			tinyDB.putInt("codeBlockBackground", getResources().getColor(R.color.black));
 		}
 
 		if(tinyDB.getString("enableCounterIssueBadgeInit").isEmpty()) {
@@ -138,8 +142,8 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			AlertDialogs.forceLogoutDialog(ctx, getResources().getString(R.string.forceLogoutDialogHeader), getResources().getString(R.string.forceLogoutDialogDescription), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 		}
 
-		Toolbar toolbar = activityMainBinding.toolbar;
-		toolbarTitle = activityMainBinding.toolbarTitle;
+		Toolbar toolbar = findViewById(R.id.toolbar);
+		toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
 
 		switch(tinyDB.getInt("customFontId", -1)) {
 
@@ -157,43 +161,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				break;
 		}
 
-		// biometric auth
-		if(tinyDB.getBoolean("biometricStatus")) {
-
-			Executor executor = ContextCompat.getMainExecutor(this);
-
-			BiometricPrompt biometricPrompt = new BiometricPrompt(this, executor, new BiometricPrompt.AuthenticationCallback() {
-
-				@Override
-				public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
-
-					super.onAuthenticationError(errorCode, errString);
-
-					// Authentication error, close the app
-					if(errorCode == BiometricPrompt.ERROR_USER_CANCELED ||
-						errorCode == BiometricPrompt.ERROR_NEGATIVE_BUTTON) {
-
-						finish();
-					}
-				}
-
-				// Authentication succeeded, continue to app
-				@Override public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) { super.onAuthenticationSucceeded(result); }
-
-				// Authentication failed, close the app
-				@Override public void onAuthenticationFailed() { super.onAuthenticationFailed(); }
-
-			});
-
-			BiometricPrompt.PromptInfo biometricPromptBuilder = new BiometricPrompt.PromptInfo.Builder()
-				.setTitle(getString(R.string.biometricAuthTitle))
-				.setSubtitle(getString(R.string.biometricAuthSubTitle))
-				.setNegativeButtonText(getString(R.string.cancelButton)).build();
-
-			biometricPrompt.authenticate(biometricPromptBuilder);
-
-		}
-
 		toolbarTitle.setTypeface(myTypeface);
 		setSupportActionBar(toolbar);
 
@@ -243,15 +210,15 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 		getNotificationsCount(instanceToken);
 
-		drawer = activityMainBinding.drawerLayout;
-		NavigationView navigationView = activityMainBinding.navView;
+		drawer = findViewById(R.id.drawer_layout);
+		NavigationView navigationView = findViewById(R.id.nav_view);
 		navigationView.setNavigationItemSelectedListener(this);
 		hView = navigationView.getHeaderView(0);
 
 		Menu menu = navigationView.getMenu();
 		navNotifications = menu.findItem(R.id.nav_notifications);
 
-		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigationDrawerOpen, R.string.navigationDrawerClose);
+		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
 
 		drawer.addDrawerListener(toggle);
 		drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
@@ -269,10 +236,12 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				String userFullNameNav = tinyDB.getString("userFullname");
 				String userAvatarNav = tinyDB.getString("userAvatar");
 
+				blurView = hView.findViewById(R.id.blurView);
 				userEmail = hView.findViewById(R.id.userEmail);
 				userFullName = hView.findViewById(R.id.userFullname);
 				userAvatar = hView.findViewById(R.id.userAvatar);
 				userAvatarBackground = hView.findViewById(R.id.userAvatarBackground);
+				navHeaderFrame = hView.findViewById(R.id.navHeaderFrame);
 
 				List<UserAccount> userAccountsList;
 				userAccountsList = new ArrayList<>();
@@ -303,7 +272,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 				if(!userFullNameNav.equals("")) {
 
-					userFullName.setText(Html.fromHtml(userFullNameNav));
+					userFullName.setText(userFullNameNav);
 				}
 
 				if(!userAvatarNav.equals("")) {
@@ -317,18 +286,24 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 					PicassoService.getInstance(ctx).get()
 						.load(userAvatarNav)
-						.transform(new BlurTransformation(ctx))
 						.into(userAvatarBackground, new com.squareup.picasso.Callback() {
 
 							@Override
 							public void onSuccess() {
-								int textColor = new ColorInverter().getImageViewContrastColor(userAvatar);
+
+								int textColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);
 
 								userFullName.setTextColor(textColor);
 								userEmail.setTextColor(textColor);
+
+								blurView.setupWith(navHeaderFrame)
+									.setBlurAlgorithm(new RenderScriptBlur(ctx))
+									.setBlurRadius(5)
+									.setHasFixedTransformationMatrix(false);
 							}
 
-							@Override public void onError(Exception e) {}
+							@Override
+							public void onError(Exception e) {}
 						});
 				}
 
@@ -338,7 +313,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_profile);
 					drawer.closeDrawers();
-
 				});
 
 				getNotificationsCount(instanceToken);
@@ -392,21 +366,22 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			switch(launchFragmentByHandler) {
 
 				case "repos":
+
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_repositories);
 					return;
-
 				case "org":
+
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_organizations);
 					return;
-
 				case "notification":
+
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_notifications);
 					return;
-
 				case "explore":
+
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_explore);
 					return;
@@ -426,48 +401,49 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			switch(tinyDB.getInt("homeScreenId")) {
 
 				case 1:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_starred_repos);
 					break;
-
 				case 2:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_organizations);
 					break;
-
 				case 3:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_repositories);
 					break;
-
 				case 4:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_profile);
 					break;
-
 				case 5:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_explore);
 					break;
-
 				case 6:
+
 					toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_comments_draft);
 					break;
-
 				case 7:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_notifications);
 					break;
-
 				default:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_home);
@@ -492,7 +468,17 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		}
 
 		// Changelog popup
-		int versionCode = AppUtil.getAppBuildNo(appCtx);
+		int versionCode = 0;
+
+		try {
+
+			PackageInfo packageInfo = appCtx.getPackageManager().getPackageInfo(appCtx.getPackageName(), 0);
+			versionCode = packageInfo.versionCode;
+		}
+		catch(PackageManager.NameNotFoundException e) {
+
+			Log.e("changelogDialog", Objects.requireNonNull(e.getMessage()));
+		}
 
 		if(versionCode > tinyDB.getInt("versionCode")) {
 

app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java

@@ -9,8 +9,6 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.MergePullRequest;
-import org.gitnex.tea4j.models.MergePullRequestSpinner;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.ActivityMergePullRequestBinding;
@@ -19,8 +17,11 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.MergePullRequest;
+import org.mian.gitnex.models.MergePullRequestSpinner;
 import java.util.ArrayList;
 import java.util.Objects;
+import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -40,6 +41,12 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	private String Do;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_merge_pull_request;
+	}
+
 	@SuppressLint("SetTextI18n")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -47,7 +54,8 @@ public class MergePullRequestActivity extends BaseActivity {
 		super.onCreate(savedInstanceState);
 
 		viewBinding = ActivityMergePullRequestBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);
 
 		String repoFullName = tinyDB.getString("repoFullName");
 		String[] parts = repoFullName.split("/");
@@ -169,12 +177,12 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		MergePullRequest mergePR = new MergePullRequest(Do, mergePRDT, mergeTitle);
 
-		Call<Void> call = RetrofitClient.getApiInterface(ctx).mergePullRequest(Authorization.get(ctx), repoOwner, repoName, prIndex, mergePR);
+		Call<ResponseBody> call = RetrofitClient.getApiInterface(ctx).mergePullRequest(Authorization.get(ctx), repoOwner, repoName, prIndex, mergePR);
 
-		call.enqueue(new Callback<Void>() {
+		call.enqueue(new Callback<ResponseBody>() {
 
 			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+			public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
 
 				if(response.code() == 200) {
 
@@ -243,7 +251,7 @@ public class MergePullRequestActivity extends BaseActivity {
 			}
 
 			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
 
 				Log.e("onFailure", t.toString());
 				enableProcessButton();

app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java

@@ -23,7 +23,6 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.fragments.BottomSheetOrganizationFragment;
 import org.mian.gitnex.fragments.MembersByOrgFragment;
 import org.mian.gitnex.fragments.OrganizationInfoFragment;
-import org.mian.gitnex.fragments.OrganizationLabelsFragment;
 import org.mian.gitnex.fragments.RepositoriesByOrgFragment;
 import org.mian.gitnex.fragments.TeamsByOrgFragment;
 import org.mian.gitnex.helpers.Toasty;
@@ -36,17 +35,20 @@ import io.mikael.urlbuilder.UrlBuilder;
 
 public class OrganizationDetailActivity extends BaseActivity implements BottomSheetOrganizationFragment.BottomSheetListener {
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_org_detail;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    setContentView(R.layout.activity_org_detail);
-
         String orgName = tinyDB.getString("orgName");
 
         Toolbar toolbar = findViewById(R.id.toolbar);
-        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
 
         setSupportActionBar(toolbar);
         Objects.requireNonNull(getSupportActionBar()).setTitle(orgName);
@@ -143,13 +145,6 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
                 tinyDB.putBoolean("organizationAction", true);
                 startActivity(new Intent(OrganizationDetailActivity.this, CreateRepoActivity.class));
                 break;
-	        case "label":
-
-		        Intent intent = new Intent(ctx, CreateLabelActivity.class);
-		        intent.putExtra("orgName", getIntent().getStringExtra("orgName"));
-		        intent.putExtra("type", "org");
-		        ctx.startActivity(intent);
-		        break;
             case "team":
 
                 startActivity(new Intent(OrganizationDetailActivity.this, CreateTeamByOrgActivity.class));
@@ -196,14 +191,11 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
                     return OrganizationInfoFragment.newInstance(orgName);
                 case 1: // repos
 
-	                return RepositoriesByOrgFragment.newInstance(orgName);
-	            case 2: // labels
-
-                    return OrganizationLabelsFragment.newInstance(orgName);
-                case 3: // teams
+                    return RepositoriesByOrgFragment.newInstance(orgName);
+                case 2: // teams
 
                     return TeamsByOrgFragment.newInstance(orgName);
-                case 4: // members
+                case 3: // members
 
                     return MembersByOrgFragment.newInstance(orgName);
             }
@@ -212,7 +204,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
         @Override
         public int getCount() {
-            return 5;
+            return 4;
         }
     }
 }

app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java

@@ -14,7 +14,6 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProvider;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.TeamMembersByOrgAdapter;
-import org.mian.gitnex.databinding.ActivityOrgTeamMembersBinding;
 import org.mian.gitnex.fragments.BottomSheetOrganizationTeamsFragment;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
@@ -35,22 +34,24 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
 
     private String teamId;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_org_team_members;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityOrgTeamMembersBinding activityOrgTeamMembersBinding = ActivityOrgTeamMembersBinding.inflate(getLayoutInflater());
-	    setContentView(activityOrgTeamMembersBinding.getRoot());
-
-        Toolbar toolbar = activityOrgTeamMembersBinding.toolbar;
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        ImageView closeActivity = activityOrgTeamMembersBinding.close;
-        TextView toolbarTitle = activityOrgTeamMembersBinding.toolbarTitle;
-        noDataMembers = activityOrgTeamMembersBinding.noDataMembers;
-        mGridView = activityOrgTeamMembersBinding.gridView;
-	    progressBar = activityOrgTeamMembersBinding.progressBar;
+        ImageView closeActivity = findViewById(R.id.close);
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        noDataMembers = findViewById(R.id.noDataMembers);
+        mGridView = findViewById(R.id.gridView);
+	    progressBar = findViewById(R.id.progressBar);
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);

app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java

@@ -11,15 +11,14 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.AddEmail;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityProfileEmailBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.AddEmail;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -36,21 +35,23 @@ public class ProfileEmailActivity extends BaseActivity {
     private EditText userEmail;
     private Button addEmailButton;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_profile_email;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityProfileEmailBinding activityProfileEmailBinding = ActivityProfileEmailBinding.inflate(getLayoutInflater());
-	    setContentView(activityProfileEmailBinding.getRoot());
-
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        ImageView closeActivity = activityProfileEmailBinding.close;
-        userEmail = activityProfileEmailBinding.userEmail;
-        addEmailButton = activityProfileEmailBinding.addEmailButton;
+        ImageView closeActivity = findViewById(R.id.close);
+        userEmail = findViewById(R.id.userEmail);
+        addEmailButton = findViewById(R.id.addEmailButton);
 
         userEmail.requestFocus();
         assert imm != null;

app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java

@@ -27,9 +27,6 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.tabs.TabLayout;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.Branches;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BottomSheetIssuesFilterFragment;
@@ -47,6 +44,9 @@ import org.mian.gitnex.fragments.RepoInfoFragment;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -79,20 +79,24 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 	public static ViewPager mViewPager;
 	private int tabsCount;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_repo_detail;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		setContentView(R.layout.activity_repo_detail);
-
 		String[] repoNameParts = tinyDB.getString("repoFullName").split("/");
 		repositoryOwner = repoNameParts[0];
 		repositoryName = repoNameParts[1];
 
 		Toolbar toolbar = findViewById(R.id.toolbar);
 
-		TextView toolbarTitle = findViewById(R.id.toolbar_title);
+		TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
 		toolbarTitle.setText(repositoryName);
 
 		setSupportActionBar(toolbar);

app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java

@@ -21,15 +21,14 @@ import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import org.gitnex.tea4j.models.UserRepositories;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.RepoForksAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityRepoForksBinding;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.UserRepositories;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@@ -46,7 +45,7 @@ public class RepoForksActivity extends BaseActivity {
 	private TextView noData;
 	private ProgressBar progressBar;
 	private String TAG = "RepositoryForks";
-	private int resultLimit = Constants.resultLimitOldGiteaInstances;
+	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 	private int pageSize = 1;
 
 	private RecyclerView recyclerView;
@@ -54,16 +53,19 @@ public class RepoForksActivity extends BaseActivity {
 	private RepoForksAdapter adapter;
 	private ProgressBar progressLoadMore;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_forks;
+	}
+
 	@SuppressLint("DefaultLocale")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityRepoForksBinding activityRepoForksBinding = ActivityRepoForksBinding.inflate(getLayoutInflater());
-		setContentView(activityRepoForksBinding.getRoot());
-
-		Toolbar toolbar = activityRepoForksBinding.toolbar;
+		Toolbar toolbar = findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
 
 		TinyDB tinyDb = TinyDB.getInstance(appCtx);
@@ -74,15 +76,15 @@ public class RepoForksActivity extends BaseActivity {
 		final String repoOwner = parts[0];
 		final String repoName = parts[1];
 
-		TextView toolbar_title = activityRepoForksBinding.toolbarTitle;
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
 		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
 		toolbar_title.setText(String.format("%s : %s", ctx.getResources().getString(R.string.infoTabRepoForksCount), repoName));
 
-		ImageView closeActivity = activityRepoForksBinding.close;
-		noData = activityRepoForksBinding.noData;
-		progressLoadMore = activityRepoForksBinding.progressLoadMore;
-		progressBar = activityRepoForksBinding.progressBar;
-		SwipeRefreshLayout swipeRefresh = activityRepoForksBinding.pullToRefresh;
+		ImageView closeActivity = findViewById(R.id.close);
+		noData = findViewById(R.id.noData);
+		progressLoadMore = findViewById(R.id.progressLoadMore);
+		progressBar = findViewById(R.id.progress_bar);
+		SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
@@ -90,10 +92,10 @@ public class RepoForksActivity extends BaseActivity {
 		// if gitea is 1.12 or higher use the new limit (resultLimitNewGiteaInstances)
 		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12")) {
 
-			resultLimit = Constants.resultLimitNewGiteaInstances;
+			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
 		}
 
-		recyclerView = activityRepoForksBinding.recyclerView;
+		recyclerView = findViewById(R.id.recyclerView);
 		forksList = new ArrayList<>();
 
 		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(),

app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java

@@ -9,7 +9,6 @@ import android.widget.TextView;
 import androidx.lifecycle.ViewModelProvider;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.RepoStargazersAdapter;
-import org.mian.gitnex.databinding.ActivityRepoStargazersBinding;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.viewmodels.RepoStargazersViewModel;
 
@@ -25,19 +24,21 @@ public class RepoStargazersActivity extends BaseActivity {
     private GridView mGridView;
     private ProgressBar mProgressBar;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_repo_stargazers;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
-	    super.onCreate(savedInstanceState);
+        super.onCreate(savedInstanceState);
 
-	    ActivityRepoStargazersBinding activityRepoStargazersBinding = ActivityRepoStargazersBinding.inflate(getLayoutInflater());
-	    setContentView(activityRepoStargazersBinding.getRoot());
-
-        ImageView closeActivity = activityRepoStargazersBinding.close;
-        TextView toolbarTitle = activityRepoStargazersBinding.toolbarTitle;
-        noDataStargazers = activityRepoStargazersBinding.noDataStargazers;
-        mGridView = activityRepoStargazersBinding.gridView;
-        mProgressBar = activityRepoStargazersBinding.progressBar;
+        ImageView closeActivity = findViewById(R.id.close);
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        noDataStargazers = findViewById(R.id.noDataStargazers);
+        mGridView = findViewById(R.id.gridView);
+        mProgressBar = findViewById(R.id.progress_bar);
 
         String repoFullNameForStars = getIntent().getStringExtra("repoFullNameForStars");
         String[] parts = repoFullNameForStars.split("/");

app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java

@@ -9,7 +9,6 @@ import android.widget.TextView;
 import androidx.lifecycle.ViewModelProvider;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.RepoWatchersAdapter;
-import org.mian.gitnex.databinding.ActivityRepoWatchersBinding;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.viewmodels.RepoWatchersViewModel;
 
@@ -25,19 +24,21 @@ public class RepoWatchersActivity extends BaseActivity {
     private GridView mGridView;
     private ProgressBar mProgressBar;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_repo_watchers;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-	    ActivityRepoWatchersBinding activityRepoWatchersBinding = ActivityRepoWatchersBinding.inflate(getLayoutInflater());
-	    setContentView(activityRepoWatchersBinding.getRoot());
-
-        ImageView closeActivity = activityRepoWatchersBinding.close;
-        TextView toolbarTitle = activityRepoWatchersBinding.toolbarTitle;
-        noDataWatchers = activityRepoWatchersBinding.noDataWatchers;
-        mGridView = activityRepoWatchersBinding.gridView;
-        mProgressBar = activityRepoWatchersBinding.progressBar;
+        ImageView closeActivity = findViewById(R.id.close);
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        noDataWatchers = findViewById(R.id.noDataWatchers);
+        mGridView = findViewById(R.id.gridView);
+        mProgressBar = findViewById(R.id.progress_bar);
 
         String repoFullNameForWatchers = getIntent().getStringExtra("repoFullNameForWatchers");
         String[] parts = repoFullNameForWatchers.split("/");

app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java

@@ -10,8 +10,6 @@ import android.view.View;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.RepositoryTransfer;
-import org.gitnex.tea4j.models.UserRepositories;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.RepositoriesApi;
@@ -21,6 +19,8 @@ import org.mian.gitnex.databinding.CustomRepositoryEditPropertiesDialogBinding;
 import org.mian.gitnex.databinding.CustomRepositoryTransferDialogBinding;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.RepositoryTransfer;
+import org.mian.gitnex.models.UserRepositories;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -45,13 +45,19 @@ public class RepositorySettingsActivity extends BaseActivity {
 	private String repositoryOwner;
 	private String repositoryName;
 
+	@Override
+	protected int getLayoutResourceId(){
+		return R.layout.activity_repository_settings;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
 		viewBinding = ActivityRepositorySettingsBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);
 
 		loginUid = tinyDB.getString("loginUid");
 		String repoFullName = tinyDB.getString("repoFullName");
@@ -113,7 +119,6 @@ public class RepositorySettingsActivity extends BaseActivity {
 			}
 		});
 
-		dialogTransferRepository.setCancelable(false);
 		dialogTransferRepository.show();
 	}
 
@@ -196,7 +201,6 @@ public class RepositorySettingsActivity extends BaseActivity {
 			}
 		});
 
-		dialogDeleteRepository.setCancelable(false);
 		dialogDeleteRepository.show();
 	}
 
@@ -336,7 +340,6 @@ public class RepositorySettingsActivity extends BaseActivity {
 			propBinding.repoEnableMerge.isChecked(), propBinding.repoEnableRebase.isChecked(),
 			propBinding.repoEnableSquash.isChecked(), propBinding.repoEnableForceMerge.isChecked()));
 
-		dialogProp.setCancelable(false);
 		dialogProp.show();
 	}
 

app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java

@@ -8,7 +8,6 @@ import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsAppearanceBinding;
 import org.mian.gitnex.helpers.Toasty;
 
 /**
@@ -25,28 +24,31 @@ public class SettingsAppearanceActivity extends BaseActivity {
 	private static final String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
 	private static int customFontSelectedChoice = 0;
 
-	private static final String[] themeList = {"Dark", "Light", "Auto (Light / Dark)", "Retro", "Auto (Retro / Dark)", "Pitch Black"};
+	private static final String[] themeList = {"Dark", "Light", "Auto (Light / Dark)", "Retro", "Auto (Retro / Dark)"};
 	private static int themeSelectedChoice = 0;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_appearance;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivitySettingsAppearanceBinding activitySettingsAppearanceBinding = ActivitySettingsAppearanceBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsAppearanceBinding.getRoot());
+		ImageView closeActivity = findViewById(R.id.close);
 
-		ImageView closeActivity = activitySettingsAppearanceBinding.close;
+		final TextView tvDateTimeSelected = findViewById(R.id.tvDateTimeSelected); // setter for time
+		final TextView customFontSelected = findViewById(R.id.customFontSelected); // setter for custom font
+		final TextView themeSelected = findViewById(R.id.themeSelected); // setter for theme
 
-		final TextView tvDateTimeSelected = activitySettingsAppearanceBinding.tvDateTimeSelected; // setter for time
-		final TextView customFontSelected = activitySettingsAppearanceBinding.customFontSelected; // setter for custom font
-		final TextView themeSelected = activitySettingsAppearanceBinding.themeSelected; // setter for theme
+		LinearLayout timeFrame = findViewById(R.id.timeFrame);
+		LinearLayout customFontFrame = findViewById(R.id.customFontFrame);
+		LinearLayout themeFrame = findViewById(R.id.themeSelectionFrame);
 
-		LinearLayout timeFrame = activitySettingsAppearanceBinding.timeFrame;
-		LinearLayout customFontFrame = activitySettingsAppearanceBinding.customFontFrame;
-		LinearLayout themeFrame = activitySettingsAppearanceBinding.themeSelectionFrame;
-
-		SwitchMaterial counterBadgesSwitch = activitySettingsAppearanceBinding.switchCounterBadge;
+		SwitchMaterial counterBadgesSwitch = findViewById(R.id.switchCounterBadge);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);

app/src/main/java/org/mian/gitnex/activities/SettingsDraftsActivity.java

@@ -3,8 +3,8 @@ package org.mian.gitnex.activities;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsDraftsBinding;
 import org.mian.gitnex.helpers.Toasty;
 
 /**
@@ -15,23 +15,28 @@ public class SettingsDraftsActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_drafts;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivitySettingsDraftsBinding activitySettingsDraftsBinding = ActivitySettingsDraftsBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsDraftsBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsDraftsBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		activitySettingsDraftsBinding.commentsDeletionSwitch.setChecked(tinyDB.getBoolean("draftsCommentsDeletionEnabled"));
+		SwitchMaterial commentsDeletionSwitch = findViewById(R.id.commentsDeletionSwitch);
+
+		commentsDeletionSwitch.setChecked(tinyDB.getBoolean("draftsCommentsDeletionEnabled"));
 
 		// delete comments on submit switcher
-		activitySettingsDraftsBinding.commentsDeletionSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		commentsDeletionSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
 			tinyDB.putBoolean("draftsCommentsDeletionEnabled", isChecked);
 			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));

app/src/main/java/org/mian/gitnex/activities/SettingsFileViewerActivity.java

@@ -0,0 +1,93 @@
+package org.mian.gitnex.activities;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import com.google.android.material.switchmaterial.SwitchMaterial;
+import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.Toasty;
+
+/**
+ * Author M M Arif
+ */
+
+public class SettingsFileViewerActivity extends BaseActivity {
+
+	private View.OnClickListener onClickListener;
+
+	private static final String[] fileViewerSourceCodeThemesList = {"Sublime", "Arduino Light", "Github", "Far ", "Ir Black", "Android Studio"};
+	private static int fileViewerSourceCodeThemesSelectedChoice = 0;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_fileview;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+
+		super.onCreate(savedInstanceState);
+
+		ImageView closeActivity = findViewById(R.id.close);
+
+		initCloseListener();
+		closeActivity.setOnClickListener(onClickListener);
+
+		final TextView fileViewerSourceCodeThemesSelected = findViewById(R.id.sourceCodeThemeSelected); // setter for fileviewer theme
+
+		LinearLayout sourceCodeThemeFrame = findViewById(R.id.sourceCodeThemeFrame);
+
+		SwitchMaterial pdfModeSwitch = findViewById(R.id.switchPdfMode);
+
+		if(!tinyDB.getString("fileviewerSourceCodeThemeStr").isEmpty()) {
+			fileViewerSourceCodeThemesSelected.setText(tinyDB.getString("fileviewerSourceCodeThemeStr"));
+		}
+
+		if(fileViewerSourceCodeThemesSelectedChoice == 0) {
+			fileViewerSourceCodeThemesSelectedChoice = tinyDB.getInt("fileviewerThemeId");
+		}
+
+		pdfModeSwitch.setChecked(tinyDB.getBoolean("enablePdfMode"));
+
+		// fileviewer srouce code theme selection dialog
+		sourceCodeThemeFrame.setOnClickListener(view -> {
+
+			AlertDialog.Builder fvtsBuilder = new AlertDialog.Builder(SettingsFileViewerActivity.this);
+
+			fvtsBuilder.setTitle(R.string.fileviewerSourceCodeThemeSelectorDialogTitle);
+			fvtsBuilder.setCancelable(fileViewerSourceCodeThemesSelectedChoice != -1);
+
+			fvtsBuilder.setSingleChoiceItems(fileViewerSourceCodeThemesList, fileViewerSourceCodeThemesSelectedChoice, (dialogInterfaceTheme, i) -> {
+
+				fileViewerSourceCodeThemesSelectedChoice = i;
+				fileViewerSourceCodeThemesSelected.setText(fileViewerSourceCodeThemesList[i]);
+				tinyDB.putString("fileviewerSourceCodeThemeStr", fileViewerSourceCodeThemesList[i]);
+				tinyDB.putInt("fileviewerSourceCodeThemeId", i);
+
+				dialogInterfaceTheme.dismiss();
+				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+
+			});
+
+			AlertDialog cfDialog = fvtsBuilder.create();
+			cfDialog.show();
+		});
+
+		// pdf night mode switcher
+		pdfModeSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+
+			tinyDB.putBoolean("enablePdfMode", isChecked);
+			tinyDB.putString("enablePdfModeInit", "yes");
+			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+		});
+	}
+
+	private void initCloseListener() {
+		onClickListener = view -> finish();
+	}
+
+}

app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java

@@ -26,13 +26,20 @@ public class SettingsGeneralActivity extends BaseActivity {
 	private List<String> defaultScreen;
 	private static int defaultLinkHandlerScreenSelectedChoice = 0;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_general;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
 		viewBinding = ActivitySettingsGeneralBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);
 
 		initCloseListener();
 		viewBinding.close.setOnClickListener(onClickListener);
@@ -113,7 +120,7 @@ public class SettingsGeneralActivity extends BaseActivity {
 		// home screen
 
 		// link handler
-		String[] defaultScreen_ = {getResources().getString(R.string.generalDeepLinkSelectedText), getResources().getString(R.string.navRepos), getResources().getString(R.string.navOrg), getResources().getString(R.string.pageTitleNotifications), getResources().getString(R.string.navExplore)};
+		String[] defaultScreen_ = {getResources().getString(R.string.generalDeepLinkSelectedText), getResources().getString(R.string.navRepos), getResources().getString(R.string.navOrgs), getResources().getString(R.string.pageTitleNotifications), getResources().getString(R.string.navExplore)};
 		defaultScreen = new ArrayList<>(Arrays.asList(defaultScreen_));
 
 		String[] linksArray = new String[defaultScreen.size()];
@@ -131,7 +138,7 @@ public class SettingsGeneralActivity extends BaseActivity {
 		}
 		else if(defaultLinkHandlerScreenSelectedChoice == 2) {
 
-			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.navOrg));
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.navOrgs));
 		}
 		else if(defaultLinkHandlerScreenSelectedChoice == 3) {
 

app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java

@@ -8,9 +8,9 @@ import androidx.appcompat.app.AlertDialog;
 import com.pes.androidmaterialcolorpickerdialog.ColorPicker;
 import org.mian.gitnex.R;
 import org.mian.gitnex.databinding.ActivitySettingsNotificationsBinding;
-import org.mian.gitnex.helpers.Constants;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.notifications.Notifications;
+import org.mian.gitnex.notifications.NotificationsMaster;
 
 /**
  * Template Author M M Arif
@@ -21,19 +21,26 @@ public class SettingsNotificationsActivity extends BaseActivity {
 
 	private ActivitySettingsNotificationsBinding viewBinding;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_notifications;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
 		viewBinding = ActivitySettingsNotificationsBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);
 
 		View.OnClickListener onClickListener = viewClose -> finish();
 
 		viewBinding.close.setOnClickListener(onClickListener);
 
-		viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay)));
+		viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), tinyDB.getInt("pollingDelayMinutes", StaticGlobalVariables.defaultPollingDelay)));
 		viewBinding.chooseColorState.setCardBackgroundColor(tinyDB.getInt("notificationsLightColor", Color.GREEN));
 
 		viewBinding.enableNotificationsMode.setChecked(tinyDB.getBoolean("notificationsEnabled", true));
@@ -43,7 +50,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
 		viewBinding.enableNotificationsMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
 			tinyDB.putBoolean("notificationsEnabled", isChecked);
-			if(!isChecked) Notifications.stopWorker(ctx);
+			if(!isChecked) NotificationsMaster.fireWorker(ctx);
 			Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
 
 		});
@@ -52,9 +59,9 @@ public class SettingsNotificationsActivity extends BaseActivity {
 		viewBinding.pollingDelayFrame.setOnClickListener(v -> {
 
 			NumberPicker numberPicker = new NumberPicker(ctx);
-			numberPicker.setMinValue(Constants.minimumPollingDelay);
-			numberPicker.setMaxValue(Constants.maximumPollingDelay);
-			numberPicker.setValue(tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay));
+			numberPicker.setMinValue(StaticGlobalVariables.minimumPollingDelay);
+			numberPicker.setMaxValue(StaticGlobalVariables.maximumPollingDelay);
+			numberPicker.setValue(tinyDB.getInt("pollingDelayMinutes", StaticGlobalVariables.defaultPollingDelay));
 			numberPicker.setWrapSelectorWheel(true);
 
 			AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
@@ -66,8 +73,8 @@ public class SettingsNotificationsActivity extends BaseActivity {
 
 				tinyDB.putInt("pollingDelayMinutes", numberPicker.getValue());
 
-				Notifications.stopWorker(ctx);
-				Notifications.startWorker(ctx);
+				NotificationsMaster.fireWorker(ctx);
+				NotificationsMaster.hireWorker(ctx);
 
 				viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), numberPicker.getValue()));
 				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
@@ -76,7 +83,6 @@ public class SettingsNotificationsActivity extends BaseActivity {
 			builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
 			builder.setView(numberPicker);
 			builder.create().show();
-
 		});
 
 		// lights switcher

app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java

@@ -3,8 +3,8 @@ package org.mian.gitnex.activities;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsReportsBinding;
 import org.mian.gitnex.helpers.Toasty;
 
 /**
@@ -15,23 +15,28 @@ public class SettingsReportsActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_reporting;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivitySettingsReportsBinding activitySettingsReportsBinding = ActivitySettingsReportsBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsReportsBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsReportsBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		activitySettingsReportsBinding.crashReportsSwitch.setChecked(tinyDB.getBoolean("crashReportingEnabled"));
+		SwitchMaterial crashReportsSwitch = findViewById(R.id.crashReportsSwitch);
+
+		crashReportsSwitch.setChecked(tinyDB.getBoolean("crashReportingEnabled"));
 
 		// crash reports switcher
-		activitySettingsReportsBinding.crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
 			tinyDB.putBoolean("crashReportingEnabled", isChecked);
 			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));

app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java

@@ -1,9 +1,7 @@
 package org.mian.gitnex.activities;
 
-import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -11,17 +9,12 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
-import androidx.biometric.BiometricManager;
-import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.apache.commons.io.FileUtils;
 import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsSecurityBinding;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import java.io.File;
 import java.io.IOException;
-import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG;
-import static androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL;
 
 /**
  * Author M M Arif
@@ -37,29 +30,30 @@ public class SettingsSecurityActivity extends BaseActivity {
 	private static final String[] cacheSizeImagesList = {"50 MB", "100 MB", "250 MB", "500 MB", "1 GB"};
 	private static int cacheSizeImagesSelectedChoice = 0;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_security;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivitySettingsSecurityBinding activitySettingsSecurityBinding = ActivitySettingsSecurityBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsSecurityBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsSecurityBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		TextView cacheSizeDataSelected = activitySettingsSecurityBinding.cacheSizeDataSelected; // setter for data cache size
-		TextView cacheSizeImagesSelected = activitySettingsSecurityBinding.cacheSizeImagesSelected; // setter for images cache size
-		TextView clearCacheSelected = activitySettingsSecurityBinding.clearCacheSelected; // setter for clear cache
+		TextView cacheSizeDataSelected = findViewById(R.id.cacheSizeDataSelected); // setter for data cache size
+		TextView cacheSizeImagesSelected = findViewById(R.id.cacheSizeImagesSelected); // setter for images cache size
+		TextView clearCacheSelected = findViewById(R.id.clearCacheSelected); // setter for clear cache
 
-		LinearLayout certsFrame = activitySettingsSecurityBinding.certsFrame;
-		LinearLayout cacheSizeDataFrame = activitySettingsSecurityBinding.cacheSizeDataSelectionFrame;
-		LinearLayout cacheSizeImagesFrame = activitySettingsSecurityBinding.cacheSizeImagesSelectionFrame;
-		LinearLayout clearCacheFrame = activitySettingsSecurityBinding.clearCacheSelectionFrame;
-
-		SwitchMaterial switchBiometric = activitySettingsSecurityBinding.switchBiometric;
+		LinearLayout certsFrame = findViewById(R.id.certsFrame);
+		LinearLayout cacheSizeDataFrame = findViewById(R.id.cacheSizeDataSelectionFrame);
+		LinearLayout cacheSizeImagesFrame = findViewById(R.id.cacheSizeImagesSelectionFrame);
+		LinearLayout clearCacheFrame = findViewById(R.id.clearCacheSelectionFrame);
 
 		if(!tinyDB.getString("cacheSizeStr").isEmpty()) {
 
@@ -81,70 +75,6 @@ public class SettingsSecurityActivity extends BaseActivity {
 			cacheSizeImagesSelectedChoice = tinyDB.getInt("cacheSizeImagesId");
 		}
 
-		switchBiometric.setChecked(tinyDB.getBoolean("biometricStatus"));
-
-		// biometric switcher
-		switchBiometric.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-
-				if(isChecked) {
-
-					BiometricManager biometricManager = BiometricManager.from(ctx);
-					KeyguardManager keyguardManager = (KeyguardManager) ctx.getSystemService(Context.KEYGUARD_SERVICE);
-
-					if (!keyguardManager.isDeviceSecure()) {
-
-						switch(biometricManager.canAuthenticate(BIOMETRIC_STRONG | DEVICE_CREDENTIAL)) {
-
-							case BiometricManager.BIOMETRIC_SUCCESS:
-
-								tinyDB.putBoolean("biometricStatus", true);
-								Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-								break;
-							case BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE:
-							case BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED:
-							case BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED:
-							case BiometricManager.BIOMETRIC_STATUS_UNKNOWN:
-
-								tinyDB.putBoolean("biometricStatus", false);
-								switchBiometric.setChecked(false);
-								Toasty.error(appCtx, getResources().getString(R.string.biometricNotSupported));
-								break;
-							case BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE:
-
-								tinyDB.putBoolean("biometricStatus", false);
-								switchBiometric.setChecked(false);
-								Toasty.error(appCtx, getResources().getString(R.string.biometricNotAvailable));
-								break;
-							case BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED:
-
-								tinyDB.putBoolean("biometricStatus", false);
-								switchBiometric.setChecked(false);
-								Toasty.info(appCtx, getResources().getString(R.string.enrollBiometric));
-								break;
-						}
-					}
-					else {
-
-						tinyDB.putBoolean("biometricStatus", true);
-						Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-					}
-				}
-				else {
-
-					tinyDB.putBoolean("biometricStatus", false);
-					Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-				}
-			}
-			else {
-
-				tinyDB.putBoolean("biometricStatus", false);
-				Toasty.success(appCtx, getResources().getString(R.string.biometricNotSupported));
-			}
-
-		});
-
 		// clear cache setter
 		File cacheDir = appCtx.getCacheDir();
 		clearCacheSelected.setText(FileUtils.byteCountToDisplaySize((int) FileUtils.sizeOfDirectory(cacheDir)));

app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java

@@ -9,7 +9,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
 import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsTranslationBinding;
 import org.mian.gitnex.helpers.Toasty;
 
 /**
@@ -24,23 +23,26 @@ public class SettingsTranslationActivity extends BaseActivity {
 		"Polish", "Portuguese/Brazilian", "Russian", "Serbian", "Spanish", "Turkish", "Ukrainian"};
 	private static int langSelectedChoice = 0;
 
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_translation;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivitySettingsTranslationBinding activitySettingsTranslationBinding = ActivitySettingsTranslationBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsTranslationBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsTranslationBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		final TextView tvLanguageSelected = activitySettingsTranslationBinding.tvLanguageSelected; // setter for en, fr
-		TextView helpTranslate = activitySettingsTranslationBinding.helpTranslate;
+		final TextView tvLanguageSelected = findViewById(R.id.tvLanguageSelected); // setter for en, fr
+		TextView helpTranslate = findViewById(R.id.helpTranslate);
 
-		LinearLayout langFrame = activitySettingsTranslationBinding.langFrame;
+		LinearLayout langFrame = findViewById(R.id.langFrame);
 
 		helpTranslate.setOnClickListener(v12 -> {
 

app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java

@@ -1,176 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.recyclerview.widget.RecyclerView;
-import com.google.gson.JsonElement;
-import org.apache.commons.lang3.StringUtils;
-import org.gitnex.tea4j.models.CronTasks;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
-import java.util.List;
-import java.util.Locale;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAdapter.CronTasksViewHolder> {
-
-	private final List<CronTasks> tasksList;
-	private final Context mCtx;
-	private static TinyDB tinyDb;
-
-	static class CronTasksViewHolder extends RecyclerView.ViewHolder {
-
-		private CronTasks cronTasks;
-
-		private final ImageView runTask;
-		private final TextView taskName;
-		private final LinearLayout cronTasksInfo;
-		private final LinearLayout cronTasksRun;
-
-		private CronTasksViewHolder(View itemView) {
-
-			super(itemView);
-			Context ctx = itemView.getContext();
-
-			final String locale = tinyDb.getString("locale");
-			final String timeFormat = tinyDb.getString("dateFormat");
-
-			runTask = itemView.findViewById(R.id.runTask);
-			taskName = itemView.findViewById(R.id.taskName);
-			cronTasksInfo = itemView.findViewById(R.id.cronTasksInfo);
-			cronTasksRun = itemView.findViewById(R.id.cronTasksRun);
-
-			cronTasksInfo.setOnClickListener(taskInfo -> {
-
-				String nextRun = "";
-				String lastRun = "";
-
-				if(cronTasks.getNext() != null) {
-					nextRun = TimeHelper.formatTime(cronTasks.getNext(), new Locale(locale), timeFormat, ctx);
-				}
-				if(cronTasks.getPrev() != null) {
-					lastRun = TimeHelper.formatTime(cronTasks.getPrev(), new Locale(locale), timeFormat, ctx);
-				}
-
-				View view = LayoutInflater.from(ctx).inflate(R.layout.layout_cron_task_info, null);
-
-				TextView taskScheduleContent = view.findViewById(R.id.taskScheduleContent);
-				TextView nextRunContent = view.findViewById(R.id.nextRunContent);
-				TextView lastRunContent = view.findViewById(R.id.lastRunContent);
-				TextView execTimeContent = view.findViewById(R.id.execTimeContent);
-
-				taskScheduleContent.setText(cronTasks.getSchedule());
-				nextRunContent.setText(nextRun);
-				lastRunContent.setText(lastRun);
-				execTimeContent.setText(String.valueOf(cronTasks.getExec_times()));
-
-				AlertDialog.Builder alertDialog = new AlertDialog.Builder(ctx);
-
-				alertDialog.setTitle(StringUtils.capitalize(cronTasks.getName().replace("_", " ")));
-				alertDialog.setView(view);
-				alertDialog.setPositiveButton(ctx.getString(R.string.close), null);
-				alertDialog.create().show();
-
-			});
-
-			cronTasksRun.setOnClickListener(taskInfo -> {
-
-				runCronTask(ctx, cronTasks.getName());
-			});
-		}
-	}
-
-	public AdminCronTasksAdapter(Context mCtx, List<CronTasks> tasksListMain) {
-
-		tinyDb = TinyDB.getInstance(mCtx);
-		this.mCtx = mCtx;
-		this.tasksList = tasksListMain;
-	}
-
-	@NonNull
-	@Override
-	public AdminCronTasksAdapter.CronTasksViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_admin_cron_tasks, parent, false);
-		return new AdminCronTasksAdapter.CronTasksViewHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull AdminCronTasksAdapter.CronTasksViewHolder holder, int position) {
-
-		CronTasks currentItem = tasksList.get(position);
-
-		holder.cronTasks = currentItem;
-		holder.taskName.setText(StringUtils.capitalize(currentItem.getName().replace("_", " ")));
-	}
-
-	private static void runCronTask(final Context ctx, final String taskName) {
-
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-		Call<JsonElement> call = RetrofitClient
-			.getApiInterface(ctx)
-			.adminRunCronTask(instanceToken, taskName);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				switch(response.code()) {
-
-					case 204:
-						Toasty.success(ctx, ctx.getString(R.string.adminCronTaskSuccessMsg, taskName));
-						break;
-
-					case 401:
-						AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getString(R.string.alertDialogTokenRevokedTitle),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-						break;
-
-					case 403:
-						Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-						break;
-
-					case 404:
-						Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-						break;
-
-					default:
-						Toasty.error(ctx, ctx.getString(R.string.genericError));
-
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
-			}
-		});
-	}
-
-	@Override
-	public int getItemCount() {
-		return tasksList.size();
-	}
-}

app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java

@@ -1,7 +1,6 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,14 +9,12 @@ import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.UserInfo;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,22 +24,19 @@ import java.util.List;
 
 public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdapter.UsersViewHolder> implements Filterable {
 
-    private final List<UserInfo> usersList;
-    private final Context mCtx;
-    private final List<UserInfo> usersListFull;
+    private List<UserInfo> usersList;
+    private Context mCtx;
+    private List<UserInfo> usersListFull;
 
     static class UsersViewHolder extends RecyclerView.ViewHolder {
 
-	    private String userLoginId;
-
-        private final ImageView userAvatar;
-        private final TextView userFullName;
-        private final TextView userEmail;
-        private final ImageView userRole;
-        private final TextView userName;
+        private ImageView userAvatar;
+        private TextView userFullName;
+        private TextView userEmail;
+        private ImageView userRole;
+        private TextView userName;
 
         private UsersViewHolder(View itemView) {
-
             super(itemView);
 
             userAvatar = itemView.findViewById(R.id.userAvatar);
@@ -51,17 +45,10 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
             userEmail = itemView.findViewById(R.id.userEmail);
             userRole = itemView.findViewById(R.id.userRole);
 
-	        userAvatar.setOnClickListener(loginId -> {
-
-		        Context context = loginId.getContext();
-
-		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-	        });
         }
     }
 
     public AdminGetUsersAdapter(Context mCtx, List<UserInfo> usersListMain) {
-
         this.mCtx = mCtx;
         this.usersList = usersListMain;
         usersListFull = new ArrayList<>(usersList);
@@ -70,7 +57,6 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
     @NonNull
     @Override
     public AdminGetUsersAdapter.UsersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
         View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_admin_users, parent, false);
         return new AdminGetUsersAdapter.UsersViewHolder(v);
     }
@@ -80,43 +66,35 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
 
         UserInfo currentItem = usersList.get(position);
 
-	    holder.userLoginId = currentItem.getLogin();
-
         if(!currentItem.getFullname().equals("")) {
-
-            holder.userFullName.setText(Html.fromHtml(currentItem.getFullname()));
+            holder.userFullName.setText(currentItem.getFullname());
             holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
         }
         else {
-
             holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
             holder.userName.setVisibility(View.GONE);
         }
 
         if(!currentItem.getEmail().equals("")) {
-
             holder.userEmail.setText(currentItem.getEmail());
         }
         else {
-
             holder.userEmail.setVisibility(View.GONE);
         }
 
         if(currentItem.getIs_admin()) {
-
             holder.userRole.setVisibility(View.VISIBLE);
             TextDrawable drawable = TextDrawable.builder()
                     .beginConfig()
-                    .textColor(ResourcesCompat.getColor(mCtx.getResources(), R.color.colorWhite, null))
+                    .textColor(mCtx.getResources().getColor(R.color.colorWhite))
                     .fontSize(44)
                     .width(180)
                     .height(60)
                     .endConfig()
-                    .buildRoundRect(mCtx.getResources().getString(R.string.userRoleAdmin).toLowerCase(), ResourcesCompat.getColor(mCtx.getResources(), R.color.releasePre, null), 8);
+                    .buildRoundRect(mCtx.getResources().getString(R.string.userRoleAdmin).toLowerCase(), mCtx.getResources().getColor(R.color.releasePre), 8);
             holder.userRole.setImageDrawable(drawable);
         }
         else {
-
             holder.userRole.setVisibility(View.GONE);
         }
 
@@ -133,15 +111,14 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
         return usersFilter;
     }
 
-    private final Filter usersFilter = new Filter() {
+    private Filter usersFilter = new Filter() {
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
             List<UserInfo> filteredList = new ArrayList<>();
 
             if (constraint == null || constraint.length() == 0) {
                 filteredList.addAll(usersListFull);
-            }
-            else {
+            } else {
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
                 for (UserInfo item : usersListFull) {
@@ -159,7 +136,6 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
 
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
-
             usersList.clear();
             usersList.addAll((List) results.values);
             notifyDataSetChanged();

app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java

@@ -1,7 +1,6 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,10 +9,10 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Collaborators;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.Collaborators;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -24,12 +23,12 @@ import java.util.List;
 
 public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdapter.AssigneesViewHolder> {
 
-	private final Context mCtx;
-	private final List<Collaborators> assigneesList;
+	private Context mCtx;
+	private List<Collaborators> assigneesList;
 	private List<String> assigneesStrings = new ArrayList<>();
 	private List<String> currentAssignees;
 
-	private final AssigneesListAdapterListener assigneesListener;
+	private AssigneesListAdapterListener assigneesListener;
 
 	public interface AssigneesListAdapterListener {
 
@@ -46,9 +45,9 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 
 	static class AssigneesViewHolder extends RecyclerView.ViewHolder {
 
-		private final CheckBox assigneesSelection;
-		private final TextView assigneesName;
-		private final ImageView assigneesAvatar;
+		private CheckBox assigneesSelection;
+		private TextView assigneesName;
+		private ImageView assigneesAvatar;
 
 		private AssigneesViewHolder(View itemView) {
 
@@ -80,7 +79,7 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 		}
 		else {
 
-			holder.assigneesName.setText(Html.fromHtml(currentItem.getFull_name()));
+			holder.assigneesName.setText(currentItem.getFull_name());
 		}
 		PicassoService
 			.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(holder.assigneesAvatar);

app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java

@@ -2,17 +2,15 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import org.gitnex.tea4j.models.Collaborators;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import java.util.List;
 
@@ -22,32 +20,21 @@ import java.util.List;
 
 public class CollaboratorsAdapter extends BaseAdapter  {
 
-    private final List<Collaborators> collaboratorsList;
-    private final Context mCtx;
+    private List<Collaborators> collaboratorsList;
+    private Context mCtx;
 
-    private static class ViewHolder {
+    private class ViewHolder {
 
-	    private String userLoginId;
-
-        private final ImageView collaboratorAvatar;
-        private final TextView collaboratorName;
+        private ImageView collaboratorAvatar;
+        private TextView collaboratorName;
 
         ViewHolder(View v) {
-
             collaboratorAvatar  = v.findViewById(R.id.collaboratorAvatar);
             collaboratorName  = v.findViewById(R.id.collaboratorName);
-
-	        collaboratorAvatar.setOnClickListener(loginId -> {
-
-		        Context context = loginId.getContext();
-
-		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-	        });
         }
     }
 
     public CollaboratorsAdapter(Context mCtx, List<Collaborators> collaboratorsListMain) {
-
         this.mCtx = mCtx;
         this.collaboratorsList = collaboratorsListMain;
     }
@@ -74,18 +61,17 @@ public class CollaboratorsAdapter extends BaseAdapter  {
         ViewHolder viewHolder = null;
 
         if (finalView == null) {
-
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_collaborators, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
-
             viewHolder = (ViewHolder) finalView.getTag();
         }
 
         initData(viewHolder, position);
         return finalView;
+
     }
 
     private void initData(ViewHolder viewHolder, int position) {
@@ -93,14 +79,10 @@ public class CollaboratorsAdapter extends BaseAdapter  {
         Collaborators currentItem = collaboratorsList.get(position);
         PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);
 
-	    viewHolder.userLoginId = currentItem.getLogin();
-
         if(!currentItem.getFull_name().equals("")) {
-
-            viewHolder.collaboratorName.setText(Html.fromHtml(currentItem.getFull_name()));
+            viewHolder.collaboratorName.setText(currentItem.getFull_name());
         }
         else {
-
             viewHolder.collaboratorName.setText(currentItem.getLogin());
         }
 

app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java

@@ -11,12 +11,11 @@ import android.widget.Button;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.Commits;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Commits;
 import java.util.List;
 import java.util.Locale;
 
@@ -26,7 +25,7 @@ import java.util.Locale;
 
 public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    private final Context ctx;
+    private Context ctx;
     private final int TYPE_LOAD = 0;
     private List<Commits> commitsList;
     private CommitsAdapter.OnLoadMoreListener loadMoreListener;
@@ -117,7 +116,7 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
             final String locale = tinyDb.getString("locale");
             final String timeFormat = tinyDb.getString("dateFormat");
 
-            commitTitle.setText(EmojiParser.parseToUnicode(commitsModel.getCommit().getMessage()));
+            commitTitle.setText(commitsModel.getCommit().getMessage());
             commitCommitter.setText(ctx.getString(R.string.commitCommittedBy, commitsModel.getCommit().getCommitter().getName()));
 
             commitDate.setText(TimeHelper.formatTime(commitsModel.getCommit().getCommitter().getDate(), new Locale(locale), timeFormat, ctx));

app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,8 +12,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
@@ -120,9 +119,8 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 
         DraftWithRepository currentItem = draftsList.get(position);
 
-	    String issueNumber = "<font color='" + ResourcesCompat.getColor(mCtx.getResources(), R.color.lightGray, null) + "'>" + mCtx.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
-	    Spanned headTitle = HtmlCompat
-		    .fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName(), HtmlCompat.FROM_HTML_MODE_LEGACY);
+	    String issueNumber = "<font color='" + mCtx.getResources().getColor(R.color.lightGray) + "'>" + mCtx.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
+	    Spanned headTitle = Html.fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName());
 
 	    holder.repoInfo.setText(headTitle);
 	    holder.draftWithRepository = currentItem;

app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java

@@ -18,8 +18,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -33,6 +31,8 @@ import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.List;
 import java.util.Objects;
 import retrofit2.Call;

app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java

@@ -7,14 +7,13 @@ import android.view.ViewGroup;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.content.res.AppCompatResources;
 import androidx.recyclerview.widget.RecyclerView;
 import org.apache.commons.io.FileUtils;
-import org.gitnex.tea4j.models.Files;
 import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Files;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,40 +23,55 @@ import java.util.List;
 
 public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHolder> implements Filterable {
 
-	private final List<Files> originalFiles = new ArrayList<>();
-	private final List<Files> alteredFiles = new ArrayList<>();
+    private List<Files> filesList;
+    private Context mCtx;
+    private List<Files> filesListFull;
 
-    private final Context mCtx;
-
-    private final FilesAdapterListener filesListener;
+    private FilesAdapterListener filesListener;
 
     public interface FilesAdapterListener {
-
-        void onClickFile(Files file);
+        void onClickDir(String str);
+        void onClickFile(String str);
     }
 
-	class FilesViewHolder extends RecyclerView.ViewHolder {
+    class FilesViewHolder extends RecyclerView.ViewHolder {
 
-    	private Files file;
-
-    	private final LinearLayout fileFrame;
-        private final ImageView fileTypeIs;
-        private final TextView fileName;
-        private final TextView fileInfo;
+        private ImageView fileTypeImage;
+	    private ImageView dirTypeImage;
+	    private ImageView unknownTypeImage;
+        private TextView fileName;
+        private TextView fileType;
+        private TextView fileInfo;
 
         private FilesViewHolder(View itemView) {
 
             super(itemView);
-
-            fileFrame = itemView.findViewById(R.id.fileFrame);
             fileName = itemView.findViewById(R.id.fileName);
-	        fileTypeIs = itemView.findViewById(R.id.fileTypeIs);
+            fileTypeImage = itemView.findViewById(R.id.fileImage);
+	        dirTypeImage = itemView.findViewById(R.id.dirImage);
+	        unknownTypeImage = itemView.findViewById(R.id.unknownImage);
+            fileType = itemView.findViewById(R.id.fileType);
             fileInfo = itemView.findViewById(R.id.fileInfo);
 
-	        fileFrame.setOnClickListener(v -> filesListener.onClickFile(file));
-
             //ImageView filesDropdownMenu = itemView.findViewById(R.id.filesDropdownMenu);
 
+            fileName.setOnClickListener(v -> {
+
+                Context context = v.getContext();
+
+                if(fileType.getText().toString().equals("file")) {
+                    filesListener.onClickFile(fileName.getText().toString());
+                }
+                else if(fileType.getText().toString().equals("dir")) {
+                    filesListener.onClickDir(fileName.getText().toString());
+                }
+                else {
+                    Toasty.warning(context, context.getString(R.string.filesGenericError));
+                }
+
+            });
+
+
             /*filesDropdownMenu.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -124,24 +138,11 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         }
     }
 
-    public FilesAdapter(Context mCtx, FilesAdapterListener filesListener) {
-
+    public FilesAdapter(Context mCtx, List<Files> filesListMain, FilesAdapterListener filesListener) {
         this.mCtx = mCtx;
+        this.filesList = filesListMain;
+        filesListFull = new ArrayList<>(filesList);
         this.filesListener = filesListener;
-
-    }
-
-	public List<Files> getOriginalFiles() {
-		return originalFiles;
-	}
-
-    public void notifyOriginalDataSetChanged() {
-
-	    alteredFiles.clear();
-	    alteredFiles.addAll(originalFiles);
-
-    	notifyDataSetChanged();
-
     }
 
     @NonNull
@@ -154,43 +155,35 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
     @Override
     public void onBindViewHolder(@NonNull FilesAdapter.FilesViewHolder holder, int position) {
 
-        Files currentItem = alteredFiles.get(position);
+        Files currentItem = filesList.get(position);
 
-        holder.file = currentItem;
+        holder.fileType.setText(currentItem.getType());
         holder.fileName.setText(currentItem.getName());
 
-        switch(currentItem.getType()) {
-
-	        case "file":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_file));
-		        holder.fileInfo.setVisibility(View.VISIBLE);
-		        holder.fileInfo.setText(FileUtils.byteCountToDisplaySize(currentItem.getSize()));
-	        	break;
-
-	        case "dir":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_directory));
-		        holder.fileInfo.setVisibility(View.GONE);
-	        	break;
-
-	        case "submodule":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_submodule));
-		        holder.fileInfo.setVisibility(View.GONE);
-	        	break;
-
-	        case "symlink":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_symlink));
-		        holder.fileInfo.setVisibility(View.GONE);
-		        break;
-
-	        default:
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_question));
-
+        if(currentItem.getType().equals("file")) {
+            holder.fileTypeImage.setVisibility(View.VISIBLE);
+	        holder.dirTypeImage.setVisibility(View.GONE);
+	        holder.unknownTypeImage.setVisibility(View.GONE);
+            holder.fileInfo.setVisibility(View.VISIBLE);
+            holder.fileInfo.setText(FileUtils.byteCountToDisplaySize(currentItem.getSize()));
         }
+        else if(currentItem.getType().equals("dir")) {
+	        holder.dirTypeImage.setVisibility(View.VISIBLE);
+	        holder.unknownTypeImage.setVisibility(View.GONE);
+	        holder.fileTypeImage.setVisibility(View.GONE);
+	        holder.fileInfo.setVisibility(View.GONE);
+        }
+        else {
+	        holder.unknownTypeImage.setVisibility(View.VISIBLE);
+	        holder.dirTypeImage.setVisibility(View.GONE);
+	        holder.fileTypeImage.setVisibility(View.GONE);
+        }
+
     }
 
     @Override
     public int getItemCount() {
-        return alteredFiles.size();
+        return filesList.size();
     }
 
     @Override
@@ -198,19 +191,17 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         return filesFilter;
     }
 
-    private final Filter filesFilter = new Filter() {
-
+    private Filter filesFilter = new Filter() {
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
-
             List<Files> filteredList = new ArrayList<>();
 
             if (constraint == null || constraint.length() == 0) {
-                filteredList.addAll(originalFiles);
+                filteredList.addAll(filesListFull);
             } else {
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
-                for (Files item : originalFiles) {
+                for (Files item : filesListFull) {
                     if (item.getName().toLowerCase().contains(filterPattern) || item.getPath().toLowerCase().contains(filterPattern)) {
                         filteredList.add(item);
                     }
@@ -221,19 +212,14 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
             results.values = filteredList;
 
             return results;
-
         }
 
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
-
-            alteredFiles.clear();
-	        alteredFiles.addAll((List) results.values);
-
+            filesList.clear();
+            filesList.addAll((List) results.values);
             notifyDataSetChanged();
-
         }
-
     };
 
 }

app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java

@@ -13,10 +13,10 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.fragment.app.FragmentManager;
-import org.gitnex.tea4j.models.FileDiffView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.models.FileDiffView;
 import org.mian.gitnex.views.DiffTextView;
 import java.util.List;
 import java.util.Map;

app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java

@@ -18,18 +18,19 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.IssueComments;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.IssueComments;
 import org.mian.gitnex.views.ReactionList;
 import org.mian.gitnex.views.ReactionSpinner;
 import java.util.List;
@@ -65,7 +66,6 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 	class IssueCommentViewHolder extends RecyclerView.ViewHolder {
 
-		private String userLoginId;
 		private IssueComments issueComment;
 
 		private final ImageView avatar;
@@ -228,13 +228,6 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 			});
 
-			avatar.setOnClickListener(loginId -> {
-
-				Context context = loginId.getContext();
-
-				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-			});
-
 		}
 
 	}
@@ -319,8 +312,6 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 		String timeFormat = tinyDB.getString("dateFormat");
 		IssueComments issueComment = issuesComments.get(position);
 
-		holder.userLoginId = issueComment.getUser().getLogin();
-
 		holder.issueComment = issueComment;
 		holder.author.setText(issueComment.getUser().getUsername());
 
@@ -340,8 +331,8 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 			if(timeFormat.equals("pretty")) {
 
 				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), Locale.getDefault(), "pretty", ctx));
-				holder.information.setOnClickListener(v -> TimeHelper.customDateFormatForToastDateFormat(issueComment.getCreated_at()));
-
+				holder.information
+					.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issueComment.getCreated_at()), ctx));
 			}
 			else if(timeFormat.equals("normal")) {
 
@@ -364,14 +355,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 		bundle1.putInt("commentId", issueComment.getId());
 
 		ReactionList reactionList = new ReactionList(ctx, bundle1);
-
 		holder.commentReactionBadges.addView(reactionList);
-		reactionList.setOnReactionAddedListener(() -> {
-
-			if(holder.commentReactionBadges.getVisibility() != View.VISIBLE) {
-				holder.commentReactionBadges.post(() -> holder.commentReactionBadges.setVisibility(View.VISIBLE));
-			}
-		});
 
 	}
 

app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java

@@ -3,6 +3,7 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,19 +11,15 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.Issues;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Issues;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -35,7 +32,7 @@ import java.util.Locale;
 
 public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-	private final Context context;
+	private Context context;
 	private final int TYPE_LOAD = 0;
 	private List<Issues> issuesList;
 	private OnLoadMoreListener loadMoreListener;
@@ -102,99 +99,92 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
 	class IssuesHolder extends RecyclerView.ViewHolder {
 
-		private Issues issue;
-
-		private final ImageView issueAssigneeAvatar;
-		private final TextView issueTitle;
-		private final TextView issueCreatedTime;
-		private final TextView issueCommentsCount;
+		private TextView issueNumber;
+		private ImageView issueAssigneeAvatar;
+		private TextView issueTitle;
+		private TextView issueCreatedTime;
+		private TextView issueCommentsCount;
 
 		IssuesHolder(View itemView) {
 
 			super(itemView);
 
+			issueNumber = itemView.findViewById(R.id.issueNumber);
 			issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
 			issueTitle = itemView.findViewById(R.id.issueTitle);
 			issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
 			LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
 			issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
 
-			issueTitle.setOnClickListener(title -> {
+			issueTitle.setOnClickListener(v -> {
 
-				Context context = title.getContext();
-
-				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", issue.getNumber());
-
-				TinyDB tinyDb = TinyDB.getInstance(context);
-				tinyDb.putString("issueNumber", String.valueOf(issue.getNumber()));
-				tinyDb.putString("issueType", "Issue");
-				context.startActivity(intent);
-
-			});
-
-			frameCommentsCount.setOnClickListener(commentsCount -> {
-
-				Context context = commentsCount.getContext();
-
-				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", issue.getNumber());
-
-				TinyDB tinyDb = TinyDB.getInstance(context);
-				tinyDb.putString("issueNumber", String.valueOf(issue.getNumber()));
-				tinyDb.putString("issueType", "Issue");
-				context.startActivity(intent);
-
-			});
-
-			issueAssigneeAvatar.setOnClickListener(v -> {
 				Context context = v.getContext();
-				String userLoginId = issue.getUser().getLogin();
 
-				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
+				Intent intent = new Intent(context, IssueDetailActivity.class);
+				intent.putExtra("issueNumber", issueNumber.getText());
+
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("issueNumber", issueNumber.getText().toString());
+				tinyDb.putString("issueType", "Issue");
+				context.startActivity(intent);
+
+			});
+			frameCommentsCount.setOnClickListener(v -> {
+
+				Context context = v.getContext();
+
+				Intent intent = new Intent(context, IssueDetailActivity.class);
+				intent.putExtra("issueNumber", issueNumber.getText());
+
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("issueNumber", issueNumber.getText().toString());
+				tinyDb.putString("issueType", "Issue");
+				context.startActivity(intent);
+
 			});
 
 		}
 
 		@SuppressLint("SetTextI18n")
-		void bindData(Issues issue) {
+		void bindData(Issues issuesModel) {
 
-			TinyDB tinyDb = TinyDB.getInstance(context);
-			String locale = tinyDb.getString("locale");
-			String timeFormat = tinyDb.getString("dateFormat");
+			final TinyDB tinyDb = TinyDB.getInstance(context);
+			final String locale = tinyDb.getString("locale");
+			final String timeFormat = tinyDb.getString("dateFormat");
 
-			PicassoService.getInstance(context).get()
-				.load(issue.getUser().getAvatar_url())
-				.placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(8, 0))
-				.resize(120, 120)
-				.centerCrop()
-				.into(issueAssigneeAvatar);
+			if(!issuesModel.getUser().getFull_name().equals("")) {
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
+			}
+			else {
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getLogin(), context));
+			}
 
-			String issueNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + issue.getNumber() + "</font>";
-			issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + EmojiParser.parseToUnicode(issue.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
+			PicassoService.getInstance(context).get().load(issuesModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
 
-			this.issue = issue;
-			this.issueCommentsCount.setText(String.valueOf(issue.getComments()));
+			String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
+			issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
+
+			issueNumber.setText(String.valueOf(issuesModel.getNumber()));
+			issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));
 
 			switch(timeFormat) {
 				case "pretty": {
 					PrettyTime prettyTime = new PrettyTime(new Locale(locale));
-					String createdTime = prettyTime.format(issue.getCreated_at());
-					this.issueCreatedTime.setText(createdTime);
-					this.issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getCreated_at()), context));
+					String createdTime = prettyTime.format(issuesModel.getCreated_at());
+					issueCreatedTime.setText(createdTime);
+					issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issuesModel.getCreated_at()), context));
 					break;
 				}
 				case "normal": {
 					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-					String createdTime = formatter.format(issue.getCreated_at());
-					this.issueCreatedTime.setText(createdTime);
+					String createdTime = formatter.format(issuesModel.getCreated_at());
+					issueCreatedTime.setText(createdTime);
 					break;
 				}
 				case "normal1": {
 					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-					String createdTime = formatter.format(issue.getCreated_at());
-					this.issueCreatedTime.setText(createdTime);
+					String createdTime = formatter.format(issuesModel.getCreated_at());
+					issueCreatedTime.setText(createdTime);
 					break;
 				}
 			}

app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java

@@ -15,11 +15,11 @@ import androidx.cardview.widget.CardView;
 import androidx.core.widget.ImageViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.gitnex.tea4j.models.Labels;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateLabelActivity;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.ColorInverter;
+import org.mian.gitnex.models.Labels;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,8 +32,6 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
     private List<Labels> labelsList;
     final private Context mCtx;
     private ArrayList<Integer> labelsArray = new ArrayList<>();
-    private static String type;
-	private static String orgName;
 
     static class LabelsViewHolder extends RecyclerView.ViewHolder {
 
@@ -79,8 +77,6 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                     intent.putExtra("labelTitle", labelTitle.getText());
                     intent.putExtra("labelColor", labelColor.getText());
                     intent.putExtra("labelAction", "edit");
-	                intent.putExtra("type", type);
-	                intent.putExtra("orgName", orgName);
                     context.startActivity(intent);
                     dialog.dismiss();
 
@@ -91,9 +87,8 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                     AlertDialogs.labelDeleteDialog(context, labelTitle.getText().toString(), labelId.getText().toString(),
                             context.getResources().getString(R.string.labelDeleteTitle),
                             context.getResources().getString(R.string.labelDeleteMessage),
-                            context.getResources().getString(R.string.labelDeleteTitle),
-                            context.getResources().getString(R.string.labelDeleteNegativeButton),
-	                        type, orgName);
+                            context.getResources().getString(R.string.labelDeletePositiveButton),
+                            context.getResources().getString(R.string.labelDeleteNegativeButton));
                     dialog.dismiss();
 
                 });
@@ -103,12 +98,9 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
         }
     }
 
-    public LabelsAdapter(Context mCtx, List<Labels> labelsMain, String type, String orgName) {
-
+    public LabelsAdapter(Context mCtx, List<Labels> labelsMain) {
         this.mCtx = mCtx;
         this.labelsList = labelsMain;
-        LabelsAdapter.type = type;
-        LabelsAdapter.orgName = orgName;
     }
 
     @NonNull

app/src/main/java/org/mian/gitnex/adapters/LabelsListAdapter.java

@@ -9,8 +9,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Labels;
 import org.mian.gitnex.R;
+import org.mian.gitnex.models.Labels;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;

app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java

@@ -2,7 +2,6 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,11 +10,10 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.UserInfo;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,36 +23,26 @@ import java.util.List;
 
 public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
 
-    private final List<UserInfo> membersList;
-    private final Context mCtx;
-    private final List<UserInfo> membersListFull;
+    private List<UserInfo> membersList;
+    private Context mCtx;
+    private List<UserInfo> membersListFull;
 
-    private static class ViewHolder {
+    private class ViewHolder {
 
-	    private String userLoginId;
-
-        private final ImageView memberAvatar;
-        private final TextView memberName;
+        private ImageView memberAvatar;
+        private TextView memberName;
 
         ViewHolder(View v) {
-
             memberAvatar  = v.findViewById(R.id.memberAvatar);
             memberName  = v.findViewById(R.id.memberName);
-
-	        memberAvatar.setOnClickListener(loginId -> {
-
-		        Context context = loginId.getContext();
-
-		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-	        });
         }
     }
 
     public MembersByOrgAdapter(Context mCtx, List<UserInfo> membersListMain) {
-
         this.mCtx = mCtx;
         this.membersList = membersListMain;
         membersListFull = new ArrayList<>(membersList);
+
     }
 
     @Override
@@ -79,18 +67,17 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
         MembersByOrgAdapter.ViewHolder viewHolder = null;
 
         if (finalView == null) {
-
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_members_by_org, null);
-            viewHolder = new ViewHolder(finalView);
+            viewHolder = new MembersByOrgAdapter.ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
-
             viewHolder = (MembersByOrgAdapter.ViewHolder) finalView.getTag();
         }
 
         initData(viewHolder, position);
         return finalView;
+
     }
 
     private void initData(MembersByOrgAdapter.ViewHolder viewHolder, int position) {
@@ -98,14 +85,10 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
         UserInfo currentItem = membersList.get(position);
         PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewHolder.memberAvatar);
 
-	    viewHolder.userLoginId = currentItem.getLogin();
-
         if(!currentItem.getFullname().equals("")) {
-
-            viewHolder.memberName.setText(Html.fromHtml(currentItem.getFullname()));
+            viewHolder.memberName.setText(currentItem.getFullname());
         }
         else {
-
             viewHolder.memberName.setText(currentItem.getLogin());
         }
 
@@ -116,17 +99,14 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
         return membersFilter;
     }
 
-    private final Filter membersFilter = new Filter() {
+    private Filter membersFilter = new Filter() {
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
             List<UserInfo> filteredList = new ArrayList<>();
 
             if (constraint == null || constraint.length() == 0) {
-
                 filteredList.addAll(membersListFull);
-            }
-            else {
-
+            } else {
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
                 for (UserInfo item : membersListFull) {
@@ -144,7 +124,6 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
 
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
-
             membersList.clear();
             membersList.addAll((List) results.values);
             notifyDataSetChanged();

app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java

@@ -10,18 +10,17 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.Milestones;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.MilestoneActions;
 import org.mian.gitnex.helpers.ClickListener;
-import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Markdown;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Milestones;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -41,7 +40,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false;
 	private boolean isMoreDataAvailable = true;
-	private String TAG = Constants.tagMilestonesAdapter;
+	private String TAG = StaticGlobalVariables.tagMilestonesAdapter;
 
 	public MilestonesAdapter(Context context, List<Milestones> dataListMain) {
 
@@ -221,7 +220,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 					String dueDate = formatter.format(date);
 
 					if(date.before(new Date())) {
-						msDueDate.setTextColor(ResourcesCompat.getColor(context.getResources(), R.color.darkRed, null));
+						msDueDate.setTextColor(context.getResources().getColor(R.color.darkRed));
 					}
 
 					msDueDate.setText(dueDate);

app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java

@@ -20,8 +20,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -35,6 +33,8 @@ import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java

@@ -1,6 +1,7 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -8,14 +9,12 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.NotificationThread;
 import org.mian.gitnex.R;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.NotificationThread;
 import java.util.List;
 
 /**
@@ -82,10 +81,10 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 		NotificationThread notificationThread = notificationThreads.get(position);
 
 		String url = notificationThread.getSubject().getUrl();
-		String subjectId = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources()
+		String subjectId = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources()
 			.getString(R.string.hash) + url.substring(url.lastIndexOf("/") + 1) + "</font>";
 
-		holder.subject.setText(HtmlCompat.fromHtml(subjectId + " " + notificationThread.getSubject().getTitle(), HtmlCompat.FROM_HTML_MODE_LEGACY));
+		holder.subject.setText(Html.fromHtml(subjectId + " " + notificationThread.getSubject().getTitle()));
 		holder.repository.setText(notificationThread.getRepository().getFullName());
 
 		if(notificationThread.isPinned()) {

app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java

@@ -12,12 +12,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserOrganizations;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OrganizationDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.UserOrganizations;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,23 +45,27 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
             image = itemView.findViewById(R.id.imageAvatar);
             organizationId = itemView.findViewById(R.id.organizationId);
 
-            itemView.setOnClickListener(v -> {
+            itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
 
-                Context context = v.getContext();
-                Intent intent = new Intent(context, OrganizationDetailActivity.class);
-                intent.putExtra("orgName", mTextView1.getText().toString());
+                    Context context = v.getContext();
+                    Intent intent = new Intent(context, OrganizationDetailActivity.class);
+                    intent.putExtra("orgName", mTextView1.getText().toString());
 
-                TinyDB tinyDb = TinyDB.getInstance(context);
-                tinyDb.putString("orgName", mTextView1.getText().toString());
-                tinyDb.putString("organizationId", organizationId.getText().toString());
-                tinyDb.putBoolean("organizationAction", true);
-                context.startActivity(intent);
+                    TinyDB tinyDb = TinyDB.getInstance(context);
+                    tinyDb.putString("orgName", mTextView1.getText().toString());
+                    tinyDb.putString("organizationId", organizationId.getText().toString());
+                    tinyDb.putBoolean("organizationAction", true);
+                    context.startActivity(intent);
+
+                }
             });
+
         }
     }
 
     public OrganizationsListAdapter(Context mCtx, List<UserOrganizations> orgsListMain) {
-
         this.mCtx = mCtx;
         this.orgList = orgsListMain;
         orgListFull = new ArrayList<>(orgList);
@@ -70,7 +74,6 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
     @NonNull
     @Override
     public OrganizationsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
         View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_organizations, parent, false);
         return new OrganizationsViewHolder(v);
     }
@@ -85,12 +88,11 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
 
         PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
         holder.mTextView1.setText(currentItem.getUsername());
-
         if (!currentItem.getDescription().equals("")) {
-
             holder.mTextView2.setVisibility(View.VISIBLE);
             holder.mTextView2.setText(currentItem.getDescription());
         }
+
     }
 
     @Override
@@ -103,19 +105,14 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
         return orgFilter;
     }
 
-    private final Filter orgFilter = new Filter() {
-
+    private Filter orgFilter = new Filter() {
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
-
             List<UserOrganizations> filteredList = new ArrayList<>();
 
             if (constraint == null || constraint.length() == 0) {
-
                 filteredList.addAll(orgListFull);
-            }
-            else {
-
+            } else {
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
                 for (UserOrganizations item : orgListFull) {
@@ -133,7 +130,6 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
 
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
-
             orgList.clear();
             orgList.addAll((List) results.values);
             notifyDataSetChanged();

app/src/main/java/org/mian/gitnex/adapters/ProfileEmailsAdapter.java

@@ -6,13 +6,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
-import org.gitnex.tea4j.models.Emails;
 import org.mian.gitnex.R;
+import org.mian.gitnex.models.Emails;
 import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Author M M Arif
@@ -59,12 +58,12 @@ public class ProfileEmailsAdapter extends RecyclerView.Adapter<ProfileEmailsAdap
         if(currentItem.getPrimary()) {
             TextDrawable drawable = TextDrawable.builder()
                     .beginConfig()
-                    .textColor(ResourcesCompat.getColor(mCtx.getResources(), R.color.colorWhite, null))
+                    .textColor(mCtx.getResources().getColor(R.color.colorWhite))
                     .fontSize(36)
                     .width(220)
                     .height(60)
                     .endConfig()
-                    .buildRoundRect(mCtx.getResources().getString(R.string.emailTypeText), ResourcesCompat.getColor(mCtx.getResources(), R.color.tooltipBackground, null), 8);
+                    .buildRoundRect(mCtx.getResources().getString(R.string.emailTypeText), mCtx.getResources().getColor(R.color.tooltipBackground), 8);
             holder.emailPrimary.setImageDrawable(drawable);
         }
         else {

app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java

@@ -1,20 +1,18 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.UserInfo;
 import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Author M M Arif
@@ -22,36 +20,26 @@ import java.util.List;
 
 public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowersAdapter.FollowersViewHolder> {
 
-    private final List<UserInfo> followersList;
-    private final Context mCtx;
+    private List<UserInfo> followersList;
+    private Context mCtx;
 
     static class FollowersViewHolder extends RecyclerView.ViewHolder {
 
-	    private String userLoginId;
-
-        private final ImageView userAvatar;
-        private final TextView userFullName;
-        private final TextView userName;
+        private ImageView userAvatar;
+        private TextView userFullName;
+        private TextView userName;
 
         private FollowersViewHolder(View itemView) {
-
             super(itemView);
 
             userAvatar = itemView.findViewById(R.id.userAvatar);
             userFullName = itemView.findViewById(R.id.userFullName);
             userName = itemView.findViewById(R.id.userName);
 
-	        userAvatar.setOnClickListener(loginId -> {
-
-		        Context context = loginId.getContext();
-
-		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-	        });
         }
     }
 
     public ProfileFollowersAdapter(Context mCtx, List<UserInfo> followersListMain) {
-
         this.mCtx = mCtx;
         this.followersList = followersListMain;
     }
@@ -59,9 +47,8 @@ public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowe
     @NonNull
     @Override
     public ProfileFollowersAdapter.FollowersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
         View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_followers, parent, false);
-        return new FollowersViewHolder(v);
+        return new ProfileFollowersAdapter.FollowersViewHolder(v);
     }
 
     @Override
@@ -69,15 +56,11 @@ public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowe
 
         UserInfo currentItem = followersList.get(position);
 
-	    holder.userLoginId = currentItem.getLogin();
-
         if(!currentItem.getFullname().equals("")) {
-
-            holder.userFullName.setText(Html.fromHtml(currentItem.getFullname()));
+            holder.userFullName.setText(currentItem.getFullname());
             holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
         }
         else {
-
             holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
             holder.userName.setVisibility(View.GONE);
         }

app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java

@@ -1,20 +1,18 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.UserInfo;
 import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Author M M Arif
@@ -22,36 +20,26 @@ import java.util.List;
 
 public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowingAdapter.FollowingViewHolder> {
 
-    private final List<UserInfo> followingList;
-    private final Context mCtx;
+    private List<UserInfo> followingList;
+    private Context mCtx;
 
     static class FollowingViewHolder extends RecyclerView.ViewHolder {
 
-	    private String userLoginId;
-
-        private final ImageView userAvatar;
-        private final TextView userFullName;
-        private final TextView userName;
+        private ImageView userAvatar;
+        private TextView userFullName;
+        private TextView userName;
 
         private FollowingViewHolder(View itemView) {
-
             super(itemView);
 
             userAvatar = itemView.findViewById(R.id.userAvatar);
             userFullName = itemView.findViewById(R.id.userFullName);
             userName = itemView.findViewById(R.id.userName);
 
-	        userAvatar.setOnClickListener(loginId -> {
-
-		        Context context = loginId.getContext();
-
-		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-	        });
         }
     }
 
     public ProfileFollowingAdapter(Context mCtx, List<UserInfo> followingListMain) {
-
         this.mCtx = mCtx;
         this.followingList = followingListMain;
     }
@@ -59,9 +47,8 @@ public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowi
     @NonNull
     @Override
     public ProfileFollowingAdapter.FollowingViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
         View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_following, parent, false);
-        return new FollowingViewHolder(v);
+        return new ProfileFollowingAdapter.FollowingViewHolder(v);
     }
 
     @Override
@@ -69,15 +56,11 @@ public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowi
 
         UserInfo currentItem = followingList.get(position);
 
-	    holder.userLoginId = currentItem.getLogin();
-
         if(!currentItem.getFullname().equals("")) {
-
-            holder.userFullName.setText(Html.fromHtml(currentItem.getFullname()));
+            holder.userFullName.setText(currentItem.getFullname());
             holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
         }
         else {
-
             holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
             holder.userName.setVisibility(View.GONE);
         }

app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java

@@ -3,6 +3,7 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,19 +11,15 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.PullRequests;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.PullRequests;
 import java.util.List;
 import java.util.Locale;
 
@@ -32,7 +29,7 @@ import java.util.Locale;
 
 public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-	private final Context context;
+	private Context context;
 	private final int TYPE_LOAD = 0;
 	private List<PullRequests> prList;
 	private PullRequestsAdapter.OnLoadMoreListener loadMoreListener;
@@ -67,11 +64,15 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
 			isLoading = true;
 			loadMoreListener.onLoadMore();
+
 		}
 
 		if(getItemViewType(position) == TYPE_LOAD) {
+
 			((PullRequestsAdapter.PullRequestsHolder) holder).bindData(prList.get(position));
+
 		}
+
 	}
 
 	@Override
@@ -83,6 +84,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 		else {
 			return 1;
 		}
+
 	}
 
 	@Override
@@ -94,17 +96,25 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
 	class PullRequestsHolder extends RecyclerView.ViewHolder {
 
-		private PullRequests pullRequest;
-
-		private final ImageView assigneeAvatar;
-		private final TextView prTitle;
-		private final TextView prCreatedTime;
-		private final TextView prCommentsCount;
+		private TextView prNumber;
+		private TextView prMergeable;
+		private TextView prHeadBranch;
+		private TextView prIsFork;
+		private TextView prForkFullName;
+		private ImageView assigneeAvatar;
+		private TextView prTitle;
+		private TextView prCreatedTime;
+		private TextView prCommentsCount;
 
 		PullRequestsHolder(View itemView) {
 
 			super(itemView);
 
+			prNumber = itemView.findViewById(R.id.prNumber);
+			prMergeable = itemView.findViewById(R.id.prMergeable);
+			prHeadBranch = itemView.findViewById(R.id.prHeadBranch);
+			prIsFork = itemView.findViewById(R.id.prIsFork);
+			prForkFullName = itemView.findViewById(R.id.prForkFullName);
 			assigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
 			prTitle = itemView.findViewById(R.id.prTitle);
 			prCommentsCount = itemView.findViewById(R.id.prCommentsCount);
@@ -116,95 +126,90 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 				Context context = v.getContext();
 
 				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", pullRequest.getNumber());
-				intent.putExtra("prMergeable", pullRequest.isMergeable());
-				intent.putExtra("prHeadBranch", pullRequest.getHead().getRef());
+				intent.putExtra("issueNumber", prNumber.getText());
+				intent.putExtra("prMergeable", prMergeable.getText());
+				intent.putExtra("prHeadBranch", prHeadBranch.getText());
 
 				TinyDB tinyDb = TinyDB.getInstance(context);
-				tinyDb.putString("issueNumber", String.valueOf(pullRequest.getNumber()));
-				tinyDb.putString("prMergeable", String.valueOf(pullRequest.isMergeable()));
-				tinyDb.putString("prHeadBranch", pullRequest.getHead().getRef());
-
-				if(pullRequest.getHead() != null && pullRequest.getHead().getRepo() != null) {
-					tinyDb.putString("prIsFork", String.valueOf(pullRequest.getHead().getRepo().isFork()));
-					tinyDb.putString("prForkFullName", pullRequest.getHead().getRepo().getFull_name());
-				}
-				else {
-					// pull was done from a deleted fork
-					tinyDb.putString("prIsFork", "true");
-					tinyDb.putString("prForkFullName", context.getString(R.string.prDeletedFork));
-				}
-
+				tinyDb.putString("issueNumber", prNumber.getText().toString());
+				tinyDb.putString("prMergeable", prMergeable.getText().toString());
+				tinyDb.putString("prHeadBranch", prHeadBranch.getText().toString());
+				tinyDb.putString("prIsFork", prIsFork.getText().toString());
+				tinyDb.putString("prForkFullName", prForkFullName.getText().toString());
 				tinyDb.putString("issueType", "Pull");
 				context.startActivity(intent);
 
 			});
-
 			frameCommentsCount.setOnClickListener(v -> {
 
 				Context context = v.getContext();
 
 				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", pullRequest.getNumber());
-				intent.putExtra("prMergeable", pullRequest.isMergeable());
-				intent.putExtra("prHeadBranch", pullRequest.getHead().getRef());
+				intent.putExtra("issueNumber", prNumber.getText());
+				intent.putExtra("prMergeable", prMergeable.getText());
+				intent.putExtra("prHeadBranch", prHeadBranch.getText());
 
 				TinyDB tinyDb = TinyDB.getInstance(context);
-				tinyDb.putString("issueNumber", String.valueOf(pullRequest.getNumber()));
-				tinyDb.putString("prMergeable", String.valueOf(pullRequest.isMergeable()));
-				tinyDb.putString("prHeadBranch", pullRequest.getHead().getRef());
-
-				if(pullRequest.getHead() != null && pullRequest.getHead().getRepo() != null) {
-					tinyDb.putString("prIsFork", String.valueOf(pullRequest.getHead().getRepo().isFork()));
-					tinyDb.putString("prForkFullName", pullRequest.getHead().getRepo().getFull_name());
-				}
-				else {
-					// pull was done from a deleted fork
-					tinyDb.putString("prIsFork", "true");
-					tinyDb.putString("prForkFullName", context.getString(R.string.prDeletedFork));
-				}
-
+				tinyDb.putString("issueNumber", prNumber.getText().toString());
+				tinyDb.putString("prMergeable", prMergeable.getText().toString());
+				tinyDb.putString("prHeadBranch", prHeadBranch.getText().toString());
+				tinyDb.putString("prIsFork", prIsFork.getText().toString());
+				tinyDb.putString("prForkFullName", prForkFullName.getText().toString());
 				tinyDb.putString("issueType", "Pull");
 				context.startActivity(intent);
 
 			});
 
-			assigneeAvatar.setOnClickListener(v -> {
-				Context context = v.getContext();
-				String userLoginId = pullRequest.getUser().getLogin();
-
-				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-			});
-
 		}
 
 		@SuppressLint("SetTextI18n")
-		void bindData(PullRequests pullRequest) {
+		void bindData(PullRequests prModel) {
 
-			TinyDB tinyDb = TinyDB.getInstance(context);
-			String locale = tinyDb.getString("locale");
-			String timeFormat = tinyDb.getString("dateFormat");
+			final TinyDB tinyDb = TinyDB.getInstance(context);
+			final String locale = tinyDb.getString("locale");
+			final String timeFormat = tinyDb.getString("dateFormat");
 
-			PicassoService.getInstance(context).get()
-				.load(pullRequest.getUser().getAvatar_url())
-				.placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(8, 0))
-				.resize(120, 120)
-				.centerCrop()
-				.into(this.assigneeAvatar);
+			if(!prModel.getUser().getFull_name().equals("")) {
+				assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getFull_name(), context));
+			}
+			else {
+				assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getLogin(), context));
+			}
 
-			this.pullRequest = pullRequest;
+			if(prModel.getUser().getAvatar_url() != null) {
+				PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+			}
+			else {
+				PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+			}
 
-			String prNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + pullRequest.getNumber() + "</font>";
+			String prNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + prModel.getNumber() + "</font>";
+			prTitle.setText(Html.fromHtml(prNumber_ + " " + prModel.getTitle()));
 
-			this.prTitle.setText(HtmlCompat.fromHtml(prNumber_ + " " + EmojiParser.parseToUnicode(pullRequest.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
-			this.prCommentsCount.setText(String.valueOf(pullRequest.getComments()));
-			this.prCreatedTime.setText(TimeHelper.formatTime(pullRequest.getCreated_at(), new Locale(locale), timeFormat, context));
+			prNumber.setText(String.valueOf(prModel.getNumber()));
+			prMergeable.setText(String.valueOf(prModel.isMergeable()));
+			if(prModel.getHead() != null) {
+				prHeadBranch.setText(prModel.getHead().getRef());
+				if(prModel.getHead().getRepo() != null) {
+					prIsFork.setText(String.valueOf(prModel.getHead().getRepo().isFork()));
+					prForkFullName.setText(prModel.getHead().getRepo().getFull_name());
+				}
+				else {
+					// pull was done from a deleted fork
+					prIsFork.setText("true");
+					prForkFullName.setText(context.getString(R.string.prDeletedFrok));
+				}
+			}
+			prCommentsCount.setText(String.valueOf(prModel.getComments()));
+
+			prCreatedTime.setText(TimeHelper.formatTime(prModel.getCreated_at(), new Locale(locale), timeFormat, context));
 
 			if(timeFormat.equals("pretty")) {
-				this.prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(pullRequest.getCreated_at()), context));
+				prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(prModel.getCreated_at()), context));
 			}
+
 		}
+
 	}
 
 	static class LoadHolder extends RecyclerView.ViewHolder {

app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java

@@ -1,6 +1,7 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
+import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,10 +11,8 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Releases;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.ClickListener;
@@ -21,6 +20,7 @@ import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Releases;
 import java.util.List;
 import java.util.Locale;
 
@@ -153,11 +153,11 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 	    });
 
         holder.releaseZipDownload.setText(
-                HtmlCompat.fromHtml("<a href='" + currentItem.getZipball_url() + "'>" + mCtx.getResources().getString(R.string.zipArchiveDownloadReleasesTab) + "</a> ", HtmlCompat.FROM_HTML_MODE_LEGACY));
+                Html.fromHtml("<a href='" + currentItem.getZipball_url() + "'>" + mCtx.getResources().getString(R.string.zipArchiveDownloadReleasesTab) + "</a> "));
         holder.releaseZipDownload.setMovementMethod(LinkMovementMethod.getInstance());
 
         holder.releaseTarDownload.setText(
-                HtmlCompat.fromHtml("<a href='" + currentItem.getTarball_url() + "'>" + mCtx.getResources().getString(R.string.tarArchiveDownloadReleasesTab) + "</a> ", HtmlCompat.FROM_HTML_MODE_LEGACY));
+                Html.fromHtml("<a href='" + currentItem.getTarball_url() + "'>" + mCtx.getResources().getString(R.string.tarArchiveDownloadReleasesTab) + "</a> "));
         holder.releaseTarDownload.setMovementMethod(LinkMovementMethod.getInstance());
 
 	    ReleasesDownloadsAdapter adapter = new ReleasesDownloadsAdapter(currentItem.getAssets());

app/src/main/java/org/mian/gitnex/adapters/ReleasesDownloadsAdapter.java

@@ -1,15 +1,15 @@
 package org.mian.gitnex.adapters;
 
+import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Releases;
 import org.mian.gitnex.R;
+import org.mian.gitnex.models.Releases;
 import java.util.List;
 
 /**
@@ -53,7 +53,7 @@ public class ReleasesDownloadsAdapter extends RecyclerView.Adapter<ReleasesDownl
 		if(currentItem.getName() != null) {
 
 			holder.downloadName.setText(
-				HtmlCompat.fromHtml("<a href='" + currentItem.getBrowser_download_url() + "'>" + currentItem.getName() + "</a> ", HtmlCompat.FROM_HTML_MODE_LEGACY));
+				Html.fromHtml("<a href='" + currentItem.getBrowser_download_url() + "'>" + currentItem.getName() + "</a> "));
 			holder.downloadName.setMovementMethod(LinkMovementMethod.getInstance());
 
 		}

app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java

@@ -16,8 +16,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -31,6 +29,8 @@ import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;

app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java

@@ -9,11 +9,11 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.UserInfo;
 import java.util.List;
 
 /**

app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java

@@ -9,11 +9,11 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.UserInfo;
 import java.util.List;
 
 /**

app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java

@@ -20,8 +20,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -35,6 +33,8 @@ import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java

@@ -20,8 +20,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -35,6 +33,8 @@ import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -328,7 +328,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
         return orgReposFilter;
     }
 
-    private final Filter orgReposFilter = new Filter() {
+    private Filter orgReposFilter = new Filter() {
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
             List<UserRepositories> filteredList = new ArrayList<>();

app/src/main/java/org/mian/gitnex/adapters/SearchIssuesAdapter.java

@@ -2,26 +2,24 @@ package org.mian.gitnex.adapters;
 
 import android.content.Context;
 import android.content.Intent;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Issues;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Issues;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -34,9 +32,9 @@ import java.util.Locale;
 
 public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapter.SearchViewHolder> {
 
-	private final List<Issues> searchedList;
-	private final Context mCtx;
-	private final TinyDB tinyDb;
+	private List<Issues> searchedList;
+	private Context mCtx;
+	private TinyDB tinyDb;
 
 	public SearchIssuesAdapter(List<Issues> dataList, Context mCtx) {
 
@@ -47,35 +45,37 @@ public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapte
 
 	class SearchViewHolder extends RecyclerView.ViewHolder {
 
-		private Issues issue;
-
-		private final ImageView issueAssigneeAvatar;
-		private final TextView issueTitle;
-		private final TextView issueCreatedTime;
-		private final TextView issueCommentsCount;
+		private TextView issueNumber;
+		private ImageView issueAssigneeAvatar;
+		private TextView issueTitle;
+		private TextView issueCreatedTime;
+		private TextView issueCommentsCount;
+		private TextView repoFullName;
 
 		private SearchViewHolder(View itemView) {
 
 			super(itemView);
 
+			issueNumber = itemView.findViewById(R.id.issueNumber);
 			issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
 			issueTitle = itemView.findViewById(R.id.issueTitle);
 			issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
 			issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
+			repoFullName = itemView.findViewById(R.id.repoFullName);
 
 			issueTitle.setOnClickListener(v -> {
 
 				Context context = v.getContext();
 
 				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", issue.getNumber());
+				intent.putExtra("issueNumber", issueNumber.getText());
 
-				tinyDb.putString("issueNumber", String.valueOf(issue.getNumber()));
+				tinyDb.putString("issueNumber", issueNumber.getText().toString());
 				tinyDb.putString("issueType", "Issue");
 
-				tinyDb.putString("repoFullName", issue.getRepository().getFull_name());
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
 
-				String[] parts = issue.getRepository().getFull_name().split("/");
+				String[] parts = repoFullName.getText().toString().split("/");
 				final String repoOwner = parts[0];
 				final String repoName = parts[1];
 
@@ -99,14 +99,8 @@ public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapte
 
 				context.startActivity(intent);
 			});
-
-			issueAssigneeAvatar.setOnClickListener(v -> {
-				Context context = v.getContext();
-				String userLoginId = issue.getUser().getLogin();
-
-				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-			});
 		}
+
 	}
 
 	@NonNull
@@ -125,19 +119,22 @@ public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapte
 		String locale = tinyDb.getString("locale");
 		String timeFormat = tinyDb.getString("dateFormat");
 
-		PicassoService.getInstance(mCtx).get()
-			.load(currentItem.getUser().getAvatar_url())
-			.placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(8, 0))
-			.resize(120, 120)
-			.centerCrop()
-			.into(holder.issueAssigneeAvatar);
+		if(!currentItem.getUser().getFull_name().equals("")) {
+			holder.issueAssigneeAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCreator) + currentItem.getUser().getFull_name(), mCtx));
+		}
+		else {
+			holder.issueAssigneeAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCreator) + currentItem.getUser().getLogin(), mCtx));
+		}
 
-		String issueNumber_ = "<font color='" + ResourcesCompat.getColor(mCtx.getResources(), R.color.lightGray, null) + "'>" + currentItem.getRepository().getFull_name() + mCtx.getResources().getString(R.string.hash) + currentItem.getNumber() + "</font>";
+		PicassoService
+			.getInstance(mCtx).get().load(currentItem.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.issueAssigneeAvatar);
 
-		holder.issue = currentItem;
-		holder.issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + currentItem.getTitle(), HtmlCompat.FROM_HTML_MODE_LEGACY));
+		String issueNumber_ = "<font color='" + mCtx.getResources().getColor(R.color.lightGray) + "'>" + currentItem.getRepository().getFull_name() + mCtx.getResources().getString(R.string.hash) + currentItem.getNumber() + "</font>";
+		holder.issueTitle.setText(Html.fromHtml(issueNumber_ + " " + currentItem.getTitle()));
+
+		holder.issueNumber.setText(String.valueOf(currentItem.getNumber()));
 		holder.issueCommentsCount.setText(String.valueOf(currentItem.getComments()));
+		holder.repoFullName.setText(currentItem.getRepository().getFull_name());
 
 		switch(timeFormat) {
 			case "pretty": {

app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java

@@ -20,8 +20,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -35,6 +33,8 @@ import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java

@@ -3,19 +3,17 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Typeface;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.UserInfo;
 import java.util.List;
 
 /**
@@ -24,34 +22,24 @@ import java.util.List;
 
 public class TeamMembersByOrgAdapter extends BaseAdapter {
 
-    private final List<UserInfo> teamMembersList;
-    private final Context mCtx;
+    private List<UserInfo> teamMembersList;
+    private Context mCtx;
 
     private static class ViewHolder {
 
-	    private String userLoginId;
-
-        private final ImageView memberAvatar;
-        private final TextView memberName;
+        private ImageView memberAvatar;
+        private TextView memberName;
 
         ViewHolder(View v) {
-
             memberAvatar  = v.findViewById(R.id.memberAvatar);
             memberName  = v.findViewById(R.id.memberName);
-
-	        memberAvatar.setOnClickListener(loginId -> {
-
-		        Context context = loginId.getContext();
-
-		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-	        });
         }
     }
 
     public TeamMembersByOrgAdapter(Context mCtx, List<UserInfo> membersListMain) {
-
         this.mCtx = mCtx;
         this.teamMembersList = membersListMain;
+
     }
 
     @Override
@@ -76,18 +64,17 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
         TeamMembersByOrgAdapter.ViewHolder viewHolder = null;
 
         if (finalView == null) {
-
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_members_by_team_by_org, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
-
             viewHolder = (TeamMembersByOrgAdapter.ViewHolder) finalView.getTag();
         }
 
         initData(viewHolder, position);
         return finalView;
+
     }
 
     private void initData(TeamMembersByOrgAdapter.ViewHolder viewHolder, int position) {
@@ -95,8 +82,6 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
         UserInfo currentItem = teamMembersList.get(position);
         PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
 
-	    viewHolder.userLoginId = currentItem.getLogin();
-
         final TinyDB tinyDb = TinyDB.getInstance(mCtx);
         Typeface myTypeface;
 
@@ -117,14 +102,13 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
         }
 
         if(!currentItem.getFullname().equals("")) {
-
-            viewHolder.memberName.setText(Html.fromHtml(currentItem.getFullname()));
+            viewHolder.memberName.setText(currentItem.getFullname());
+            viewHolder.memberName.setTypeface(myTypeface);
         }
         else {
-
             viewHolder.memberName.setText(currentItem.getLogin());
+            viewHolder.memberName.setTypeface(myTypeface);
         }
 
-	    viewHolder.memberName.setTypeface(myTypeface);
     }
 }

app/src/main/java/org/mian/gitnex/adapters/TeamsByOrgAdapter.java

@@ -8,13 +8,13 @@ import android.view.ViewGroup;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Teams;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OrganizationTeamMembersActivity;
+import org.mian.gitnex.models.Teams;
 import java.util.ArrayList;
 import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Author M M Arif

app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java

@@ -10,7 +10,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.content.res.AppCompatResources;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
@@ -28,20 +27,19 @@ import io.mikael.urlbuilder.UrlBuilder;
 
 public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapter.UserAccountsViewHolder> {
 
-	private final List<UserAccount> userAccountsList;
-	private final Context mCtx;
+	private List<UserAccount> userAccountsList;
+	private Context mCtx;
 	private TinyDB tinyDB;
 
 	class UserAccountsViewHolder extends RecyclerView.ViewHolder {
 
-		private int accountId;
-		private String accountName;
-
-		private final TextView accountUrl;
-		private final TextView userId;
-		private final ImageView activeAccount;
-		private final ImageView deleteAccount;
-		private final ImageView repoAvatar;
+		private TextView accountUrl;
+		private TextView userId;
+		private ImageView activeAccount;
+		private ImageView deleteAccount;
+		private ImageView repoAvatar;
+		private TextView accountId;
+		private TextView accountName;
 
 		private UserAccountsViewHolder(View itemView) {
 
@@ -52,26 +50,30 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 			activeAccount = itemView.findViewById(R.id.activeAccount);
 			deleteAccount = itemView.findViewById(R.id.deleteAccount);
 			repoAvatar = itemView.findViewById(R.id.repoAvatar);
+			accountId = itemView.findViewById(R.id.accountId);
+			accountName = itemView.findViewById(R.id.accountName);
 
 			deleteAccount.setOnClickListener(itemDelete -> {
 
 				new AlertDialog.Builder(mCtx)
-					.setIcon(AppCompatResources.getDrawable(mCtx, R.drawable.ic_delete))
+					.setIcon(mCtx.getDrawable(R.drawable.ic_delete))
 					.setTitle(mCtx.getResources().getString(R.string.removeAccountPopupTitle))
 					.setMessage(mCtx.getResources().getString(R.string.removeAccountPopupMessage))
 					.setPositiveButton(mCtx.getResources().getString(R.string.removeButton), (dialog, which) -> {
 
 						updateLayoutByPosition(getAdapterPosition());
 						UserAccountsApi userAccountsApi = new UserAccountsApi(mCtx);
-						userAccountsApi.deleteAccount(Integer.parseInt(String.valueOf(accountId)));
+						userAccountsApi.deleteAccount(Integer.parseInt(accountId.getText().toString()));
 					}).setNeutralButton(mCtx.getResources().getString(R.string.cancelButton), null)
 					.show();
+
 			});
 
-			itemView.setOnClickListener(switchAccount -> {
+			itemView.setOnClickListener(itemEdit -> {
 
+				String accountNameSwitch = accountName.getText().toString();
 				UserAccountsApi userAccountsApi = new UserAccountsApi(mCtx);
-				UserAccount userAccount = userAccountsApi.getAccountData(accountName);
+				UserAccount userAccount = userAccountsApi.getAccountData(accountNameSwitch);
 
 				if(tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
 
@@ -107,6 +109,7 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 		notifyItemRemoved(position);
 		notifyItemRangeChanged(position, userAccountsList.size());
 		Toasty.success(mCtx, mCtx.getResources().getString(R.string.accountDeletedMessage));
+
 	}
 
 	@NonNull
@@ -128,22 +131,20 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 			.withPath("/")
 			.toString();
 
-		holder.accountId = currentItem.getAccountId();
-		holder.accountName = currentItem.getAccountName();
-
+		holder.accountId.setText(String.valueOf(currentItem.getAccountId()));
+		holder.accountName.setText(currentItem.getAccountName());
 		holder.userId.setText(String.format("@%s", currentItem.getUserName()));
 		holder.accountUrl.setText(url);
 
 		PicassoService.getInstance(mCtx).get().load(url + "img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.repoAvatar);
 
 		if(tinyDB.getInt("currentActiveAccountId") == currentItem.getAccountId()) {
-
 			holder.activeAccount.setVisibility(View.VISIBLE);
 		}
 		else {
-
 			holder.deleteAccount.setVisibility(View.VISIBLE);
 		}
+
 	}
 
 	@Override

app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java

@@ -2,7 +2,6 @@ package org.mian.gitnex.adapters;
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.text.Html;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,8 +12,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Collaborators;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.CollaboratorActions;
 import org.mian.gitnex.clients.PicassoService;
@@ -23,6 +20,8 @@ import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.UserInfo;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -133,17 +132,15 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
         holder.userNameMain.setText(currentItem.getUsername());
 
         if (!currentItem.getFullname().equals("")) {
-
-            holder.userFullName.setText(Html.fromHtml(currentItem.getFullname()));
+            holder.userFullName.setText(currentItem.getFullname());
+            holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
         }
         else {
-
             holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+            holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
         }
 
-	    holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
-
-	    if (!currentItem.getAvatar().equals("")) {
+        if (!currentItem.getAvatar().equals("")) {
             PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
         }
 

app/src/main/java/org/mian/gitnex/adapters/UserSearchForTeamMemberAdapter.java

@@ -1,7 +1,6 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,7 +8,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -18,6 +16,7 @@ import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserInfo;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -104,15 +103,11 @@ public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSea
 		holder.teamId_.setText(String.valueOf(teamId));
 
 		if (!currentItem.getFullname().equals("")) {
-
-
-			holder.userFullName.setText(Html.fromHtml(currentItem.getFullname()));
+			holder.userFullName.setText(currentItem.getFullname());
 		}
 		else {
-
 			holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
 		}
-
 		holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
 
 		if (!currentItem.getAvatar().equals("")) {

app/src/main/java/org/mian/gitnex/clients/PicassoService.java

@@ -19,8 +19,8 @@ import okhttp3.OkHttpClient;
 
 public class PicassoService {
 
-	private static volatile PicassoService picassoService;
-	private final File cachePath;
+	private static PicassoService picassoService;
+	private static File cachePath;
 	private Picasso picasso;
 
 	private PicassoService(Context context) {
@@ -40,12 +40,12 @@ public class PicassoService {
 					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()));
 
 			builder.downloader(new OkHttp3Downloader(okHttpClient.build()));
-//			builder.listener((picasso, uri, exception) -> {
-//
-//				Log.e("PicassoService", Objects.requireNonNull(uri.toString()));
-//				Log.e("PicassoService", exception.toString());
-//
-//			});
+			builder.listener((picasso, uri, exception) -> {
+
+				//Log.e("PicassoService", Objects.requireNonNull(uri.toString()));
+				//Log.e("PicassoService", exception.toString());
+
+			});
 
 			picasso = builder.memoryCache(new PicassoCache(cachePath, context)).build();
 
@@ -54,6 +54,7 @@ public class PicassoService {
 
 			Log.e("PicassoService", e.toString());
 		}
+
 	}
 
 	public Picasso get() {
@@ -66,15 +67,10 @@ public class PicassoService {
 	public static synchronized PicassoService getInstance(Context context) {
 
 		if(picassoService == null) {
-			synchronized(PicassoService.class) {
-				if(picassoService == null) {
-					picassoService = new PicassoService(context);
-				}
-			}
+			picassoService = new PicassoService(context);
 		}
 
 		return picassoService;
-
 	}
 
 }

app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java

@@ -2,22 +2,22 @@ package org.mian.gitnex.clients;
 
 import android.content.Context;
 import android.util.Log;
-import org.gitnex.tea4j.ApiInterface;
-import org.gitnex.tea4j.WebInterface;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.FilesData;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
+import org.mian.gitnex.interfaces.ApiInterface;
+import org.mian.gitnex.interfaces.WebInterface;
 import java.io.File;
 import java.security.SecureRandom;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509TrustManager;
 import okhttp3.Cache;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 import retrofit2.converter.scalars.ScalarsConverterFactory;
@@ -28,15 +28,18 @@ import retrofit2.converter.scalars.ScalarsConverterFactory;
 
 public class RetrofitClient {
 
-	private static final Map<String, ApiInterface> apiInterfaces = new ConcurrentHashMap<>();
-	private static final Map<String, WebInterface> webInterfaces = new ConcurrentHashMap<>();
+	private static final Map<String, ApiInterface> apiInterfaces = new HashMap<>();
+	private static final Map<String, WebInterface> webInterfaces = new HashMap<>();
 
-	private static Retrofit createRetrofit(Context context, String instanceUrl, boolean cacheEnabled) {
+	private static Retrofit createRetrofit(Context context, String instanceUrl) {
 
 		TinyDB tinyDB = TinyDB.getInstance(context);
 
-//		HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
-//		logging.setLevel(HttpLoggingInterceptor.Level.BODY);
+		int cacheSize = FilesData.returnOnlyNumber(tinyDB.getString("cacheSizeStr")) * 1024 * 1024;
+		Cache cache = new Cache(new File(context.getCacheDir(), "responses"), cacheSize);
+
+		HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
+		logging.setLevel(HttpLoggingInterceptor.Level.BODY);
 
 		try {
 
@@ -45,28 +48,20 @@ public class RetrofitClient {
 			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(context);
 			sslContext.init(null, new X509TrustManager[]{ memorizingTrustManager }, new SecureRandom());
 
-			OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder()
-//				.addInterceptor(logging)
+			OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder().cache(cache)
+				//.addInterceptor(logging)
 				.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
-				.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()));
+				.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
+				.addInterceptor(chain -> {
 
-			if(cacheEnabled) {
-
-				int cacheSize = FilesData.returnOnlyNumber(tinyDB.getString("cacheSizeStr")) * 1024 * 1024;
-				Cache cache = new Cache(new File(context.getCacheDir(), "responses"), cacheSize);
-
-				okHttpClient.cache(cache).addInterceptor(chain -> {
-
-					Request request = chain.request();
-
-					request = AppUtil.hasNetworkConnection(context) ?
-						request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build() :
-						request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
+					Request request = chain.request()
+						.newBuilder()
+						.header("Cache-Control", "public, max-age=" + 60)
+						.build();
 
 					return chain.proceed(request);
 
 				});
-			}
 
 			return new Retrofit.Builder()
 				.baseUrl(instanceUrl)
@@ -75,21 +70,20 @@ public class RetrofitClient {
 				.addConverterFactory(GsonConverterFactory.create())
 				.build();
 
-		}
-		catch(Exception e) {
+		} catch(Exception e) {
 
-			Log.e("onFailureRetrofit", e.toString());
+			Log.e("onFailure", e.toString());
 		}
 
 		return null;
 	}
 
-	public static ApiInterface getApiInterface(Context context) {
+	public static synchronized ApiInterface getApiInterface(Context context) {
 
 		return getApiInterface(context, TinyDB.getInstance(context).getString("instanceUrl"));
 	}
 
-	public static WebInterface getWebInterface(Context context) {
+	public static synchronized WebInterface getWebInterface(Context context) {
 
 		String instanceUrl = TinyDB.getInstance(context).getString("instanceUrl");
 		instanceUrl = instanceUrl.substring(0, instanceUrl.lastIndexOf("api/v1/"));
@@ -98,39 +92,31 @@ public class RetrofitClient {
 
 	}
 
-	public static ApiInterface getApiInterface(Context context, String url) {
-
+	public static synchronized ApiInterface getApiInterface(Context context, String url) {
 		if(!apiInterfaces.containsKey(url)) {
-			synchronized(RetrofitClient.class) {
-				if(!apiInterfaces.containsKey(url)) {
 
-					ApiInterface apiInterface = createRetrofit(context, url, true).create(ApiInterface.class);
-					apiInterfaces.put(url, apiInterface);
+			ApiInterface apiInterface = createRetrofit(context, url)
+				.create(ApiInterface.class);
+
+			apiInterfaces.put(url, apiInterface);
+			return apiInterface;
 
-					return apiInterface;
-				}
-			}
 		}
 
 		return apiInterfaces.get(url);
-
 	}
 
-	public static WebInterface getWebInterface(Context context, String url) {
-
+	public static synchronized WebInterface getWebInterface(Context context, String url) {
 		if(!webInterfaces.containsKey(url)) {
-			synchronized(RetrofitClient.class) {
-				if(!webInterfaces.containsKey(url)) {
 
-					WebInterface webInterface = createRetrofit(context, url, false).create(WebInterface.class);
-					webInterfaces.put(url, webInterface);
+			WebInterface webInterface = createRetrofit(context, url)
+				.create(WebInterface.class);
+
+			webInterfaces.put(url, webInterface);
+			return webInterface;
 
-					return webInterface;
-				}
-			}
 		}
 
 		return webInterfaces.get(url);
-
 	}
 }

app/src/main/java/org/mian/gitnex/core/MainApplication.java

@@ -1,137 +0,0 @@
-package org.mian.gitnex.core;
-
-import android.annotation.SuppressLint;
-import android.app.Application;
-import android.content.Context;
-import org.acra.ACRA;
-import org.acra.BuildConfig;
-import org.acra.ReportField;
-import org.acra.annotation.AcraCore;
-import org.acra.annotation.AcraNotification;
-import org.acra.config.CoreConfigurationBuilder;
-import org.acra.config.LimiterConfigurationBuilder;
-import org.acra.config.MailSenderConfigurationBuilder;
-import org.acra.data.StringFormat;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.Constants;
-import org.mian.gitnex.helpers.FontsOverride;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.notifications.Notifications;
-
-/**
- * @author opyale
- */
-
-@SuppressLint("NonConstantResourceId")
-@AcraNotification(resIcon = R.drawable.gitnex_transparent,
-	resTitle = R.string.crashTitle,
-	resChannelName = R.string.setCrashReports,
-	resText = R.string.crashMessage)
-@AcraCore(reportContent = {
-	ReportField.ANDROID_VERSION, ReportField.PHONE_MODEL,
-	ReportField.STACK_TRACE, ReportField.AVAILABLE_MEM_SIZE, ReportField.BRAND })
-
-public class MainApplication extends Application {
-
-	private Context appCtx;
-	private TinyDB tinyDB;
-
-	@Override
-	public void onCreate() {
-
-		super.onCreate();
-
-		appCtx = getApplicationContext();
-		tinyDB = TinyDB.getInstance(appCtx);
-
-		setDefaults();
-
-		switch(tinyDB.getInt("customFontId", -1)) {
-
-			case 0:
-				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
-				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf");
-				FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf");
-				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf");
-				break;
-
-			case 2:
-				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf");
-				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf");
-				FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf");
-				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf");
-				break;
-
-			default:
-				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf");
-				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf");
-				FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf");
-				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf");
-
-		}
-
-		if(tinyDB.getBoolean("crashReportingEnabled")) {
-
-			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);
-
-			ACRABuilder.setBuildConfigClass(BuildConfig.class).setReportFormat(StringFormat.KEY_VALUE_LIST);
-			ACRABuilder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).setReportAsFile(true).setMailTo(getResources().getString(R.string.appEmail)).setSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil.getAppBuildNo(getApplicationContext()))).setEnabled(true);
-			ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class).setEnabled(true);
-
-			ACRA.init(this, ACRABuilder);
-
-		}
-
-		Notifications.createChannels(appCtx);
-		Notifications.startWorker(appCtx);
-
-	}
-
-	private void setDefaults() {
-
-		// enabling counter badges by default
-		if(tinyDB.getString("enableCounterBadgesInit").isEmpty()) {
-
-			tinyDB.putBoolean("enableCounterBadges", true);
-			tinyDB.putString("enableCounterBadgesInit", "yes");
-		}
-
-		// enable crash reports by default
-		if(tinyDB.getString("crashReportingEnabledInit").isEmpty()) {
-
-			tinyDB.putBoolean("crashReportingEnabled", true);
-			tinyDB.putString("crashReportingEnabledInit", "yes");
-		}
-
-		// default cache setter
-		if(tinyDB.getString("cacheSizeStr").isEmpty()) {
-
-			tinyDB.putString("cacheSizeStr", getResources().getString(R.string.cacheSizeDataSelectionSelectedText));
-		}
-		if(tinyDB.getString("cacheSizeImagesStr").isEmpty()) {
-
-			tinyDB.putString("cacheSizeImagesStr", getResources().getString(R.string.cacheSizeImagesSelectionSelectedText));
-		}
-
-		// enable comment drafts by default
-		if(tinyDB.getString("draftsCommentsDeletionEnabledInit").isEmpty()) {
-
-			tinyDB.putBoolean("draftsCommentsDeletionEnabled", true);
-			tinyDB.putString("draftsCommentsDeletionEnabledInit", "yes");
-		}
-
-		// setting default polling delay
-		if(tinyDB.getInt("pollingDelayMinutes", 0) <= 0) {
-
-			tinyDB.putInt("pollingDelayMinutes", Constants.defaultPollingDelay);
-		}
-
-		// disable biometric by default
-		if(tinyDB.getString("biometricStatusInit").isEmpty()) {
-
-			tinyDB.putBoolean("biometricStatus", false);
-			tinyDB.putString("biometricStatusInit", "yes");
-		}
-	}
-}