Merge branch 'master' into 7-assign-team-to-repo

.gitignore

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

app/build.gradle

@@ -54,14 +54,14 @@ configurations {
 }
 
 dependencies {
-    def lifecycle_version = '2.3.0-rc01'
+    def lifecycle_version = '2.3.0'
     def markwon_version = '4.6.1'
-    def work_version = "2.4.0"
+    def work_version = "2.5.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-alpha03' // Upgrading to rc01 results in failing builds
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
@@ -110,6 +110,8 @@ dependencies {
     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.1"
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.1"
+    implementation 'androidx.biometric:biometric:1.1.0'
 
 }

app/src/main/AndroidManifest.xml

@@ -9,9 +9,10 @@
     <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/app_name"
+        android:label="@string/appName"
         android:networkSecurityConfig="@xml/network_security_config"
         android:resizeableActivity="true"
         android:roundIcon="@mipmap/app_logo_round"
@@ -64,7 +65,7 @@
         <activity
             android:name=".activities.OrganizationDetailActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
-            android:label="@string/title_activity_org_detail"
+            android:label="@string/titleActivityOrgDetail"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.CreateLabelActivity"
@@ -82,7 +83,7 @@
         <activity
             android:name=".activities.RepoDetailActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
-            android:label="@string/title_activity_repo_detail"
+            android:label="@string/titleActivityRepoDetail"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.MainActivity"

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

@@ -5,6 +5,8 @@ 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;
@@ -12,8 +14,6 @@ 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,6 +3,8 @@ 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;
@@ -10,8 +12,6 @@ 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,10 +1,10 @@
 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;

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.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;

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

@@ -8,6 +8,8 @@ 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;
@@ -17,8 +19,6 @@ 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;

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.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;

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

@@ -1,39 +1,17 @@
 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;
@@ -44,6 +22,8 @@ public abstract class BaseActivity extends AppCompatActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
+		super.onCreate(savedInstanceState);
+
 		this.appCtx = getApplicationContext();
 		this.tinyDB = TinyDB.getInstance(appCtx);
 
@@ -96,84 +76,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
 		}
 
-		String appLocale = tinyDB.getString("locale");
+		AppUtil.setAppLocale(getResources(), tinyDB.getString("locale"));
-		AppUtil.setAppLocale(getResources(), appLocale);
-
-		super.onCreate(savedInstanceState);
-
-		// 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);
-		}
 	}
 
 }

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

@@ -18,6 +18,7 @@ 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;
@@ -26,7 +27,6 @@ import org.mian.gitnex.helpers.Authorization;
 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;

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

