From 23b8301fbf7724b04fdb3b2573af602d0ba7518f Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@noreply.codeberg.org>
Date: Thu, 15 Apr 2021 17:05:56 +0200
Subject: [PATCH] Fix repo desc in recyclerview (#896)

fixes and clean up

Use Authorization.get()

minor  fixes

Fix repo desc in recyclerview

Co-authored-by: M M Arif <mmarif@swatian.com>
Co-authored-by: opyale <opyale@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/896
Reviewed-by: opyale <opyale@noreply.codeberg.org>
Co-Authored-By: M M Arif <mmarif@noreply.codeberg.org>
Co-Committed-By: M M Arif <mmarif@noreply.codeberg.org>
---
 .../java/org/mian/gitnex/activities/MainActivity.java     | 1 -
 .../org/mian/gitnex/activities/RepoDetailActivity.java    | 8 +-------
 .../org/mian/gitnex/activities/RepoForksActivity.java     | 2 +-
 .../java/org/mian/gitnex/adapters/CommitsAdapter.java     | 2 --
 .../main/java/org/mian/gitnex/adapters/DraftsAdapter.java | 1 +
 .../mian/gitnex/adapters/ExploreRepositoriesAdapter.java  | 6 +++++-
 .../org/mian/gitnex/adapters/IssueCommentsAdapter.java    | 1 -
 .../java/org/mian/gitnex/adapters/MyReposListAdapter.java | 6 +++++-
 .../java/org/mian/gitnex/adapters/RepoForksAdapter.java   | 6 +++++-
 .../java/org/mian/gitnex/adapters/ReposListAdapter.java   | 6 +++++-
 .../mian/gitnex/adapters/RepositoriesByOrgAdapter.java    | 8 ++++++--
 .../org/mian/gitnex/adapters/SearchIssuesAdapter.java     | 1 +
 .../org/mian/gitnex/adapters/StarredReposListAdapter.java | 8 ++++++--
 .../org/mian/gitnex/adapters/UserAccountsAdapter.java     | 2 ++
 14 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
index 37dc223a..2e6e77e9 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@@ -231,7 +231,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		drawer.addDrawerListener(toggle);
 		drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
 
-
 			@Override
 			public void onDrawerOpened(@NonNull View drawerView) {
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
index 1022d0e8..31442285 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
@@ -71,9 +71,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 	private FragmentRefreshListenerMilestone fragmentRefreshListenerMilestone;
 	private FragmentRefreshListenerFiles fragmentRefreshListenerFiles;
 
-	private String loginUid;
-	private String instanceToken;
-
 	private String repositoryOwner;
 	private String repositoryName;
 
@@ -108,9 +105,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		Objects.requireNonNull(getSupportActionBar()).setTitle(repositoryName);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-		loginUid = tinyDB.getString("loginUid");
-		instanceToken = "token " + tinyDB.getString(loginUid + "-token");
-
 		tinyDB.putString("repoIssuesState", "open");
 		tinyDB.putString("repoPrState", "open");
 		tinyDB.putString("milestoneState", "open");
@@ -433,7 +427,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 		Call<List<Branches>> call = RetrofitClient
 			.getApiInterface(ctx)
-			.getBranches(instanceToken, repositoryOwner, repositoryName);
+			.getBranches(Authorization.get(ctx), repositoryOwner, repositoryName);
 
 		call.enqueue(new Callback<List<Branches>>() {
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
index f16cee4c..0789e96c 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
@@ -45,7 +45,7 @@ public class RepoForksActivity extends BaseActivity {
 	private View.OnClickListener onClickListener;
 	private TextView noData;
 	private ProgressBar progressBar;
-	private String TAG = "RepositoryForks";
+	private final String TAG = "RepositoryForks";
 	private int resultLimit = Constants.resultLimitOldGiteaInstances;
 	private int pageSize = 1;
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
index 46e58de1..b1729892 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
@@ -37,7 +37,6 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
         this.context = ctx;
         this.commitsList = commitsListMain;
-
     }
 
     @NonNull
@@ -67,7 +66,6 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
             ((CommitsHolder) holder).bindData(commitsList.get(position));
         }
-
     }
 
     @Override
diff --git a/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
index 36374a24..ebdc20a8 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
@@ -59,6 +59,7 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
                 deleteDraft(getAdapterPosition());
 
 	            DraftsApi draftsApi = BaseApi.getInstance(context, DraftsApi.class);
+	            assert draftsApi != null;
 	            draftsApi.deleteSingleDraft(getDraftId);
 
             });
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
index 8dc78c31..ee9b5926 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@@ -102,6 +102,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
 
 				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
