From 88feca356418240caf809853e6085a70e88683d5 Mon Sep 17 00:00:00 2001 From: M M Arif Date: Thu, 19 Mar 2020 18:14:13 +0500 Subject: [PATCH] Backport show only issues, use StandardCharsets instead in okhttp --- .../mian/gitnex/activities/LoginActivity.java | 5 +++-- .../gitnex/fragments/ClosedIssuesFragment.java | 17 +++++++++-------- .../mian/gitnex/fragments/IssuesFragment.java | 17 +++++++++-------- .../mian/gitnex/interfaces/ApiInterface.java | 4 ++-- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java index ccea51a6..cc4d3bc1 100644 --- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java @@ -32,6 +32,7 @@ import org.mian.gitnex.util.AppUtil; import org.mian.gitnex.util.TinyDB; import java.net.URI; import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Objects; import java.util.UUID; @@ -284,7 +285,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener if(appUtil.checkIntegers(loginOTP_)) { - loginOTP = Integer.valueOf(loginOTP_); + loginOTP = Integer.parseInt(loginOTP_); } else { @@ -530,7 +531,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener private void letTheUserIn(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP) { - final String credential = Credentials.basic(loginUid, loginPass, Charset.forName("UTF-8")); + final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8); Call> call; if(loginOTP != 0) { diff --git a/app/src/main/java/org/mian/gitnex/fragments/ClosedIssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ClosedIssuesFragment.java index 04406339..0bc67c6e 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ClosedIssuesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/ClosedIssuesFragment.java @@ -52,6 +52,7 @@ public class ClosedIssuesFragment extends Fragment { private TextView noDataIssuesClosed; private String issueState = "closed"; private int resultLimit = 50; + private String requestType = "issues"; @Nullable @Override @@ -87,7 +88,7 @@ public class ClosedIssuesFragment extends Fragment { public void run() { swipeRefresh.setRefreshing(false); - loadInitial(instanceToken, repoOwner, repoName, issueState, resultLimit); + loadInitial(instanceToken, repoOwner, repoName, issueState, resultLimit, requestType); adapterClosed.notifyDataChanged(); } @@ -106,7 +107,7 @@ public class ClosedIssuesFragment extends Fragment { if(issuesListClosed.size() == 10 || pageSize == 10) { int page = (issuesListClosed.size() + 10) / 10; - loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, issueState, resultLimit); + loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, issueState, resultLimit, requestType); } /*else { @@ -125,7 +126,7 @@ public class ClosedIssuesFragment extends Fragment { recyclerViewClosed.setAdapter(adapterClosed); apiClosed = IssuesService.createService(ApiInterface.class, instanceUrl, getContext()); - loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState, resultLimit); + loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState, resultLimit, requestType); return v; @@ -145,16 +146,16 @@ public class ClosedIssuesFragment extends Fragment { if(tinyDb.getBoolean("resumeClosedIssues")) { - loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState, resultLimit); + loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState, resultLimit, requestType); tinyDb.putBoolean("resumeClosedIssues", false); } } - private void loadInitial(String token, String repoOwner, String repoName, String issueState, int resultLimit) { + private void loadInitial(String token, String repoOwner, String repoName, String issueState, int resultLimit, String requestType) { - Call> call = apiClosed.getClosedIssues(token, repoOwner, repoName, 1, issueState, resultLimit); + Call> call = apiClosed.getClosedIssues(token, repoOwner, repoName, 1, issueState, resultLimit, requestType); call.enqueue(new Callback>() { @@ -194,13 +195,13 @@ public class ClosedIssuesFragment extends Fragment { } - private void loadMore(String token, String repoOwner, String repoName, int page, String issueState, int resultLimit){ + private void loadMore(String token, String repoOwner, String repoName, int page, String issueState, int resultLimit, String requestType){ //add loading progress view issuesListClosed.add(new Issues("load")); adapterClosed.notifyItemInserted((issuesListClosed.size() - 1)); - Call> call = apiClosed.getClosedIssues(token, repoOwner, repoName, page, issueState, resultLimit); + Call> call = apiClosed.getClosedIssues(token, repoOwner, repoName, page, issueState, resultLimit, requestType); call.enqueue(new Callback>() { diff --git a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java index 18a06030..819842be 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java @@ -51,6 +51,7 @@ public class IssuesFragment extends Fragment { private int pageSize = 1; private TextView noDataIssues; private int resultLimit = 50; + private String requestType = "issues"; @Nullable @Override @@ -86,7 +87,7 @@ public class IssuesFragment extends Fragment { public void run() { swipeRefresh.setRefreshing(false); - loadInitial(instanceToken, repoOwner, repoName, resultLimit); + loadInitial(instanceToken, repoOwner, repoName, resultLimit, requestType); adapter.notifyDataChanged(); } @@ -105,7 +106,7 @@ public class IssuesFragment extends Fragment { if(issuesList.size() == 10 || pageSize == 10) { int page = (issuesList.size() + 10) / 10; - loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit); + loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, requestType); } /*else { @@ -124,7 +125,7 @@ public class IssuesFragment extends Fragment { recyclerView.setAdapter(adapter); api = IssuesService.createService(ApiInterface.class, instanceUrl, getContext()); - loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit); + loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType); return v; @@ -144,16 +145,16 @@ public class IssuesFragment extends Fragment { if(tinyDb.getBoolean("resumeIssues")) { - loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit); + loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType); tinyDb.putBoolean("resumeIssues", false); } } - private void loadInitial(String token, String repoOwner, String repoName, int resultLimit) { + private void loadInitial(String token, String repoOwner, String repoName, int resultLimit, String requestType) { - Call> call = api.getIssues(token, repoOwner, repoName, 1, resultLimit); + Call> call = api.getIssues(token, repoOwner, repoName, 1, resultLimit, requestType); call.enqueue(new Callback>() { @@ -193,13 +194,13 @@ public class IssuesFragment extends Fragment { } - private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit){ + private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit, String requestType){ //add loading progress view issuesList.add(new Issues("load")); adapter.notifyItemInserted((issuesList.size() - 1)); - Call> call = api.getIssues(token, repoOwner, repoName, page, resultLimit); + Call> call = api.getIssues(token, repoOwner, repoName, page, resultLimit, requestType); call.enqueue(new Callback>() { diff --git a/app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java b/app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java index 8fdb2fec..e00149c3 100644 --- a/app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java +++ b/app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java @@ -90,10 +90,10 @@ public interface ApiInterface { Call getUserRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName); @GET("repos/{owner}/{repo}/issues") // get issues by repo - Call> getIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("limit") int limit); + Call> getIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("limit") int limit, @Query("type") String requestType); @GET("repos/{owner}/{repo}/issues") // get closed issues by repo - Call> getClosedIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String issueState, @Query("limit") int limit); + Call> getClosedIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String issueState, @Query("limit") int limit, @Query("type") String requestType); @GET("repos/{owner}/{repo}/issues/{index}") // get issue by id Call getIssueByIndex(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int issueIndex);