@@ -15,6 +15,10 @@ 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;
@@ -23,10 +27,6 @@ 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;
@@ -150,7 +150,7 @@ public class CreateFileActivity extends BaseActivity {
 
         disableProcessButton();
 
-	    NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.get(ctx);
+	    NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
 	    networkStatusObserver.registerNetworkStatusListener(hasNetworkConnection -> newFileCreate.setEnabled(hasNetworkConnection));
 
 	    newFileCreate.setOnClickListener(createFileListener);
@@ -162,7 +162,6 @@ public class CreateFileActivity extends BaseActivity {
     private void processNewFile() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-        AppUtil appUtil = new AppUtil();
 
         String newFileName_ = newFileName.getText().toString();
         String newFileContent_ = newFileContent.getText().toString();
@@ -181,7 +180,7 @@ public class CreateFileActivity extends BaseActivity {
             return;
         }
 
-	    if(!appUtil.checkStringsWithDash(newFileBranchName_)) {
+	    if(!AppUtil.checkStringsWithDash(newFileBranchName_)) {
 
 		    Toasty.error(ctx, getString(R.string.newFileInvalidBranchName));
 		    return;
@@ -198,7 +197,7 @@ public class CreateFileActivity extends BaseActivity {
             switch(fileAction) {
 
 	            case FILE_ACTION_CREATE:
-		            createNewFile(Authorization.get(ctx), repoOwner, repoName, newFileName_, appUtil.encodeBase64(newFileContent_), newFileCommitMessage_, newFileBranchName_);
+		            createNewFile(Authorization.get(ctx), repoOwner, repoName, newFileName_, AppUtil.encodeBase64(newFileContent_), newFileCommitMessage_, newFileBranchName_);
 		            break;
 
 	            case FILE_ACTION_DELETE:
@@ -207,7 +206,7 @@ public class CreateFileActivity extends BaseActivity {
 
 	            case FILE_ACTION_EDIT:
 		            editFile(Authorization.get(ctx), repoOwner, repoName, filePath,
-			            appUtil.encodeBase64(newFileContent_), newFileCommitMessage_, newFileBranchName_, fileSha);
+			            AppUtil.encodeBase64(newFileContent_), newFileCommitMessage_, newFileBranchName_, fileSha);
 	            	break;
 
             }

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

@@ -14,6 +14,10 @@ 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 +34,6 @@ 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;

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

@@ -13,6 +13,8 @@ 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;
@@ -21,8 +23,6 @@ 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;
@@ -122,7 +122,7 @@ public class CreateLabelActivity extends BaseActivity {
     private void processUpdateLabel() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-        AppUtil appUtil = new AppUtil();
+
         String repoFullName = tinyDB.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -152,7 +152,7 @@ public class CreateLabelActivity extends BaseActivity {
             return;
         }
 
-        if(!appUtil.checkStrings(updateLabelName)) {
+        if(!AppUtil.checkStrings(updateLabelName)) {
 
             Toasty.error(ctx, getString(R.string.labelNameError));
             return;
@@ -167,7 +167,6 @@ public class CreateLabelActivity extends BaseActivity {
     private void processCreateLabel() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-        AppUtil appUtil = new AppUtil();
 
         String repoFullName = tinyDB.getString("repoFullName");
         String[] parts = repoFullName.split("/");
@@ -198,7 +197,7 @@ public class CreateLabelActivity extends BaseActivity {
             return;
         }
 
-        if(!appUtil.checkStrings(newLabelName)) {
+        if(!AppUtil.checkStrings(newLabelName)) {
 
             Toasty.error(ctx, getString(R.string.labelNameError));
             return;

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

@@ -12,6 +12,7 @@ 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;
@@ -21,7 +22,6 @@ 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;
@@ -92,7 +92,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("/");

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

@@ -10,15 +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;
 
@@ -74,8 +73,6 @@ 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();
@@ -94,13 +91,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,6 +11,7 @@ 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;
@@ -19,7 +20,6 @@ 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;
 
@@ -94,8 +94,6 @@ 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();
@@ -119,7 +117,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,6 +12,10 @@ 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;
@@ -23,10 +27,6 @@ import org.mian.gitnex.helpers.Authorization;
 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;

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

@@ -14,6 +14,8 @@ 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;
@@ -21,8 +23,6 @@ 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;

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

@@ -14,6 +14,8 @@ 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;
@@ -22,8 +24,6 @@ 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;
@@ -104,7 +104,6 @@ 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();
@@ -129,7 +128,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

@@ -12,6 +12,7 @@ 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;
@@ -20,7 +21,6 @@ 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;
@@ -224,7 +224,6 @@ 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");
@@ -248,7 +247,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;
@@ -256,7 +255,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,6 +9,8 @@ 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;
@@ -17,8 +19,6 @@ 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;
@@ -78,6 +78,13 @@ 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;
 			}
 		}
@@ -326,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.prDeletedFrok));
+							tinyDB.putString("prForkFullName", ctx.getString(R.string.prDeletedFork));
 						}
 					}
 

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

@@ -18,6 +18,9 @@ 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;
@@ -27,9 +30,6 @@ import org.mian.gitnex.helpers.Authorization;
 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;

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

@@ -9,6 +9,7 @@ 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;
@@ -18,7 +19,6 @@ 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;

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

@@ -2,10 +2,7 @@ package org.mian.gitnex.activities;
 
 import android.app.Activity;
 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;
@@ -20,8 +17,6 @@ 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.annotation.NonNull;
@@ -31,17 +26,18 @@ import com.github.barteksc.pdfviewer.util.FitPolicy;
 import com.github.chrisbanes.photoview.PhotoView;
 import com.vdurmont.emoji.EmojiParser;
 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.Images;
 import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.Toasty;
 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;
@@ -70,13 +66,11 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	private Boolean pdfNightMode;
 	private String singleFileName;
 	private String fileSha;
-	private AppUtil appUtil;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
-		appUtil = new AppUtil();
 
 		ActivityFileViewBinding activityFileViewBinding = ActivityFileViewBinding.inflate(getLayoutInflater());
 		setContentView(activityFileViewBinding.getRoot());
@@ -174,86 +168,94 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 						tinyDB.putString("downloadFileName", filename);
 						tinyDB.putString("downloadFileContents", response.body().getContent());
 
-						if(appUtil.imageExtension(fileExtension)) { // file is image
+						boolean unknown = false;
 
-							singleFileContentsFrame.setVisibility(View.GONE);
+						switch(AppUtil.getFileType(fileExtension)) {
-							singleCodeContents.setVisibility(View.GONE);
-							pdfViewFrame.setVisibility(View.GONE);
-							imageView.setVisibility(View.VISIBLE);
 
-							imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
+							case IMAGE:
-							Drawable imageDrawable = new BitmapDrawable(getResources(), BitmapFactory.decodeByteArray(imageData, 0, imageData.length));
+
-							imageView.setImageDrawable(imageDrawable);
+								singleFileContentsFrame.setVisibility(View.GONE);
+								singleCodeContents.setVisibility(View.GONE);
+								pdfViewFrame.setVisibility(View.GONE);
+								imageView.setVisibility(View.VISIBLE);
+
+								imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
+								imageView.setImageBitmap(Images.scaleImage(imageData, 1920));
+								break;
+							case TEXT:
+
+								imageView.setVisibility(View.GONE);
+								singleFileContentsFrame.setVisibility(View.GONE);
+								pdfViewFrame.setVisibility(View.GONE);
+								singleCodeContents.setVisibility(View.VISIBLE);
+
+								switch(tinyDB.getInt("fileviewerSourceCodeThemeId")) {
+
+									case 1: singleCodeContents.setTheme(Theme.ARDUINO_LIGHT); break;
+									case 2: singleCodeContents.setTheme(Theme.GITHUB); break;
+									case 3: singleCodeContents.setTheme(Theme.FAR); break;
+									case 4: singleCodeContents.setTheme(Theme.IR_BLACK); break;
+									case 5: singleCodeContents.setTheme(Theme.ANDROID_STUDIO); break;
+
+									default: singleCodeContents.setTheme(Theme.MONOKAI_SUBLIME);
+
+								}
+
+								singleCodeContents.setSource(AppUtil.decodeBase64(response.body().getContent()));
+								break;
+							case DOCUMENT:
+
+								if(fileExtension.equalsIgnoreCase("pdf")) {
+
+									imageView.setVisibility(View.GONE);
+									singleFileContentsFrame.setVisibility(View.GONE);
+									singleCodeContents.setVisibility(View.GONE);
+									pdfViewFrame.setVisibility(View.VISIBLE);
+
+									pdfNightMode = tinyDB.getBoolean("enablePdfMode");
+									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 {
+
+									unknown = true;
+								}
+								break;
+							case UNKNOWN:
+
+							default:
+								unknown = true;
+								break;
 						}
-						else if(appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode
 
-							imageView.setVisibility(View.GONE);
+						if(unknown) { // While the file could still be non-binary,
-							singleFileContentsFrame.setVisibility(View.GONE);
+							// it's better we don't show it (to prevent any crashes and/or unwanted behavior) and let the user download it instead.
-							pdfViewFrame.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.VISIBLE);
-
-							switch(tinyDB.getInt("fileviewerSourceCodeThemeId")) {
-
-								case 1:
-
-									singleCodeContents.setTheme(Theme.ARDUINO_LIGHT);
-									break;
-								case 2:
-
-									singleCodeContents.setTheme(Theme.GITHUB);
-									break;
-								case 3:
-
-									singleCodeContents.setTheme(Theme.FAR);
-									break;
-								case 4:
-
-									singleCodeContents.setTheme(Theme.IR_BLACK);
-									break;
-								case 5:
-
-									singleCodeContents.setTheme(Theme.ANDROID_STUDIO);
-									break;
-								default:
-
-									singleCodeContents.setTheme(Theme.MONOKAI_SUBLIME);
-							}
-
-							singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
-						}
-						else if(appUtil.pdfExtension(fileExtension)) { // file is pdf
-
-							imageView.setVisibility(View.GONE);
-							singleFileContentsFrame.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.GONE);
-							pdfViewFrame.setVisibility(View.VISIBLE);
-
-							pdfNightMode = tinyDB.getBoolean("enablePdfMode");
-
-							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
 
 							imageView.setVisibility(View.GONE);
 							singleCodeContents.setVisibility(View.GONE);
 							pdfViewFrame.setVisibility(View.GONE);
 							singleFileContentsFrame.setVisibility(View.VISIBLE);
 
-							singleFileContents.setText(getResources().getString(R.string.excludeFilesInFileviewer));
+							singleFileContents.setText(getString(R.string.excludeFilesInFileViewer));
 							singleFileContents.setGravity(Gravity.CENTER);
 							singleFileContents.setTypeface(null, Typeface.BOLD);
 						}
-						else { // file type not known - plain text view
-
-							imageView.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.GONE);
-							pdfViewFrame.setVisibility(View.GONE);
-							singleFileContentsFrame.setVisibility(View.VISIBLE);
-
-							singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
-						}
 					}
 					else {
 
@@ -323,7 +325,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		}
 		else if(id == R.id.markdown) {
 
-			new Markdown(ctx, EmojiParser.parseToUnicode(appUtil.decodeBase64(tinyDB.getString("downloadFileContents"))), singleFileContents);
+			new Markdown(ctx, EmojiParser.parseToUnicode(AppUtil.decodeBase64(tinyDB.getString("downloadFileContents"))), singleFileContents);
 
 			if(!tinyDB.getBoolean("enableMarkdownInFileView")) {
 
@@ -337,7 +339,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 				singleCodeContents.setVisibility(View.VISIBLE);
 				singleFileContentsFrame.setVisibility(View.GONE);
 				singleFileContents.setVisibility(View.GONE);
-				singleCodeContents.setSource(appUtil.decodeBase64(tinyDB.getString("downloadFileContents")));
+				singleCodeContents.setSource(AppUtil.decodeBase64(tinyDB.getString("downloadFileContents")));
 				tinyDB.putBoolean("enableMarkdownInFileView", false);
 			}
 			return true;
@@ -359,20 +361,15 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		if("deleteFile".equals(text)) {
 
 			String fileExtension = FileUtils.getExtension(singleFileName);
-			String data = appUtil.decodeBase64(tinyDB.getString("downloadFileContents"));
+
+			String data = AppUtil.getFileType(fileExtension) == AppUtil.FileType.TEXT ?
+				AppUtil.decodeBase64(tinyDB.getString("downloadFileContents")) : "";
+
 			Intent intent = new Intent(ctx, CreateFileActivity.class);
 			intent.putExtra("fileAction", CreateFileActivity.FILE_ACTION_DELETE);
 			intent.putExtra("filePath", singleFileName);
 			intent.putExtra("fileSha", fileSha);
-
+			intent.putExtra("fileContents", data);
-			if(!appUtil.imageExtension(fileExtension)) {
-
-				intent.putExtra("fileContents", data);
-			}
-			else {
-
-				intent.putExtra("fileContents", "");
-			}
 
 			ctx.startActivity(intent);
 		}
@@ -380,24 +377,25 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		if("editFile".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_EDIT);
-			intent.putExtra("filePath", singleFileName);
-			intent.putExtra("fileSha", fileSha);
 
-			if(!appUtil.imageExtension(fileExtension)) {
+			switch(AppUtil.getFileType(fileExtension)) {
 
-				intent.putExtra("fileContents", data);
+				case TEXT:
+
+					Intent intent = new Intent(ctx, CreateFileActivity.class);
+
+					intent.putExtra("fileAction", CreateFileActivity.FILE_ACTION_EDIT);
+					intent.putExtra("filePath", singleFileName);
+					intent.putExtra("fileSha", fileSha);
+					intent.putExtra("fileContents", AppUtil.decodeBase64(tinyDB.getString("downloadFileContents")));
+
+					ctx.startActivity(intent);
+					break;
+				default:
+
+					Toasty.error(ctx, getString(R.string.fileTypeCannotBeEdited));
 			}
-			else {
-
-				intent.putExtra("fileContents", "");
-			}
-
-			ctx.startActivity(intent);
 		}
-
 	}
 
 	private void requestFileDownload() {
@@ -420,11 +418,8 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		}
 	}
 
-	ActivityResultLauncher<Intent> fileDownloadActivityResultLauncher = registerForActivityResult(
+	ActivityResultLauncher<Intent> fileDownloadActivityResultLauncher =
-		new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
+		registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-
-		@Override
-		public void onActivityResult(ActivityResult result) {
 
 			if (result.getResultCode() == Activity.RESULT_OK) {
 
@@ -445,15 +440,14 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 					outputStream.close();
 
 					Toasty.success(ctx, getString(R.string.downloadFileSaved));
-
 				}
 				catch(IOException e) {
 
 					Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
 				}
 			}
-		}
+
-	});
+		});
 
 	private void initCloseListener() {
 

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

@@ -29,6 +29,11 @@ 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;
@@ -54,11 +59,6 @@ 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;

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

@@ -12,6 +12,9 @@ import android.widget.EditText;
 import android.widget.RadioGroup;
 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;
@@ -24,9 +27,6 @@ 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;
@@ -61,7 +61,7 @@ public class LoginActivity extends BaseActivity {
 		ActivityLoginBinding activityLoginBinding = ActivityLoginBinding.inflate(getLayoutInflater());
 		setContentView(activityLoginBinding.getRoot());
 
-		NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.get(ctx);
+		NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
 
 		loginButton = activityLoginBinding.loginButton;
 		instanceUrlET = activityLoginBinding.instanceUrl;

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Bundle;
+import android.text.Html;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -17,6 +18,8 @@ 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;
@@ -24,6 +27,9 @@ 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;
@@ -52,11 +58,9 @@ 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 eightbitlab.com.blurview.BlurView;
 import eightbitlab.com.blurview.RenderScriptBlur;
 import retrofit2.Call;
@@ -157,6 +161,43 @@ 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);
 
@@ -214,7 +255,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		Menu menu = navigationView.getMenu();
 		navNotifications = menu.findItem(R.id.nav_notifications);
 
-		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigationDrawerOpen, R.string.navigationDrawerClose);
 
 		drawer.addDrawerListener(toggle);
 		drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
