README.md

@@ -17,7 +17,9 @@ No trackers are used and source code is available here for anyone to audit.
 ## Downloads
 [<img alt='Get it on F-droid' src='https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png' height="80"/>](https://f-droid.org/en/packages/org.mian.gitnex/)
 [<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.mian.gitnex)
-[<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://gitea.com/gitnex/GitNex/releases)
+[<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://gitnex.com/download/)
+
+Download latest build from master: [https://cloud.swatian.com/s/Cq592xGEfnsGAAW](https://cloud.swatian.com/s/Cq592xGEfnsGAAW)
 
 ## Note about Gitea version
 Please make sure that you are on latest stable release or later for better app experience.

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

@@ -120,11 +120,18 @@ public class IssueActions {
 
                         tinyDb.putBoolean("resumeIssues", true);
                         tinyDb.putBoolean("resumeClosedIssues", true);
+
                         if(issueState.equals("closed")) {
+
                             Toasty.info(ctx, ctx.getString(R.string.issueStateClosed));
+                            tinyDb.putString("issueState", "closed");
+
                         }
                         else if(issueState.equals("open")) {
+
                             Toasty.info(ctx, ctx.getString(R.string.issueStateReopened));
+                            tinyDb.putString("issueState", "open");
+
                         }
 
                     }
@@ -191,9 +198,14 @@ public class IssueActions {
 
                 if(response.isSuccessful()) {
 
-                    Toasty.info(ctx, ctx.getString(R.string.issueSubscribtion));
-                    subscribeIssue.setVisibility(View.GONE);
-                    unsubscribeIssue.setVisibility(View.VISIBLE);
+                    if(response.code() == 201) {
+
+                        unsubscribeIssue.setVisibility(View.VISIBLE);
+                        subscribeIssue.setVisibility(View.GONE);
+                        Toasty.info(ctx, ctx.getString(R.string.issueSubscribtion));
+                        tinyDB.putString("issueSubscriptionState", "unsubscribeToIssue");
+
+                    }
 
                 }
                 else if(response.code() == 401) {
@@ -248,9 +260,14 @@ public class IssueActions {
 
                 if(response.isSuccessful()) {
 
-                    Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtion));
-                    unsubscribeIssue.setVisibility(View.GONE);
-                    subscribeIssue.setVisibility(View.VISIBLE);
+                    if(response.code() == 201) {
+
+                        unsubscribeIssue.setVisibility(View.GONE);
+                        subscribeIssue.setVisibility(View.VISIBLE);
+                        Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtion));
+                        tinyDB.putString("issueSubscriptionState", "subscribeToIssue");
+
+                    }
 
                 }
                 else if(response.code() == 401) {

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

@@ -15,9 +15,6 @@ import org.mian.gitnex.activities.AddRemoveLabelsActivity;
 import org.mian.gitnex.activities.EditIssueActivity;
 import org.mian.gitnex.activities.FileDiffActivity;
 import org.mian.gitnex.activities.MergePullRequestActivity;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.util.TinyDB;
 import androidx.annotation.NonNull;
@@ -25,8 +22,6 @@ import androidx.annotation.Nullable;
 import android.content.ClipboardManager;
 import android.content.ClipData;
 import java.util.Objects;
-import retrofit2.Call;
-import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -187,30 +182,26 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
             if (tinyDB.getString("issueState").equals("open")) { // close issue
 
                 reOpenIssue.setVisibility(View.GONE);
+                closeIssue.setVisibility(View.VISIBLE);
 
-                closeIssue.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
+                closeIssue.setOnClickListener(closeSingleIssue -> {
 
-                        IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "closed");
-                        dismiss();
+                    IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "closed");
+                    dismiss();
 
-                    }
                 });
 
             }
             else if (tinyDB.getString("issueState").equals("closed")) {
 
                 closeIssue.setVisibility(View.GONE);
+                reOpenIssue.setVisibility(View.VISIBLE);
 
-                reOpenIssue.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
+                reOpenIssue.setOnClickListener(reOpenSingleIssue -> {
 
-                        IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "open");
-                        dismiss();
+                    IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "open");
+                    dismiss();
 
-                    }
                 });
 
             }
@@ -223,22 +214,18 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
         }
 
-        subscribeIssue.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
+        subscribeIssue.setOnClickListener(subscribeToIssue -> {
 
-                IssueActions.subscribe(ctx, subscribeIssue, unsubscribeIssue);
+            IssueActions.subscribe(ctx, subscribeIssue, unsubscribeIssue);
+            //dismiss();
 
-            }
         });
 
-        unsubscribeIssue.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
+        unsubscribeIssue.setOnClickListener(unsubscribeToIssue -> {
 
-                IssueActions.unsubscribe(ctx, subscribeIssue, unsubscribeIssue);
+            IssueActions.unsubscribe(ctx, subscribeIssue, unsubscribeIssue);
+            //dismiss();
 
-            }
         });
 
         //if RepoWatch True Provide Unsubscribe first

app/src/main/res/layout/bottom_sheet_single_issue_layout.xml

@@ -88,7 +88,8 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="16dp"
+                android:visibility="gone" />
 
             <TextView
                 android:id="@+id/unsubscribeIssue"

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:3.6.3'
 
     }
 }