[Release 5.1.1] Fix login issue (#1283)

- Fix login issue - Support Android 14 Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1283 Co-authored-by: M M Arif <mmarif@swatian.com> Co-committed-by: M M Arif <mmarif@swatian.com>
2023-08-21 07:38:02 +00:00 · 2023-08-21 07:38:02 +00:00 · 1a33d1b05b
parent a565282b07
commit 1a33d1b05b
9 changed files with 45 additions and 23 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -4,13 +4,13 @@ plugins {
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
    defaultConfig {
        applicationId "org.mian.gitnex"
        minSdkVersion 23
-        targetSdkVersion 33
-        versionCode 510
-        versionName "5.1.0"
+        targetSdkVersion 34
+        versionCode 511
+        versionName "5.1.1"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@ -113,7 +113,7 @@ dependencies {
    implementation 'com.github.chrisvest:stormpot:2.4.2'
    implementation 'androidx.browser:browser:1.5.0'
    implementation 'com.google.android.flexbox:flexbox:3.0.0'
-    implementation('org.codeberg.gitnex:tea4j-autodeploy:3111bc1b18') {
+    implementation('org.codeberg.gitnex:tea4j-autodeploy:65f700d036') {
        exclude module: 'org.apache.oltu.oauth2.common'
    }
    implementation 'io.github.amrdeveloper:codeview:1.3.7'
--- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
@ -126,7 +126,13 @@ public class CommitsActivity extends BaseActivity {

 		Call<List<Commit>> call =
 				RetrofitClient.getApiInterface(ctx)
-						.repoGetAllCommits(repoOwner, repoName, branchName, null, 1, resultLimit);
+						.repoGetAllCommits(repoOwner, repoName, branchName, null,
+							true,
+							false,
+							true,
+							1,
+							resultLimit,
+							"");

 		call.enqueue(
 				new Callback<>() {
@ -180,7 +186,13 @@ public class CommitsActivity extends BaseActivity {
 		Call<List<Commit>> call =
 				RetrofitClient.getApiInterface(ctx)
 						.repoGetAllCommits(
-								repoOwner, repoName, branchName, null, page, resultLimit);
+								repoOwner, repoName, branchName, null,
+							true,
+							false,
+							true,
+							page,
+							resultLimit,
+							"");

 		call.enqueue(
 				new Callback<>() {
--- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
@ -639,6 +639,10 @@ public class LoginActivity extends BaseActivity {
 		final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);

 		CreateAccessTokenOption createUserToken = new CreateAccessTokenOption().name(tokenName);
+		if (giteaVersion.higherOrEqual("1.19.0")) {
+			createUserToken.addScopesItem("all");
+			createUserToken.addScopesItem("sudo");
+		}
 		Call<AccessToken> callCreateToken;

 		if (loginOTP != 0) {
--- a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
@ -185,7 +185,7 @@ public class CommitDetailFragment extends Fragment {
 	private void getCommit() {

 		RetrofitClient.getApiInterface(requireContext())
-				.repoGetSingleCommit(repoOwner, repoName, sha)
+				.repoGetSingleCommit(repoOwner, repoName, sha, true, false, true)
 				.enqueue(
 						new Callback<>() {

--- a/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java
@ -33,7 +33,7 @@ public class AdminGetUsersViewModel extends ViewModel {
 	public void loadUsersList(int page, int resultLimit, Context ctx) {

 		Call<List<User>> call =
-				RetrofitClient.getApiInterface(ctx).adminGetAllUsers(page, resultLimit);
+				RetrofitClient.getApiInterface(ctx).adminSearchUsers(null, null, page, resultLimit);

 		call.enqueue(
 				new Callback<>() {
@ -61,7 +61,7 @@ public class AdminGetUsersViewModel extends ViewModel {
 			int page, int resultLimit, Context ctx, AdminGetUsersAdapter adapter) {

 		Call<List<User>> call =
-				RetrofitClient.getApiInterface(ctx).adminGetAllUsers(page, resultLimit);
+				RetrofitClient.getApiInterface(ctx).adminSearchUsers(null, null, page, resultLimit);

 		call.enqueue(
 				new Callback<>() {
--- a/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java
@ -63,6 +63,7 @@ public class IssuesViewModel extends ViewModel {
 								null,
 								null,
 								null,
+								null,
 								1,
 								resultLimit);

@ -116,6 +117,7 @@ public class IssuesViewModel extends ViewModel {
 								null,
 								null,
 								null,
+								null,
 								page,
 								resultLimit);

--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>

-    <release version="5.1.0" versioncode="510">
-        <change>New: Dynamic colors for Android 12+ (Settings -> Appearance -> Theme)</change>
-        <change>New: FAB buttons for each task where required</change>
-        <change>New: Lisp language support</change>
-        <change>New: Repository language statistics</change>
-        <change>New: [CE] Settings to change syntax highlighting color (Settings -> Code Editor)</change>
-        <change>New: [CE] Settings to choose Tabs or Spaces for indentation (Settings -> Code Editor)</change>
-        <change>New: System default font (Settings -> Appearance -> Font)</change>
-        <change>Improvement: Hide notification count when no notification available</change>
-        <change>Improvement: Move logout from navigation to settings</change>
-        <change>Improvement: Move drafts, crash reports to General section</change>
-        <change>Improvement: Move translation to Appearance section</change>
+    <release version="5.1.1" versioncode="511">
+        <change>Improvement: Support for Android 14</change>
+        <change>Improvement: Updated to latest API build</change>
+        <change>Bug Fix: Fix login for newer versions of Gitea/Forgejo (1.19 and above)</change>
    </release>

 </changelog>
--- a/fastlane/metadata/android/en-US/changelogs/511.txt
+++ b/fastlane/metadata/android/en-US/changelogs/511.txt
@ -0,0 +1,12 @@
+5.1.1
+
+🚀 Improvements 🚀
+- Support for Android 14
+- Updated to latest API build
+
+🐛 Bug Fixes 🐛
+- Fix login for newer versions of Gitea/Forgejo (1.19 and above)
+
+Release Notes: https://codeberg.org/gitnex/GitNex/releases
+
+Release Posts: https://najigram.com/category/gitnex/
--- a/gradle.properties
+++ b/gradle.properties
@ -8,7 +8,7 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.workers.max=12
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit