Merge branch 'prepare-release-2.2' of gitnex/GitNex into master

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 72
-        versionName "2.2.2"
+        versionCode 70
+        versionName "2.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

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

@@ -192,7 +192,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
         FilesViewModel filesModel = new ViewModelProvider(this).get(FilesViewModel.class);
 
-        filesModel.getFilesList(instanceUrl, instanceToken, owner, repo, getContext()).observe(this, new Observer<List<Files>>() {
+        filesModel.getFilesList(instanceUrl, instanceToken, owner, repo).observe(this, new Observer<List<Files>>() {
             @Override
             public void onChanged(@Nullable List<Files> filesListMain) {
                 adapter = new FilesAdapter(getContext(), filesListMain, FilesFragment.this);
@@ -225,7 +225,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
         FilesViewModel filesModel2 = new ViewModelProvider(this).get(FilesViewModel.class);
 
-        filesModel2.getFilesList2(instanceUrl, instanceToken, owner, repo, filesDir, getContext()).observe(this, new Observer<List<Files>>() {
+        filesModel2.getFilesList2(instanceUrl, instanceToken, owner, repo, filesDir).observe(this, new Observer<List<Files>>() {
             @Override
             public void onChanged(@Nullable List<Files> filesListMain2) {
                 adapter = new FilesAdapter(getContext(), filesListMain2, FilesFragment.this);

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

@@ -89,7 +89,6 @@ public class MyRepositoriesFragment extends Fragment {
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        final String userLogin =  tinyDb.getString("userLogin");
 
         final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
 
@@ -141,13 +140,13 @@ public class MyRepositoriesFragment extends Fragment {
                         @Override
                         public void run() {
                             swipeRefresh.setRefreshing(false);
-                            MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin);
+                            MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), loginUid);
                         }
                     }, 50);
                 }
             });
 
-            fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin);
+            fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), loginUid);
 
         }
         else {
@@ -165,17 +164,16 @@ public class MyRepositoriesFragment extends Fragment {
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        final String userLogin =  tinyDb.getString("userLogin");
 
-        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin);
+        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), loginUid);
 
     }
 