@@ -268,7 +309,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 				if(!userFullNameNav.equals("")) {
 
-					userFullName.setText(userFullNameNav);
+					userFullName.setText(Html.fromHtml(userFullNameNav));
 				}
 
 				if(!userAvatarNav.equals("")) {

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

@@ -9,6 +9,8 @@ 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;
@@ -17,8 +19,6 @@ 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;

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

@@ -212,7 +212,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
         @Override
         public int getCount() {
-            return 4;
+            return 5;
         }
     }
 }

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

@@ -11,6 +11,7 @@ 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;
@@ -19,7 +20,6 @@ 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;

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

@@ -27,6 +27,9 @@ 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;
@@ -44,9 +47,6 @@ 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;

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

@@ -21,6 +21,7 @@ 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;
@@ -29,7 +30,6 @@ import org.mian.gitnex.helpers.Authorization;
 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;

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

@@ -28,11 +28,11 @@ public class RepoStargazersActivity extends BaseActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
+	    super.onCreate(savedInstanceState);
+
 	    ActivityRepoStargazersBinding activityRepoStargazersBinding = ActivityRepoStargazersBinding.inflate(getLayoutInflater());
 	    setContentView(activityRepoStargazersBinding.getRoot());
 
-        super.onCreate(savedInstanceState);
-
         ImageView closeActivity = activityRepoStargazersBinding.close;
         TextView toolbarTitle = activityRepoStargazersBinding.toolbarTitle;
         noDataStargazers = activityRepoStargazersBinding.noDataStargazers;

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

@@ -10,6 +10,8 @@ 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;
@@ -19,8 +21,6 @@ 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;
 
@@ -113,6 +113,7 @@ public class RepositorySettingsActivity extends BaseActivity {
 			}
 		});
 
+		dialogTransferRepository.setCancelable(false);
 		dialogTransferRepository.show();
 	}
 
@@ -195,6 +196,7 @@ public class RepositorySettingsActivity extends BaseActivity {
 			}
 		});
 
+		dialogDeleteRepository.setCancelable(false);
 		dialogDeleteRepository.show();
 	}
 
@@ -334,6 +336,7 @@ 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/SettingsFileViewerActivity.java

@@ -54,7 +54,7 @@ public class SettingsFileViewerActivity extends BaseActivity {
 
 			AlertDialog.Builder fvtsBuilder = new AlertDialog.Builder(SettingsFileViewerActivity.this);
 
-			fvtsBuilder.setTitle(R.string.fileviewerSourceCodeThemeSelectorDialogTitle);
+			fvtsBuilder.setTitle(R.string.fileViewerSourceCodeThemeSelectorDialogTitle);
 			fvtsBuilder.setCancelable(fileViewerSourceCodeThemesSelectedChoice != -1);
 
 			fvtsBuilder.setSingleChoiceItems(fileViewerSourceCodeThemesList, fileViewerSourceCodeThemesSelectedChoice, (dialogInterfaceTheme, i) -> {

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

@@ -113,7 +113,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.navOrgs), 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.navOrg), getResources().getString(R.string.pageTitleNotifications), getResources().getString(R.string.navExplore)};
 		defaultScreen = new ArrayList<>(Arrays.asList(defaultScreen_));
 
 		String[] linksArray = new String[defaultScreen.size()];