+				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
 				if(count == 0) {
@@ -191,7 +192,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 
 		ColorGenerator generator = ColorGenerator.MATERIAL;
 		int color = generator.getColor(currentItem.getName());
-		String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
+		String firstCharacter = String.valueOf(currentItem.getFullName().charAt(0));
 
 		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
@@ -238,6 +239,9 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		if(!currentItem.getDescription().equals("")) {
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
+		else {
+			holder.repoDescription.setText(context.getString(R.string.noDataDescription));
+		}
 
 		if(holder.isRepoAdmin == null) {
 			holder.isRepoAdmin = new CheckBox(context);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
index cded93f4..8c078d30 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@@ -310,7 +310,6 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_issue_comments, parent, false);
 		return new IssueCommentsAdapter.IssueCommentViewHolder(v);
-
 	}
 	@Override
 	public void onBindViewHolder(@NonNull IssueCommentsAdapter.IssueCommentViewHolder holder, int position) {
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
index a7845c8c..b779b85d 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
@@ -100,6 +100,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
 
 				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
+				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
 				if(count == 0) {
@@ -198,7 +199,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 
 		ColorGenerator generator = ColorGenerator.MATERIAL;
 		int color = generator.getColor(currentItem.getName());
-		String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
+		String firstCharacter = String.valueOf(currentItem.getFullName().charAt(0));
 
 		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
@@ -245,6 +246,9 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 		if(!currentItem.getDescription().equals("")) {
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
+		else {
+			holder.repoDescription.setText(context.getString(R.string.noDataDescription));
+		}
 
 		if(holder.isRepoAdmin == null) {
 			holder.isRepoAdmin = new CheckBox(context);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
index d432cdad..78129efb 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoForksAdapter.java
@@ -142,7 +142,7 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
 			ColorGenerator generator = ColorGenerator.MATERIAL;
 			int color = generator.getColor(forksModel.getName());
-			String firstCharacter = String.valueOf(forksModel.getName().charAt(0));
+			String firstCharacter = String.valueOf(forksModel.getFullName().charAt(0));
 
 			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28)
 				.endConfig().buildRoundRect(firstCharacter, color, 3);
@@ -191,6 +191,9 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 			if(!forksModel.getDescription().equals("")) {
 				repoDescription.setText(forksModel.getDescription());
 			}
+			else {
+				repoDescription.setText(context.getString(R.string.noDataDescription));
+			}
 
 			if(isRepoAdmin == null) {
 				isRepoAdmin = new CheckBox(context);
@@ -224,6 +227,7 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
 
 				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
+				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
 				if(count == 0) {
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
index 400dc5b9..fdef9dfd 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -100,6 +100,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
 
 				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
+				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
 				if(count == 0) {
@@ -197,7 +198,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 
 		ColorGenerator generator = ColorGenerator.MATERIAL;
 		int color = generator.getColor(currentItem.getName());
-		String firstCharacter = String.valueOf(currentItem.getFullName().split("/")[0].charAt(0));
+		String firstCharacter = String.valueOf(currentItem.getFullName().charAt(0));
 
 		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
@@ -244,6 +245,9 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 		if(!currentItem.getDescription().equals("")) {
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
+		else {
+			holder.repoDescription.setText(context.getString(R.string.noDataDescription));
+		}
 
 		if(holder.isRepoAdmin == null) {
 			holder.isRepoAdmin = new CheckBox(context);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
index 18909561..2f6fd070 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
@@ -100,7 +100,8 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                 RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
 
                 //RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-                Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+	            assert repositoryData != null;
+	            Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
                 if(count == 0) {
 
@@ -194,7 +195,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
 
         ColorGenerator generator = ColorGenerator.MATERIAL;
         int color = generator.getColor(currentItem.getName());
-        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
+        String firstCharacter = String.valueOf(currentItem.getFullName().charAt(0));
 
         TextDrawable drawable = TextDrawable.builder()
                 .beginConfig()
@@ -248,6 +249,9 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
 	    if(!currentItem.getDescription().equals("")) {
 		    holder.repoDescription.setText(currentItem.getDescription());
 	    }
+	    else {
+		    holder.repoDescription.setText(context.getString(R.string.noDataDescription));
+	    }
 
 	    if(holder.isRepoAdmin == null) {
 		    holder.isRepoAdmin = new CheckBox(context);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/SearchIssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/SearchIssuesAdapter.java
index c31dea72..13f4c13e 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/SearchIssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/SearchIssuesAdapter.java
@@ -83,6 +83,7 @@ public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapte
 				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
 				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
 
+				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
 				if(count == 0) {
diff --git a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
index 2151b571..f7ca76f4 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
@@ -100,7 +100,8 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
 
                 //RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-                Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+	            assert repositoryData != null;
+	            Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
                 if(count == 0) {
 
@@ -195,7 +196,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
 
         ColorGenerator generator = ColorGenerator.MATERIAL;
         int color = generator.getColor(currentItem.getName());
-        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
+        String firstCharacter = String.valueOf(currentItem.getFullName().charAt(0));
 
         TextDrawable drawable = TextDrawable.builder()
                 .beginConfig()
@@ -249,6 +250,9 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
 	    if(!currentItem.getDescription().equals("")) {
 		    holder.repoDescription.setText(currentItem.getDescription());
 	    }
+	    else {
+		    holder.repoDescription.setText(context.getString(R.string.noDataDescription));
+	    }
 
 	    if(holder.isRepoAdmin == null) {
 		    holder.isRepoAdmin = new CheckBox(context);
diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
index 63371534..1e5d9dac 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java
@@ -65,6 +65,7 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 
 						updateLayoutByPosition(getAdapterPosition());
 						UserAccountsApi userAccountsApi = BaseApi.getInstance(context, UserAccountsApi.class);
+						assert userAccountsApi != null;
 						userAccountsApi.deleteAccount(Integer.parseInt(String.valueOf(accountId)));
 					}).setNeutralButton(context.getResources().getString(R.string.cancelButton), null)
 					.show();
@@ -73,6 +74,7 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 			itemView.setOnClickListener(switchAccount -> {
 
 				UserAccountsApi userAccountsApi = BaseApi.getInstance(context, UserAccountsApi.class);
+				assert userAccountsApi != null;
 				UserAccount userAccount = userAccountsApi.getAccountByName(accountName);
 
 				if(AppUtil.switchToAccount(context, userAccount)) {