-    private void fetchDataAsync(String instanceUrl, String instanceToken, String userLogin) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String username) {
 
         MyRepositoriesViewModel myRepoModel = new ViewModelProvider(this).get(MyRepositoriesViewModel.class);
 
-        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, userLogin).observe(this, new Observer<List<UserRepositories>>() {
+        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, username).observe(this, new Observer<List<UserRepositories>>() {
             @Override
             public void onChanged(@Nullable List<UserRepositories> myReposListMain) {
                 adapter = new MyReposListAdapter(getContext(), myReposListMain);

app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java

@@ -1,14 +1,11 @@
 package org.mian.gitnex.viewmodels;
 
-import android.content.Context;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
-import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Files;
 import java.util.Collections;
 import java.util.Comparator;
@@ -26,15 +23,15 @@ public class FilesViewModel extends ViewModel {
     private static MutableLiveData<List<Files>> filesList;
     private static MutableLiveData<List<Files>> filesList2;
 
-    public LiveData<List<Files>> getFilesList(String instanceUrl, String token, String owner, String repo, Context ctx) {
+    public LiveData<List<Files>> getFilesList(String instanceUrl, String token, String owner, String repo) {
 
         filesList = new MutableLiveData<>();
-        loadFilesList(instanceUrl, token, owner, repo, ctx);
+        loadFilesList(instanceUrl, token, owner, repo);
 
         return filesList;
     }
 
-    private static void loadFilesList(String instanceUrl, String token, String owner, String repo, final Context ctx) {
+    public static void loadFilesList(String instanceUrl, String token, String owner, String repo) {
 
         Call<List<Files>> call = RetrofitClient
                 .getInstance(instanceUrl)
@@ -46,17 +43,16 @@ public class FilesViewModel extends ViewModel {
             @Override
             public void onResponse(@NonNull Call<List<Files>> call, @NonNull Response<List<Files>> response) {
 
-                if (response.isSuccessful()) {
-                    Collections.sort(response.body(), new Comparator<Files>() {
-                        @Override
-                        public int compare(Files byType1, Files byType2) {
-                            return byType1.getType().compareTo(byType2.getType());
-                        }
-                    });
+                Collections.sort(response.body(), new Comparator<Files>() {
+                    @Override
+                    public int compare(Files byType1, Files byType2) {
+                        return byType1.getType().compareTo(byType2.getType());
+                    }
+                });
 
+                if (response.isSuccessful()) {
                     filesList.postValue(response.body());
                 } else {
-                    Toasty.info(ctx, ctx.getString(R.string.noDataFilesTab));
                     Log.i("onResponse", String.valueOf(response.code()));
                 }
 
@@ -70,15 +66,15 @@ public class FilesViewModel extends ViewModel {
         });
     }
 
-    public LiveData<List<Files>> getFilesList2(String instanceUrl, String token, String owner, String repo, String filesDir, Context ctx) {
+    public LiveData<List<Files>> getFilesList2(String instanceUrl, String token, String owner, String repo, String filesDir) {
 
-        filesList2 = new MutableLiveData<>();
-        loadFilesList2(instanceUrl, token, owner, repo, filesDir, ctx);
+        filesList = new MutableLiveData<>();
+        loadFilesList2(instanceUrl, token, owner, repo, filesDir);
 
-        return filesList2;
+        return filesList;
     }
 
-    private static void loadFilesList2(String instanceUrl, String token, String owner, String repo, String filesDir, final Context ctx) {
+    public static void loadFilesList2(String instanceUrl, String token, String owner, String repo, String filesDir) {
 
         Call<List<Files>> call = RetrofitClient
                 .getInstance(instanceUrl)
@@ -90,17 +86,19 @@ public class FilesViewModel extends ViewModel {
             @Override
             public void onResponse(@NonNull Call<List<Files>> call, @NonNull Response<List<Files>> response) {
 
-                if (response.isSuccessful()) {
+                assert response.body() != null;
+                if(response.body().size() > 0) {
                     Collections.sort(response.body(), new Comparator<Files>() {
                         @Override
                         public int compare(Files byType1, Files byType2) {
                             return byType1.getType().compareTo(byType2.getType());
                         }
                     });
+                }
 
-                    filesList2.postValue(response.body());
+                if (response.isSuccessful()) {
+                    filesList.postValue(response.body());
                 } else {
-                    Toasty.info(ctx, ctx.getString(R.string.noDataFilesTab));
                     Log.i("onResponse", String.valueOf(response.code()));
                 }
 

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

@@ -58,6 +58,6 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:indeterminate="true"
-        android:visibility="gone" />
+        android:visibility="visible" />
 
 </LinearLayout>

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

@@ -1,16 +0,0 @@
-2.2.1
-- Bug fix: Crash on empty repository
-
-2.2.0
-- New: Explore repositories
-- New: Files and directory browser (Require Gitea 1.9)
-- New: Basic file viewer
-- New: Filter files/directories
-- New: Star/unstar a repository
-- New: Watch/unwatch a repository
-- Improvement: Added Corwdin for translation
-- Improvement: Bottomsheet scroll and line dividers
-- Improvement: New languages support
-
-For more, check the release notes.
-https://gitea.com/gitnex/GitNex/releases

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

@@ -1,19 +0,0 @@
-2.2.2
-- Bug fix: My repositories when login via email
-
-2.2.1
-- Bug fix: Crash on empty repository
-
-2.2.0
-- New: Explore repositories
-- New: Files and directory browser (Require Gitea 1.9)
-- New: Basic file viewer
-- New: Filter files/directories
-- New: Star/unstar a repository
-- New: Watch/unwatch a repository
-- Improvement: Added Corwdin for translation
-- Improvement: Bottomsheet scroll and line dividers
-- Improvement: New languages support
-
-For more, check the release notes.
-https://gitea.com/gitnex/GitNex/releases

fastlane/metadata/android/en-US/full_description.txt

@@ -2,9 +2,8 @@ GitNex is a free, open-source Android client for Git repository management tool
 
 # Features
 
-- File/Directory browser
-- File viewer
 - Create files
+- File browser
 - Explore repositories
 - My repositories
 - Repositories list
@@ -29,16 +28,15 @@ GitNex is a free, open-source Android client for Git repository management tool
 - Collaborators view for repository
 - Markdown support
 - Emoji support
-- Settings : Pretty and Normal time format, language change
-, issue badge
+- Settings : Pretty and Normal time format, language change
 , issue badge
 - Option to access local non-https installs
 - Basic HTTP authentication support. Use USERNAME@YOUR-DOMAIN.COM in URL field
 - 2FA OTP support. Check the Troubleshoot wiki page for usage
-- Closed issues list
-- Edit issues
+- Create a new user - Admin privilege required
+- Closed issues list
 - Edit issue
-More features - https://gitea.com/gitnex/GitNex/wiki/Features
+s
 
 More features - https://gitea.com/gitnex/GitNex/wiki/Features
-Developer: https://mastodon.social/@mmarif
+