@@ -131,7 +131,7 @@ public class SettingsGeneralActivity extends BaseActivity {
 		}
 		else if(defaultLinkHandlerScreenSelectedChoice == 2) {
 
-			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.navOrgs));
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.navOrg));
 		}
 		else if(defaultLinkHandlerScreenSelectedChoice == 3) {
 

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

@@ -10,7 +10,7 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.databinding.ActivitySettingsNotificationsBinding;
 import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.notifications.NotificationsMaster;
+import org.mian.gitnex.notifications.Notifications;
 
 /**
  * Template Author M M Arif
@@ -43,7 +43,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
 		viewBinding.enableNotificationsMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
 			tinyDB.putBoolean("notificationsEnabled", isChecked);
-			if(!isChecked) NotificationsMaster.fireWorker(ctx);
+			if(!isChecked) Notifications.stopWorker(ctx);
 			Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
 
 		});
@@ -66,8 +66,8 @@ public class SettingsNotificationsActivity extends BaseActivity {
 
 				tinyDB.putInt("pollingDelayMinutes", numberPicker.getValue());
 
-				NotificationsMaster.fireWorker(ctx);
+				Notifications.stopWorker(ctx);
-				NotificationsMaster.hireWorker(ctx);
+				Notifications.startWorker(ctx);
 
 				viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), numberPicker.getValue()));
 				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));

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

@@ -1,7 +1,9 @@
 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;
@@ -9,6 +11,8 @@ 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;
@@ -16,6 +20,8 @@ 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
@@ -53,6 +59,8 @@ public class SettingsSecurityActivity extends BaseActivity {
 		LinearLayout cacheSizeImagesFrame = activitySettingsSecurityBinding.cacheSizeImagesSelectionFrame;
 		LinearLayout clearCacheFrame = activitySettingsSecurityBinding.clearCacheSelectionFrame;
 
+		SwitchMaterial switchBiometric = activitySettingsSecurityBinding.switchBiometric;
+
 		if(!tinyDB.getString("cacheSizeStr").isEmpty()) {
 
 			cacheSizeDataSelected.setText(tinyDB.getString("cacheSizeStr"));
@@ -73,6 +81,70 @@ 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/adapters/AdminCronTasksAdapter.java

@@ -12,13 +12,13 @@ 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 org.mian.gitnex.models.CronTasks;
 import java.util.List;
 import java.util.Locale;
 import retrofit2.Call;

app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.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;
@@ -12,10 +13,11 @@ 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;
 
@@ -25,19 +27,22 @@ import java.util.List;
 
 public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdapter.UsersViewHolder> implements Filterable {
 
-    private List<UserInfo> usersList;
+    private final List<UserInfo> usersList;
-    private Context mCtx;
+    private final Context mCtx;
-    private List<UserInfo> usersListFull;
+    private final List<UserInfo> usersListFull;
 
     static class UsersViewHolder extends RecyclerView.ViewHolder {
 
-        private ImageView userAvatar;
+	    private String userLoginId;
-        private TextView userFullName;
+
-        private TextView userEmail;
+        private final ImageView userAvatar;
-        private ImageView userRole;
+        private final TextView userFullName;
-        private TextView userName;
+        private final TextView userEmail;
+        private final ImageView userRole;
+        private final TextView userName;
 
         private UsersViewHolder(View itemView) {
+
             super(itemView);
 
             userAvatar = itemView.findViewById(R.id.userAvatar);
@@ -46,10 +51,17 @@ 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);
@@ -58,6 +70,7 @@ 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);
     }
@@ -67,23 +80,30 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
 
         UserInfo currentItem = usersList.get(position);
 
+	    holder.userLoginId = currentItem.getLogin();
+
         if(!currentItem.getFullname().equals("")) {
-            holder.userFullName.setText(currentItem.getFullname());
+
+            holder.userFullName.setText(Html.fromHtml(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()
@@ -96,6 +116,7 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
             holder.userRole.setImageDrawable(drawable);
         }
         else {
+
             holder.userRole.setVisibility(View.GONE);
         }
 
@@ -112,14 +133,15 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
         return usersFilter;
     }
 
-    private Filter usersFilter = new Filter() {
+    private final 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) {
@@ -137,6 +159,7 @@ 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,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;
@@ -9,10 +10,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;
@@ -23,12 +24,12 @@ import java.util.List;
 
 public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdapter.AssigneesViewHolder> {
 
-	private Context mCtx;
+	private final Context mCtx;
-	private List<Collaborators> assigneesList;
+	private final List<Collaborators> assigneesList;
 	private List<String> assigneesStrings = new ArrayList<>();
 	private List<String> currentAssignees;
 
-	private AssigneesListAdapterListener assigneesListener;
+	private final AssigneesListAdapterListener assigneesListener;
 
 	public interface AssigneesListAdapterListener {
 
@@ -45,9 +46,9 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 
 	static class AssigneesViewHolder extends RecyclerView.ViewHolder {
 
-		private CheckBox assigneesSelection;
+		private final CheckBox assigneesSelection;
-		private TextView assigneesName;
+		private final TextView assigneesName;
-		private ImageView assigneesAvatar;
+		private final ImageView assigneesAvatar;
 
 		private AssigneesViewHolder(View itemView) {
 
@@ -79,7 +80,7 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 		}
 		else {
 
-			holder.assigneesName.setText(currentItem.getFull_name());
+			holder.assigneesName.setText(Html.fromHtml(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,15 +2,17 @@ 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.models.Collaborators;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import java.util.List;
 
@@ -20,21 +22,32 @@ import java.util.List;
 
 public class CollaboratorsAdapter extends BaseAdapter  {
 
-    private List<Collaborators> collaboratorsList;
+    private final List<Collaborators> collaboratorsList;
-    private Context mCtx;
+    private final Context mCtx;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
-        private ImageView collaboratorAvatar;
+	    private String userLoginId;
-        private TextView collaboratorName;
+
+        private final ImageView collaboratorAvatar;
+        private final 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;
     }
@@ -61,17 +74,18 @@ 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) {
@@ -79,10 +93,14 @@ 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(currentItem.getFull_name());
+
+            viewHolder.collaboratorName.setText(Html.fromHtml(currentItem.getFull_name()));
         }
         else {
+
             viewHolder.collaboratorName.setText(currentItem.getLogin());
         }
 

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

@@ -12,11 +12,11 @@ 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;
 

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

@@ -18,6 +18,8 @@ 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,8 +33,6 @@ 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

@@ -9,11 +9,12 @@ import android.widget.Filterable;
 import android.widget.ImageView;
 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;
 
@@ -23,34 +24,33 @@ import java.util.List;
 
 public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHolder> implements Filterable {
 
-    private List<Files> filesList;
+	private final List<Files> originalFiles = new ArrayList<>();
-    private Context mCtx;
+	private final List<Files> alteredFiles = new ArrayList<>();
-    private List<Files> filesListFull;
 
-    private FilesAdapterListener filesListener;
+    private final Context mCtx;
+
+    private final FilesAdapterListener filesListener;
 
     public interface FilesAdapterListener {
+
         void onClickDir(String str);
         void onClickFile(String str);
     }
 
-    class FilesViewHolder extends RecyclerView.ViewHolder {
+	class FilesViewHolder extends RecyclerView.ViewHolder {
 
-        private ImageView fileTypeImage;
+    	private String fileType;
-	    private ImageView dirTypeImage;
+
-	    private ImageView unknownTypeImage;
+        private final ImageView fileTypeIs;
-        private TextView fileName;
+        private final TextView fileName;
-        private TextView fileType;
+        private final TextView fileInfo;
-        private TextView fileInfo;
 
         private FilesViewHolder(View itemView) {
 
             super(itemView);
+
             fileName = itemView.findViewById(R.id.fileName);
-            fileTypeImage = itemView.findViewById(R.id.fileImage);
+	        fileTypeIs = itemView.findViewById(R.id.fileTypeIs);
-	        dirTypeImage = itemView.findViewById(R.id.dirImage);
-	        unknownTypeImage = itemView.findViewById(R.id.unknownImage);
-            fileType = itemView.findViewById(R.id.fileType);
             fileInfo = itemView.findViewById(R.id.fileInfo);
 
             //ImageView filesDropdownMenu = itemView.findViewById(R.id.filesDropdownMenu);
@@ -59,10 +59,10 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 
                 Context context = v.getContext();
 
-                if(fileType.getText().toString().equals("file")) {
+                if(fileType.equals("file")) {
                     filesListener.onClickFile(fileName.getText().toString());
                 }
-                else if(fileType.getText().toString().equals("dir")) {
+                else if(fileType.equals("dir")) {
                     filesListener.onClickDir(fileName.getText().toString());
                 }
                 else {
@@ -138,11 +138,24 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         }
     }
 
-    public FilesAdapter(Context mCtx, List<Files> filesListMain, FilesAdapterListener filesListener) {
+    public FilesAdapter(Context mCtx, 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
@@ -155,35 +168,32 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
     @Override
     public void onBindViewHolder(@NonNull FilesAdapter.FilesViewHolder holder, int position) {
 
-        Files currentItem = filesList.get(position);
+        Files currentItem = alteredFiles.get(position);
 
-        holder.fileType.setText(currentItem.getType());
+        holder.fileType = currentItem.getType();
         holder.fileName.setText(currentItem.getName());
 
         if(currentItem.getType().equals("file")) {
-            holder.fileTypeImage.setVisibility(View.VISIBLE);
+
-	        holder.dirTypeImage.setVisibility(View.GONE);
+            holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_file));
-	        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.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_directory));
-	        holder.fileTypeImage.setVisibility(View.GONE);
 	        holder.fileInfo.setVisibility(View.GONE);
         }
         else {
-	        holder.unknownTypeImage.setVisibility(View.VISIBLE);
+
-	        holder.dirTypeImage.setVisibility(View.GONE);
+	        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_question));
-	        holder.fileTypeImage.setVisibility(View.GONE);
         }
 
     }
 
     @Override
     public int getItemCount() {
-        return filesList.size();
+        return alteredFiles.size();
     }
 
     @Override
@@ -191,17 +201,19 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         return filesFilter;
     }
 
-    private Filter filesFilter = new Filter() {
+    private final Filter filesFilter = new Filter() {
+
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
+
             List<Files> filteredList = new ArrayList<>();
 
             if (constraint == null || constraint.length() == 0) {
-                filteredList.addAll(filesListFull);
+                filteredList.addAll(originalFiles);
             } else {
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
-                for (Files item : filesListFull) {
+                for (Files item : originalFiles) {
                     if (item.getName().toLowerCase().contains(filterPattern) || item.getPath().toLowerCase().contains(filterPattern)) {
                         filteredList.add(item);
                     }
@@ -216,10 +228,14 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
-            filesList.clear();
+
-            filesList.addAll((List) results.values);
+            alteredFiles.clear();
+	        alteredFiles.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,6 +18,7 @@ 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;
@@ -29,7 +30,6 @@ 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,6 +65,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 	class IssueCommentViewHolder extends RecyclerView.ViewHolder {
 
+		private String userLoginId;
 		private IssueComments issueComment;
 
 		private final ImageView avatar;
@@ -227,6 +228,13 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 			});
 
+			avatar.setOnClickListener(loginId -> {
+
+				Context context = loginId.getContext();
+
+				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
+			});
+
 		}
 
 	}
@@ -311,6 +319,8 @@ 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());
 

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

@@ -14,14 +14,15 @@ 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;
@@ -101,6 +102,8 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
 	class IssuesHolder extends RecyclerView.ViewHolder {
 
+		private String userLoginId;
+
 		private final TextView issueNumber;
 		private final ImageView issueAssigneeAvatar;
 		private final TextView issueTitle;
@@ -118,9 +121,9 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 			LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
 			issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
 
-			issueTitle.setOnClickListener(v -> {
+			issueTitle.setOnClickListener(title -> {
 
-				Context context = v.getContext();
+				Context context = title.getContext();
 
 				Intent intent = new Intent(context, IssueDetailActivity.class);
 				intent.putExtra("issueNumber", issueNumber.getText());
@@ -131,9 +134,10 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 				context.startActivity(intent);
 
 			});
-			frameCommentsCount.setOnClickListener(v -> {
 
-				Context context = v.getContext();
+			frameCommentsCount.setOnClickListener(commentsCount -> {
+
+				Context context = commentsCount.getContext();
 
 				Intent intent = new Intent(context, IssueDetailActivity.class);
 				intent.putExtra("issueNumber", issueNumber.getText());
@@ -145,6 +149,13 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
 			});
 
+			issueAssigneeAvatar.setOnClickListener(loginId -> {
+
+				Context context = loginId.getContext();
+
+				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
+			});
+
 		}
 
 		@SuppressLint("SetTextI18n")
@@ -154,12 +165,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 			final String locale = tinyDb.getString("locale");
 			final String timeFormat = tinyDb.getString("dateFormat");
 
-			if(!issuesModel.getUser().getFull_name().equals("")) {
+			userLoginId = issuesModel.getUser().getLogin();
-				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));
-			}
 
 			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);
 

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;
 

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,6 +2,7 @@ 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;
@@ -10,10 +11,11 @@ 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;
 
@@ -23,26 +25,36 @@ import java.util.List;
 
 public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
 
-    private List<UserInfo> membersList;
+    private final List<UserInfo> membersList;
-    private Context mCtx;
+    private final Context mCtx;
-    private List<UserInfo> membersListFull;
+    private final List<UserInfo> membersListFull;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
-        private ImageView memberAvatar;
+	    private String userLoginId;
-        private TextView memberName;
+
+        private final ImageView memberAvatar;
+        private final 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
@@ -67,17 +79,18 @@ 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 MembersByOrgAdapter.ViewHolder(finalView);
+            viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
+
             viewHolder = (MembersByOrgAdapter.ViewHolder) finalView.getTag();
         }
 
         initData(viewHolder, position);
         return finalView;
-
     }
 
     private void initData(MembersByOrgAdapter.ViewHolder viewHolder, int position) {
@@ -85,10 +98,14 @@ 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(currentItem.getFullname());
+
+            viewHolder.memberName.setText(Html.fromHtml(currentItem.getFullname()));
         }
         else {
+
             viewHolder.memberName.setText(currentItem.getLogin());
         }
 
@@ -99,14 +116,17 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
         return membersFilter;
     }
 
-    private Filter membersFilter = new Filter() {
+    private final 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) {
@@ -124,6 +144,7 @@ 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

@@ -14,6 +14,7 @@ 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;
@@ -21,7 +22,6 @@ 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;

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

@@ -20,6 +20,8 @@ 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,8 +35,6 @@ 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

@@ -11,11 +11,11 @@ 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;
 
 /**

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;
 

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

@@ -10,8 +10,8 @@ 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;
 
 /**

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

@@ -1,18 +1,20 @@
 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 org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-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;
+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 java.util.List;
 
 /**
  * Author M M Arif
@@ -20,26 +22,36 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowersAdapter.FollowersViewHolder> {
 
-    private List<UserInfo> followersList;
+    private final List<UserInfo> followersList;
-    private Context mCtx;
+    private final Context mCtx;
 
     static class FollowersViewHolder extends RecyclerView.ViewHolder {
 
-        private ImageView userAvatar;
+	    private String userLoginId;
-        private TextView userFullName;
+
-        private TextView userName;
+        private final ImageView userAvatar;
+        private final TextView userFullName;
+        private final 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;
     }
@@ -47,8 +59,9 @@ 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 ProfileFollowersAdapter.FollowersViewHolder(v);
+        return new FollowersViewHolder(v);
     }
 
     @Override
@@ -56,11 +69,15 @@ public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowe
 
         UserInfo currentItem = followersList.get(position);
 
+	    holder.userLoginId = currentItem.getLogin();
+
         if(!currentItem.getFullname().equals("")) {
-            holder.userFullName.setText(currentItem.getFullname());
+
+            holder.userFullName.setText(Html.fromHtml(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,18 +1,20 @@
 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 org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-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;
+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 java.util.List;
 
 /**
  * Author M M Arif
@@ -20,26 +22,36 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowingAdapter.FollowingViewHolder> {
 
-    private List<UserInfo> followingList;
+    private final List<UserInfo> followingList;
-    private Context mCtx;
+    private final Context mCtx;
 
     static class FollowingViewHolder extends RecyclerView.ViewHolder {
 
-        private ImageView userAvatar;
+	    private String userLoginId;
-        private TextView userFullName;
+
-        private TextView userName;
+        private final ImageView userAvatar;
+        private final TextView userFullName;
+        private final 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;
     }
@@ -47,8 +59,9 @@ 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 ProfileFollowingAdapter.FollowingViewHolder(v);
+        return new FollowingViewHolder(v);
     }
 
     @Override
@@ -56,11 +69,15 @@ public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowi
 
         UserInfo currentItem = followingList.get(position);
 
+	    holder.userLoginId = currentItem.getLogin();
+
         if(!currentItem.getFullname().equals("")) {
-            holder.userFullName.setText(currentItem.getFullname());
+
+            holder.userFullName.setText(Html.fromHtml(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

@@ -14,14 +14,15 @@ 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;
 
@@ -98,6 +99,8 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
 	class PullRequestsHolder extends RecyclerView.ViewHolder {
 
+		private String userLoginId;
+
 		private final TextView prNumber;
 		private final TextView prMergeable;
 		private final TextView prHeadBranch;
@@ -142,6 +145,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 				context.startActivity(intent);
 
 			});
+
 			frameCommentsCount.setOnClickListener(v -> {
 
 				Context context = v.getContext();
@@ -159,7 +163,13 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 				tinyDb.putString("prForkFullName", prForkFullName.getText().toString());
 				tinyDb.putString("issueType", "Pull");
 				context.startActivity(intent);
+			});
 
+			assigneeAvatar.setOnClickListener(loginId -> {
+
+				Context context = loginId.getContext();
+
+				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
 			});
 
 		}
@@ -171,19 +181,9 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 			final String locale = tinyDb.getString("locale");
 			final String timeFormat = tinyDb.getString("dateFormat");
 
-			if(!prModel.getUser().getFull_name().equals("")) {
+			userLoginId = prModel.getUser().getLogin();
-				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));
-			}
 
-			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);
-				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) + prModel.getNumber() + "</font>";
 			prTitle.setText(HtmlCompat.fromHtml(prNumber_ + " " + EmojiParser.parseToUnicode(prModel.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
@@ -199,7 +199,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 				else {
 					// pull was done from a deleted fork
 					prIsFork.setText("true");
-					prForkFullName.setText(context.getString(R.string.prDeletedFrok));
+					prForkFullName.setText(context.getString(R.string.prDeletedFork));
 				}
 			}
 			prCommentsCount.setText(String.valueOf(prModel.getComments()));

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

@@ -13,6 +13,7 @@ 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;
@@ -20,7 +21,6 @@ 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;
 

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

@@ -8,8 +8,8 @@ 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;
 
 /**

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

@@ -16,6 +16,8 @@ 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;
@@ -29,8 +31,6 @@ 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,6 +20,8 @@ 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,8 +35,6 @@ 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,6 +20,8 @@ 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,8 +35,6 @@ 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/SearchIssuesAdapter.java

@@ -11,16 +11,17 @@ 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;
@@ -33,9 +34,9 @@ import java.util.Locale;
 
 public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapter.SearchViewHolder> {
 
-	private List<Issues> searchedList;
+	private final List<Issues> searchedList;
-	private Context mCtx;
+	private final Context mCtx;
-	private TinyDB tinyDb;
+	private final TinyDB tinyDb;
 
 	public SearchIssuesAdapter(List<Issues> dataList, Context mCtx) {
 
@@ -46,12 +47,14 @@ public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapte
 
 	class SearchViewHolder extends RecyclerView.ViewHolder {
 
-		private TextView issueNumber;
+		private String userLoginId;
-		private ImageView issueAssigneeAvatar;
+
-		private TextView issueTitle;
+		private final TextView issueNumber;
-		private TextView issueCreatedTime;
+		private final ImageView issueAssigneeAvatar;
-		private TextView issueCommentsCount;
+		private final TextView issueTitle;
-		private TextView repoFullName;
+		private final TextView issueCreatedTime;
+		private final TextView issueCommentsCount;
+		private final TextView repoFullName;
 
 		private SearchViewHolder(View itemView) {
 
@@ -100,6 +103,13 @@ public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapte
 
 				context.startActivity(intent);
 			});
+
+			issueAssigneeAvatar.setOnClickListener(loginId -> {
+
+				Context context = loginId.getContext();
+
+				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
+			});
 		}
 
 	}
@@ -120,12 +130,7 @@ public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapte
 		String locale = tinyDb.getString("locale");
 		String timeFormat = tinyDb.getString("dateFormat");
 
-		if(!currentItem.getUser().getFull_name().equals("")) {
+		holder.userLoginId = currentItem.getUser().getLogin();
-			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));
-		}
 
 		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);

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

@@ -20,6 +20,8 @@ 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,8 +35,6 @@ 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,17 +3,19 @@ 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;
 
 /**
@@ -22,24 +24,34 @@ import java.util.List;
 
 public class TeamMembersByOrgAdapter extends BaseAdapter {
 
-    private List<UserInfo> teamMembersList;
+    private final List<UserInfo> teamMembersList;
-    private Context mCtx;
+    private final Context mCtx;
 
     private static class ViewHolder {
 
-        private ImageView memberAvatar;
+	    private String userLoginId;
-        private TextView memberName;
+
+        private final ImageView memberAvatar;
+        private final 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
@@ -64,17 +76,18 @@ 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) {
@@ -82,6 +95,8 @@ 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;
 
@@ -102,13 +117,14 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
         }
 
         if(!currentItem.getFullname().equals("")) {
-            viewHolder.memberName.setText(currentItem.getFullname());
+
-            viewHolder.memberName.setTypeface(myTypeface);
+            viewHolder.memberName.setText(Html.fromHtml(currentItem.getFullname()));
         }
         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 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;
+import org.gitnex.tea4j.models.Teams;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OrganizationTeamMembersActivity;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Author M M Arif

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

@@ -10,6 +10,7 @@ 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;
@@ -27,19 +28,20 @@ import io.mikael.urlbuilder.UrlBuilder;
 
 public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapter.UserAccountsViewHolder> {
 
-	private List<UserAccount> userAccountsList;
+	private final List<UserAccount> userAccountsList;
-	private Context mCtx;
+	private final Context mCtx;
 	private TinyDB tinyDB;
 
 	class UserAccountsViewHolder extends RecyclerView.ViewHolder {
 
-		private TextView accountUrl;
+		private int accountId;
-		private TextView userId;
+		private String accountName;
-		private ImageView activeAccount;
+
-		private ImageView deleteAccount;
+		private final TextView accountUrl;
-		private ImageView repoAvatar;
+		private final TextView userId;
-		private TextView accountId;
+		private final ImageView activeAccount;
-		private TextView accountName;
+		private final ImageView deleteAccount;
+		private final ImageView repoAvatar;
 
 		private UserAccountsViewHolder(View itemView) {
 
@@ -50,30 +52,26 @@ 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(mCtx.getDrawable(R.drawable.ic_delete))
+					.setIcon(AppCompatResources.getDrawable(mCtx, 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(accountId.getText().toString()));
+						userAccountsApi.deleteAccount(Integer.parseInt(String.valueOf(accountId)));
 					}).setNeutralButton(mCtx.getResources().getString(R.string.cancelButton), null)
 					.show();
-
 			});
 
-			itemView.setOnClickListener(itemEdit -> {
+			itemView.setOnClickListener(switchAccount -> {
 
-				String accountNameSwitch = accountName.getText().toString();
 				UserAccountsApi userAccountsApi = new UserAccountsApi(mCtx);
-				UserAccount userAccount = userAccountsApi.getAccountData(accountNameSwitch);
+				UserAccount userAccount = userAccountsApi.getAccountData(accountName);
 
 				if(tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
 
@@ -109,7 +107,6 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 		notifyItemRemoved(position);
 		notifyItemRangeChanged(position, userAccountsList.size());
 		Toasty.success(mCtx, mCtx.getResources().getString(R.string.accountDeletedMessage));
-
 	}
 
 	@NonNull
@@ -131,20 +128,22 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 			.withPath("/")
 			.toString();
 
-		holder.accountId.setText(String.valueOf(currentItem.getAccountId()));
+		holder.accountId = currentItem.getAccountId();
-		holder.accountName.setText(currentItem.getAccountName());
+		holder.accountName = 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,6 +2,7 @@ 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;
@@ -12,6 +13,8 @@ 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;
@@ -20,8 +23,6 @@ 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;
@@ -132,15 +133,17 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
         holder.userNameMain.setText(currentItem.getUsername());
 
         if (!currentItem.getFullname().equals("")) {
-            holder.userFullName.setText(currentItem.getFullname());
+
-            holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+            holder.userFullName.setText(Html.fromHtml(currentItem.getFullname()));
         }
         else {
+
             holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
-            holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
         }
 
-        if (!currentItem.getAvatar().equals("")) {
+	    holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+
+	    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,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,6 +9,7 @@ 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;
@@ -16,7 +18,6 @@ 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;
@@ -103,11 +104,15 @@ public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSea
 		holder.teamId_.setText(String.valueOf(teamId));
 
 		if (!currentItem.getFullname().equals("")) {
-			holder.userFullName.setText(currentItem.getFullname());
+
+
+			holder.userFullName.setText(Html.fromHtml(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,7 +19,7 @@ import okhttp3.OkHttpClient;
 
 public class PicassoService {
 
-	private static PicassoService picassoService;
+	private static volatile PicassoService picassoService;
 	private final File cachePath;
 	private Picasso picasso;
 
@@ -40,12 +40,12 @@ public class PicassoService {
 					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()));
 
 			builder.downloader(new OkHttp3Downloader(okHttpClient.build()));
-			builder.listener((picasso, uri, exception) -> {
+//			builder.listener((picasso, uri, exception) -> {
-
+//
-				//Log.e("PicassoService", Objects.requireNonNull(uri.toString()));
+//				Log.e("PicassoService", Objects.requireNonNull(uri.toString()));
-				//Log.e("PicassoService", exception.toString());
+//				Log.e("PicassoService", exception.toString());
-
+//
-			});
+//			});
 
 			picasso = builder.memoryCache(new PicassoCache(cachePath, context)).build();
 
@@ -66,10 +66,15 @@ public class PicassoService {
 	public static synchronized PicassoService getInstance(Context context) {
 
 		if(picassoService == null) {
-			picassoService = new PicassoService(context);
+			synchronized(PicassoService.class) {
+				if(picassoService == null) {
+					picassoService = new PicassoService(context);
+				}
+			}
 		}
 
 		return picassoService;
+
 	}
 
 }

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

@@ -2,12 +2,12 @@ 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.Map;
@@ -96,30 +96,38 @@ public class RetrofitClient {
 	}
 
 	public static ApiInterface getApiInterface(Context context, String url) {
+
 		if(!apiInterfaces.containsKey(url)) {
+			synchronized(RetrofitClient.class) {
+				if(!apiInterfaces.containsKey(url)) {
 
-			ApiInterface apiInterface = createRetrofit(context, url)
+					ApiInterface apiInterface = createRetrofit(context, url).create(ApiInterface.class);
-				.create(ApiInterface.class);
+					apiInterfaces.put(url, apiInterface);
-
-			apiInterfaces.put(url, apiInterface);
-			return apiInterface;
 
+					return apiInterface;
+				}
+			}
 		}
 
 		return apiInterfaces.get(url);
+
 	}
 
 	public static WebInterface getWebInterface(Context context, String url) {
+
 		if(!webInterfaces.containsKey(url)) {
+			synchronized(RetrofitClient.class) {
+				if(!webInterfaces.containsKey(url)) {
 
-			WebInterface webInterface = createRetrofit(context, url)
+					WebInterface webInterface = createRetrofit(context, url).create(WebInterface.class);
-				.create(WebInterface.class);
+					webInterfaces.put(url, webInterface);
-
-			webInterfaces.put(url, webInterface);
-			return webInterface;
 
+					return webInterface;
+				}
+			}
 		}
 
 		return webInterfaces.get(url);
+
 	}
 }

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

@@ -0,0 +1,134 @@
+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.FontsOverride;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+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 })
+
+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.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", StaticGlobalVariables.defaultPollingDelay);
+		}
+
+		// disable biometric by default
+		if(tinyDB.getString("biometricStatusInit").isEmpty()) {
+
+			tinyDB.putBoolean("biometricStatus", false);
+			tinyDB.putString("biometricStatusInit", "yes");
+		}
+	}
+}

app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFilterFragment.java

@@ -23,9 +23,10 @@ public class BottomSheetNotificationsFilterFragment extends BottomSheetDialogFra
 	@Override
 	public void onAttach(@NonNull Context context) {
 
-		this.tinyDB = TinyDB.getInstance(context);
 		super.onAttach(context);
 
+		this.tinyDB = TinyDB.getInstance(context);
+
 	}
 
 	@Nullable

app/src/main/java/org/mian/gitnex/fragments/BottomSheetNotificationsFragment.java

@@ -11,12 +11,12 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import org.gitnex.tea4j.models.NotificationThread;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.NotificationsActions;
 import org.mian.gitnex.databinding.BottomSheetNotificationsBinding;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.models.NotificationThread;
 
 /**
  * Author opyale
@@ -30,6 +30,8 @@ public class BottomSheetNotificationsFragment extends BottomSheetDialogFragment
 
 	public void onAttach(Context context, NotificationThread notificationThread, OnOptionSelectedListener onOptionSelectedListener) {
 
+		super.onAttach(context);
+
 		this.context = context;
 		this.notificationThread = notificationThread;
 		this.onOptionSelectedListener = onOptionSelectedListener;

app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java

@@ -53,6 +53,8 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 	@Override
 	public void onAttach(@NonNull Context context) {
 
+		super.onAttach(context);
+
 		tinyDB = TinyDB.getInstance(context);
 		draftsApi = new DraftsApi(context);
 
@@ -60,7 +62,6 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 		currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
 		issueNumber = Integer.parseInt(tinyDB.getString("issueNumber"));
 
-		super.onAttach(context);
 	}
 
 	@SuppressLint("ClickableViewAccessibility")
@@ -119,7 +120,7 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 		comment.requestFocus();
 		comment.setOnTouchListener((v, event) -> {
 
-			BottomSheetBehavior bottomSheetBehavior = BottomSheetBehavior.from((View) bottomSheetReplyLayoutBinding.getRoot().getParent());
+			BottomSheetBehavior<View> bottomSheetBehavior = BottomSheetBehavior.from((View) bottomSheetReplyLayoutBinding.getRoot().getParent());
 
 			switch(event.getAction()) {
 

app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java

@@ -13,10 +13,10 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+import org.gitnex.tea4j.models.Collaborators;
 import org.mian.gitnex.adapters.CollaboratorsAdapter;
 import org.mian.gitnex.databinding.FragmentCollaboratorsBinding;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.viewmodels.CollaboratorsViewModel;
 import java.util.List;
 

app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java

@@ -19,6 +19,8 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import org.gitnex.tea4j.models.ExploreRepositories;
+import org.gitnex.tea4j.models.UserRepositories;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.ExploreRepositoriesAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -30,8 +32,6 @@ import org.mian.gitnex.helpers.InfiniteScrollListener;
 import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Version;
-import org.mian.gitnex.models.ExploreRepositories;
-import org.mian.gitnex.models.UserRepositories;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java

@@ -27,6 +27,7 @@ import org.mian.gitnex.adapters.FilesAdapter;
 import org.mian.gitnex.databinding.FragmentFilesBinding;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.Path;
 import org.mian.gitnex.viewmodels.FilesViewModel;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -41,34 +42,38 @@ import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;
 public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapterListener {
 
 	private ProgressBar mProgressBar;
-	private FilesAdapter adapter;
 	private RecyclerView mRecyclerView;
 	private TextView noDataFiles;
 	private LinearLayout filesFrame;
-	private TextView fileStructure;
+
-	private static String repoNameF = "param2";
+	private static final String repoNameF = "param2";
-	private static String repoOwnerF = "param1";
+	private static final String repoOwnerF = "param1";
-	private static String repoRefF = "param3";
+	private static final String repoRefF = "param3";
 	private BreadcrumbsView mBreadcrumbsView;
 
 	private String repoName;
 	private String repoOwner;
 	private String ref;
 
+	private final Path path = new Path();
+
+	private FilesAdapter filesAdapter;
+
 	private OnFragmentInteractionListener mListener;
 
-	public FilesFragment() {
+	public FilesFragment() {}
-
-	}
 
 	public static FilesFragment newInstance(String param1, String param2, String param3) {
 
 		FilesFragment fragment = new FilesFragment();
+
 		Bundle args = new Bundle();
 		args.putString(repoOwnerF, param1);
 		args.putString(repoNameF, param2);
 		args.putString(repoRefF, param3);
+
 		fragment.setArguments(args);
+
 		return fragment;
 	}
 
@@ -76,6 +81,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
+
 		if(getArguments() != null) {
 			repoName = getArguments().getString(repoNameF);
 			repoOwner = getArguments().getString(repoOwnerF);
@@ -84,7 +90,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 	}
 
 	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
 		FragmentFilesBinding fragmentFilesBinding = FragmentFilesBinding.inflate(inflater, container, false);
 		setHasOptionsMenu(true);
@@ -92,10 +98,12 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 		noDataFiles = fragmentFilesBinding.noDataFiles;
 		filesFrame = fragmentFilesBinding.filesFrame;
 
-		fileStructure = fragmentFilesBinding.fileStructure;
+		filesAdapter = new FilesAdapter(getContext(), this);
+
 		mRecyclerView = fragmentFilesBinding.recyclerView;
 		mRecyclerView.setHasFixedSize(true);
 		mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		mRecyclerView.setAdapter(filesAdapter);
 
 		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		mRecyclerView.addItemDecoration(dividerItemDecoration);
@@ -104,10 +112,33 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 		mBreadcrumbsView = fragmentFilesBinding.breadcrumbsView;
 		mBreadcrumbsView.setItems(new ArrayList<>(Collections.singletonList(BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot) + getResources().getString(R.string.colonDivider) + ref))));
+		// noinspection unchecked
+		mBreadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
+
+			@SuppressLint("SetTextI18n")
+			@Override
+			public void onNavigateBack(BreadcrumbItem item, int position) {
+
+				if(position == 0) {
+
+					path.clear();
+					fetchDataAsync(Authorization.get(getContext()), repoOwner, repoName, ref);
+					return;
+
+				}
+
+				path.pop(path.size() - position);
+				fetchDataAsyncSub(Authorization.get(getContext()), repoOwner, repoName, path.toString(), ref);
+
+			}
+
+			@Override public void onNavigateNewLocation(BreadcrumbItem newItem, int changedPosition) {}
+
+		});
 
 		((RepoDetailActivity) requireActivity()).setFragmentRefreshListenerFiles(repoBranch -> {
 
-			fileStructure.setText("");
+			path.clear();
 			ref = repoBranch;
 			mBreadcrumbsView.setItems(new ArrayList<>(Collections.singletonList(BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot) + getResources().getString(R.string.colonDivider) + ref))));
 			fetchDataAsync(Authorization.get(getContext()), repoOwner, repoName, repoBranch);
@@ -128,48 +159,10 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 	@Override
 	public void onClickDir(String dirName) {
 
-		StringBuilder breadcrumbBuilder = new StringBuilder();
+		path.add(dirName);
-
-		breadcrumbBuilder.append(fileStructure.getText().toString()).append("/").append(dirName);
-
-		fileStructure.setText(breadcrumbBuilder);
-
-		String dirName_ = fileStructure.getText().toString();
-		dirName_ = dirName_.startsWith("/") ? dirName_.substring(1) : dirName_;
-		final String finalDirName_ = dirName_;
-
 		mBreadcrumbsView.addItem(new BreadcrumbItem(Collections.singletonList(dirName)));
-		//noinspection unchecked
-		mBreadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
 
-			@SuppressLint("SetTextI18n")
+		fetchDataAsyncSub(Authorization.get(getContext()), repoOwner, repoName, path.toString(), ref);
-			@Override
-			public void onNavigateBack(BreadcrumbItem item, int position) {
-
-				if(position == 0) {
-
-					fetchDataAsync(Authorization.get(getContext()), repoOwner, repoName, ref);
-					fileStructure.setText("");
-					return;
-				}
-
-				String filterDir = fileStructure.getText().toString();
-				String result = filterDir.substring(0, filterDir.indexOf(item.getSelectedItem()));
-				fileStructure.setText(result + item.getSelectedItem());
-
-				String currentIndex = (result + item.getSelectedItem()).substring(1);
-
-				fetchDataAsyncSub(Authorization.get(getContext()), repoOwner, repoName, currentIndex, ref);
-
-			}
-
-			@Override
-			public void onNavigateNewLocation(BreadcrumbItem newItem, int changedPosition) {
-
-			}
-		});
-
-		fetchDataAsyncSub(Authorization.get(getContext()), repoOwner, repoName, finalDirName_, ref);
 
 	}
 
@@ -178,9 +171,9 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 		Intent intent = new Intent(getContext(), FileViewActivity.class);
 
-		if(!fileStructure.getText().toString().equals("Root")) {
+		if(path.size() != 0) {
 
-			intent.putExtra("singleFileName", fileStructure.getText().toString() + "/" + fileName);
+			intent.putExtra("singleFileName", path.toString() + "/" + fileName);
 		}
 		else {
 
@@ -199,24 +192,23 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 		filesModel.getFilesList(instanceToken, owner, repo, ref, getContext(), mProgressBar, noDataFiles).observe(getViewLifecycleOwner(), filesListMain -> {
 
-			adapter = new FilesAdapter(getContext(), filesListMain, FilesFragment.this);
+			filesAdapter.getOriginalFiles().clear();
-			mBreadcrumbsView.removeItemAfter(1);
+			filesAdapter.getOriginalFiles().addAll(filesListMain);
+			filesAdapter.notifyOriginalDataSetChanged();
 
-			if(adapter.getItemCount() > 0) {
+			if(filesListMain.size() > 0) {
 
-				mRecyclerView.setAdapter(adapter);
 				AppUtil.setMultiVisibility(View.VISIBLE, mRecyclerView, filesFrame);
 				noDataFiles.setVisibility(View.GONE);
+
 			}
 			else {
-
-				adapter.notifyDataSetChanged();
-				mRecyclerView.setAdapter(adapter);
 				AppUtil.setMultiVisibility(View.VISIBLE, mRecyclerView, filesFrame, noDataFiles);
 			}
 
 			filesFrame.setVisibility(View.VISIBLE);
 			mProgressBar.setVisibility(View.GONE);
+
 		});
 
 	}
@@ -230,16 +222,16 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 		filesModel2.getFilesList2(instanceToken, owner, repo, filesDir, ref, getContext(), mProgressBar, noDataFiles).observe(this, filesListMain2 -> {
 
-			adapter = new FilesAdapter(getContext(), filesListMain2, FilesFragment.this);
+			filesAdapter.getOriginalFiles().clear();
+			filesAdapter.getOriginalFiles().addAll(filesListMain2);
+			filesAdapter.notifyOriginalDataSetChanged();
+
+			if(filesListMain2.size() > 0) {
 
-			if(adapter.getItemCount() > 0) {
-				mRecyclerView.setAdapter(adapter);
 				AppUtil.setMultiVisibility(View.VISIBLE, mRecyclerView, filesFrame);
 				noDataFiles.setVisibility(View.GONE);
 			}
 			else {
-				adapter.notifyDataSetChanged();
-				mRecyclerView.setAdapter(adapter);
 				AppUtil.setMultiVisibility(View.VISIBLE, mRecyclerView, filesFrame, noDataFiles);
 			}
 
@@ -268,7 +260,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 			public boolean onQueryTextChange(String newText) {
 
 				if(mRecyclerView.getAdapter() != null) {
-					adapter.getFilter().filter(newText);
+					filesAdapter.getFilter().filter(newText);
 				}
 
 				return false;

app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java

@@ -21,6 +21,7 @@ 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.Issues;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.adapters.IssuesAdapter;
@@ -31,7 +32,6 @@ 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.Issues;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;

app/src/main/java/org/mian/gitnex/fragments/MembersByOrgFragment.java

@@ -17,13 +17,13 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.MembersByOrgAdapter;
 import org.mian.gitnex.databinding.FragmentMembersByOrgBinding;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.viewmodels.MembersByOrgViewModel;
 import java.util.List;
 import java.util.Objects;

app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java

@@ -16,6 +16,7 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import org.gitnex.tea4j.models.Milestones;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.adapters.MilestonesAdapter;
@@ -25,7 +26,6 @@ import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Version;
-import org.mian.gitnex.models.Milestones;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;

app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java

@@ -21,6 +21,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import org.apache.commons.lang3.StringUtils;
+import org.gitnex.tea4j.models.NotificationThread;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.NotificationsActions;
 import org.mian.gitnex.activities.IssueDetailActivity;
@@ -32,7 +33,6 @@ import org.mian.gitnex.helpers.InfiniteScrollListener;
 import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.models.NotificationThread;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;

app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java

@@ -13,13 +13,13 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import org.gitnex.tea4j.models.Organization;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.FragmentOrganizationInfoBinding;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.models.Organization;
 import retrofit2.Call;
 import retrofit2.Callback;
 

app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java

@@ -52,7 +52,7 @@ public class OrganizationsFragment extends Fragment {
 
         final SwipeRefreshLayout swipeRefresh = fragmentOrganizationsBinding.pullToRefresh;
 
-	    ((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navOrgs));
+	    ((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navOrg));
 
         mProgressBar = fragmentOrganizationsBinding.progressBar;
         noDataOrg = fragmentOrganizationsBinding.noDataOrg;

app/src/main/java/org/mian/gitnex/fragments/ProfileEmailsFragment.java

@@ -17,10 +17,10 @@ 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.Emails;
 import org.mian.gitnex.adapters.ProfileEmailsAdapter;
 import org.mian.gitnex.databinding.FragmentProfileEmailsBinding;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.models.Emails;
 import org.mian.gitnex.viewmodels.ProfileEmailsViewModel;
 import java.util.List;
 

app/src/main/java/org/mian/gitnex/fragments/ProfileFollowersFragment.java

@@ -18,10 +18,10 @@ 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.UserInfo;
 import org.mian.gitnex.adapters.ProfileFollowersAdapter;
 import org.mian.gitnex.databinding.FragmentProfileFollowersBinding;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.viewmodels.ProfileFollowersViewModel;
 import java.util.List;
 

app/src/main/java/org/mian/gitnex/fragments/ProfileFollowingFragment.java

@@ -18,11 +18,11 @@ 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.UserInfo;
 import org.mian.gitnex.adapters.ProfileFollowingAdapter;
 import org.mian.gitnex.databinding.FragmentProfileFollowingBinding;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.viewmodels.ProfileFollowingViewModel;
 import java.util.List;
 

app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Typeface;
 import android.os.Bundle;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -24,6 +25,7 @@ import com.squareup.picasso.Callback;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.ColorInverter;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
@@ -75,7 +77,12 @@ public class ProfileFragment extends Fragment {
 	    	userLanguage.setText(R.string.notSupported);
 	    }
 
-	    userFullName.setText(tinyDb.getString("userFullname"));
+	    userAvatar.setOnClickListener(loginId -> {
+
+		    AppUtil.copyToClipboard(ctx, tinyDb.getString("userLogin"), ctx.getString(R.string.copyLoginIdToClipBoard, tinyDb.getString("userLogin")));
+	    });
+
+	    userFullName.setText(Html.fromHtml(tinyDb.getString("userFullname")));
 	    userLogin.setText(getString(R.string.usernameWithAt, tinyDb.getString("userLogin")));
 
 	    PicassoService.getInstance(ctx).get()

app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java

@@ -21,6 +21,7 @@ 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.PullRequests;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.adapters.PullRequestsAdapter;
@@ -31,7 +32,6 @@ 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.PullRequests;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;

app/src/main/java/org/mian/gitnex/fragments/ReleasesFragment.java

@@ -18,11 +18,11 @@ 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.Releases;
 import org.mian.gitnex.adapters.ReleasesAdapter;
 import org.mian.gitnex.databinding.FragmentReleasesBinding;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.Releases;
 import org.mian.gitnex.viewmodels.ReleasesViewModel;
 import java.util.List;
 

app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java

@@ -17,6 +17,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import org.apache.commons.io.FileUtils;
+import org.gitnex.tea4j.models.UserRepositories;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
@@ -30,7 +31,6 @@ import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.models.UserRepositories;
 import java.util.Locale;
 import retrofit2.Call;
 import retrofit2.Callback;

app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java

@@ -22,13 +22,13 @@ 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.RepositoriesByOrgAdapter;
 import org.mian.gitnex.databinding.FragmentRepositoriesByOrgBinding;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.UserRepositories;
 import org.mian.gitnex.viewmodels.RepositoriesByOrgViewModel;
 import java.util.List;