Merge branch 'release-2.3.2' of gitnex/GitNex into release-2.3

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 81
+        versionCode 82
-        versionName "2.3.1"
+        versionName "2.3.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

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

@@ -340,13 +340,13 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
 
                         List<Milestones> milestonesList_ = response.body();
 
-                        milestonesList.add(new Milestones(0,"No milestone"));
+                        milestonesList.add(new Milestones(0,getString(R.string.issueCreatedNoMilestone)));
                         assert milestonesList_ != null;
                         if(milestonesList_.size() > 0) {
                             for (int i = 0; i < milestonesList_.size(); i++) {
 
-                                //String mStone = getString(R.string.spinnerMilestoneText, milestonesList_.get(i).getTitle(), milestonesList_.get(i).getState());
+                                //Don't translate "open" is a enum
-                                if(milestonesList_.get(i).getState().equals(getString(R.string.issueStatusOpen))) {
+                                if(milestonesList_.get(i).getState().equals("open")) {
                                     Milestones data = new Milestones(
                                             milestonesList_.get(i).getId(),
                                             milestonesList_.get(i).getTitle()

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

@@ -73,7 +73,6 @@ public class FileViewActivity extends AppCompatActivity {
 
         TextView toolbar_title = findViewById(R.id.toolbar_title);
         toolbar_title.setMovementMethod(new ScrollingMovementMethod());
-        toolbar_title.setText(singleFileName);
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
@@ -82,6 +81,7 @@ public class FileViewActivity extends AppCompatActivity {
 
             singleFileName = URLDecoder.decode(singleFileName, "UTF-8");
             singleFileName = singleFileName.replaceAll("//", "/");
+            singleFileName = singleFileName.startsWith("/") ? singleFileName.substring(1) : singleFileName;
 
         }
         catch (UnsupportedEncodingException e) {
@@ -91,6 +91,8 @@ public class FileViewActivity extends AppCompatActivity {
 
         }
 
+        toolbar_title.setText(singleFileName);
+
         getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName);
 
     }

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

@@ -140,6 +140,10 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
         fileStructure.setText(breadcrumbBuilder);
 
+        String dirName_ = fileStructure.getText().toString();
+        dirName_ = dirName_.startsWith("/") ? dirName_.substring(1) : dirName_;
+        final String finalDirName_ = dirName_;
+
         mBreadcrumbsView.addItem(createItem(dirName));
         mBreadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
             @Override
@@ -154,7 +158,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
                 String filterDir = fileStructure.getText().toString();
                 String result = filterDir.substring(0, filterDir.indexOf(item.getSelectedItem()));
                 fileStructure.setText(result + item.getSelectedItem());
-                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, fileStructure.getText().toString());
+                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, finalDirName_);
 
             }
 
@@ -164,7 +168,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
             }
         });
 
-        fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, fileStructure.getText().toString());
+        fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, finalDirName_);
 
     }
 

app/src/main/res/values/strings.xml

@@ -237,6 +237,7 @@
     <string name="issueDescriptionEmpty">Issue description is empty</string>
     <string name="issueCreated">New issue created successfully</string>
     <string name="issueCreatedError">Something went wrong, please try again</string>
+    <string name="issueCreatedNoMilestone">No milestone</string>
     <string name="noAssigneesFound">No collaborators found</string>
     <string name="noLabelsFound">No labels found</string>
 

build.gradle

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

fastlane/metadata/android/en-US/changelogs/82.txt

@@ -0,0 +1,6 @@
+2.3.2
+Bugfix: Slashes in URL(file viewer)
+Bugfix: No milestones when creating issue if user has other language selected
+
+For more, check the release notes.
+https://gitea.com/gitnex/GitNex/releases