Prepare release 3.0.1 (#625)

Prepare release 3.0.1

Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/625

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 300
-        versionName "3.0.0"
+        versionCode 301
+        versionName "3.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {

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

@@ -47,8 +47,9 @@ import retrofit2.Callback;
 
 public class LoginActivity extends BaseActivity {
 
-	private enum Protocol { HTTPS, HTTP }
-	private enum LoginType { BASIC, TOKEN }
+	private enum Protocol {HTTPS, HTTP}
+
+	private enum LoginType {BASIC, TOKEN}
 
 	private Context appCtx;
 	private Context ctx = this;
@@ -104,19 +105,16 @@ public class LoginActivity extends BaseActivity {
 				}
 			}
 
-			public void onNothingSelected(AdapterView<?> parent) {}
+			public void onNothingSelected(AdapterView<?> parent) {
+
+			}
 
 		});
 
-		info_button.setOnClickListener(view -> new Tooltip.Builder(view)
-			.setText(R.string.urlInfoTooltip)
-			.setTextColor(getResources().getColor(R.color.white))
-			.setBackgroundColor(getResources().getColor(R.color.tooltipBackground))
-			.setCancelable(true)
-			.setDismissOnClick(true)
-			.setPadding(30)
-			.setCornerRadius(R.dimen.tooltipCornor)
-			.setGravity(Gravity.BOTTOM).show());
+		info_button.setOnClickListener(
+			view -> new Tooltip.Builder(view).setText(R.string.urlInfoTooltip).setTextColor(getResources().getColor(R.color.white))
+				.setBackgroundColor(getResources().getColor(R.color.tooltipBackground)).setCancelable(true).setDismissOnClick(true).setPadding(30)
+				.setCornerRadius(R.dimen.tooltipCornor).setGravity(Gravity.BOTTOM).show());
 
 		loginMethod.setOnCheckedChangeListener((group, checkedId) -> {
 
@@ -171,16 +169,12 @@ public class LoginActivity extends BaseActivity {
 			Protocol protocol = (Protocol) protocolSpinner.getSelectedItem();
 			LoginType loginType = (loginMethod.getCheckedRadioButtonId() == R.id.loginUsernamePassword) ? LoginType.BASIC : LoginType.TOKEN;
 
-			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET.getText().toString(), "http"))
-				.toUri();
+			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET.getText().toString(), "http")).toUri();
 
-			URI instanceUrlWithProtocol = UrlBuilder.fromUri(rawInstanceUrl)
-				.withPath(PathsHelper.join(rawInstanceUrl.getPath()))
-				.withScheme(protocol.name().toLowerCase())
-				.toUri();
+			URI instanceUrlWithProtocol = UrlBuilder.fromUri(rawInstanceUrl).withPath(PathsHelper.join(rawInstanceUrl.getPath()))
+				.withScheme(protocol.name().toLowerCase()).toUri();
 
-			URI instanceUrl = UrlBuilder.fromUri(instanceUrlWithProtocol)
-				.withPath(PathsHelper.join(instanceUrlWithProtocol.getPath(), "/api/v1/"))
+			URI instanceUrl = UrlBuilder.fromUri(instanceUrlWithProtocol).withPath(PathsHelper.join(instanceUrlWithProtocol.getPath(), "/api/v1/"))
 				.toUri();
 
 			tinyDB.putString("loginType", loginType.name().toLowerCase());
@@ -221,6 +215,14 @@ public class LoginActivity extends BaseActivity {
 
 				}
 
+				if(loginUid.contains("@")) {
+
+					SnackBar.warning(ctx, layoutView, getResources().getString(R.string.userInvalidUserName));
+					enableProcessButton();
+					return;
+
+				}
+
 				if(loginPass.equals("")) {
 
 					SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldPassword));
@@ -232,7 +234,7 @@ public class LoginActivity extends BaseActivity {
 				int loginOTP = (otpCode.length() > 0) ? Integer.parseInt(otpCode.getText().toString().trim()) : 0;
 				tinyDB.putString("loginUid", loginUid);
 
-				versionCheck(instanceUrl.toString(), loginUid, loginPass, loginOTP, loginToken, 1);
+				versionCheck(instanceUrl.toString(), loginUid, loginPass, loginOTP, loginToken, loginType);
 
 			}
 			else {
@@ -245,11 +247,12 @@ public class LoginActivity extends BaseActivity {
 
 				}
 
-				versionCheck(instanceUrl.toString(), loginUid, loginPass, 123, loginToken, 2);
+				versionCheck(instanceUrl.toString(), loginUid, loginPass, 123, loginToken, loginType);
 
 			}
 
-		} catch (Exception e) {
+		}
+		catch(Exception e) {
 
 			Log.e("onFailure-login", e.toString());
 			SnackBar.error(ctx, layoutView, getResources().getString(R.string.malformedUrl));
@@ -258,7 +261,8 @@ public class LoginActivity extends BaseActivity {
 		}
 	}
 
-	private void versionCheck(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP, final String loginToken, final int loginType) {
+	private void versionCheck(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP, final String loginToken,
+		final LoginType loginType) {
 
 		Call<GiteaVersion> callVersion;
 
@@ -270,9 +274,9 @@ public class LoginActivity extends BaseActivity {
 
 			String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
 
-			callVersion = (loginOTP != 0) ?
-				RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithOTP(credential, loginOTP) :
-				RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithBasic(credential);
+			callVersion =
+				(loginOTP != 0) ? RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithOTP(credential, loginOTP) :
+					RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithBasic(credential);
 
 		}
 
@@ -300,10 +304,8 @@ public class LoginActivity extends BaseActivity {
 
 					if(gitea_version.less(getString(R.string.versionLow))) {
 
-						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx)
-							.setTitle(getString(R.string.versionAlertDialogHeader))
-							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion()))
-							.setIcon(R.drawable.ic_warning)
+						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
+							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning)
 							.setCancelable(true);
 
 						alertDialogBuilder.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {
@@ -339,12 +341,15 @@ public class LoginActivity extends BaseActivity {
 				}
 			}
 
-			private void login(int loginType, String instanceUrl, String loginUid, String loginPass, int loginOTP, String loginToken) {
+			private void login(LoginType loginType, String instanceUrl, String loginUid, String loginPass, int loginOTP, String loginToken) {
 
-				if(loginType == 1) {
+				// ToDo: before store/create token: get UserInfo to check DB/AccountManager if there already exist a token
+				// the setup methods then can better handle all different cases
+
+				if(loginType == LoginType.BASIC) {
 					setup(instanceUrl, loginUid, loginPass, loginOTP);
 				}
-				else if(loginType == 2) { // Token
+				else if(loginType == LoginType.TOKEN) { // Token
 					setupUsingExistingToken(instanceUrl, loginToken);
 				}
 			}
@@ -361,9 +366,7 @@ public class LoginActivity extends BaseActivity {
 
 	private void setupUsingExistingToken(String instanceUrl, final String loginToken) {
 
-		Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, ctx)
-			.getApiInterface()
-			.getUserInfo("token " + loginToken);
+		Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo("token " + loginToken);
 
 		call.enqueue(new Callback<UserInfo>() {
 
@@ -423,19 +426,16 @@ public class LoginActivity extends BaseActivity {
 	private void setup(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP) {
 
 		final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
+		final String tokenName = "gitnex-app-" + device_id;
 
 		Call<List<UserTokens>> call;
 		if(loginOTP != 0) {
 
-			call = RetrofitClient.getInstance(instanceUrl, ctx)
-				.getApiInterface()
-				.getUserTokensWithOTP(credential, loginOTP, loginUid);
+			call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserTokensWithOTP(credential, loginOTP, loginUid);
 		}
 		else {
 
-			call = RetrofitClient.getInstance(instanceUrl, ctx)
-				.getApiInterface()
-				.getUserTokens(credential, loginUid);
+			call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserTokens(credential, loginUid);
 		}
 
 		call.enqueue(new Callback<List<UserTokens>>() {
@@ -445,149 +445,110 @@ public class LoginActivity extends BaseActivity {
 
 				List<UserTokens> userTokens = response.body();
 
-				AppUtil appUtil = new AppUtil();
-
 				if(response.code() == 200) {
 
 					assert userTokens != null;
-					boolean setTokenFlag = false;
+					for(UserTokens t : userTokens) {
+						if(t.getName().equals(tokenName)) {
 
-					if(userTokens.size() > 0) { // FIXME This is in need of a refactor, but i don't understand what the code is used for.
+							// this app had created an token on this instance before
+							// -> since it looks like GitNex forgot the secret we have to delete it first
 
-						if(userTokens.get(0).getToken_last_eight() != null) {
+							Call<Void> delcall;
+							if(loginOTP != 0) {
 
-							for(int i = 0; i < userTokens.size(); i++) {
-
-								if(userTokens.get(i).getToken_last_eight().equals(tinyDB.getString(loginUid + "-token-last-eight"))) {
-									setTokenFlag = true;
-									break;
-								}
+								delcall = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface()
+									.deleteTokenWithOTP(credential, loginOTP, loginUid, t.getId());
 							}
-						}
-						else {
+							else {
 
-							for(int i = 0; i < userTokens.size(); i++) {
-
-								if(userTokens.get(i).getSha1().equals(tinyDB.getString(loginUid + "-token"))) {
-									setTokenFlag = true;
-									break;
-								}
+								delcall = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().deleteToken(credential, loginUid, t.getId());
 							}
-						}
-					}
+							delcall.enqueue(new Callback<Void>() {
 
-					if(tinyDB.getString(loginUid + "-token").isEmpty() || !setTokenFlag) {
+								@Override
+								public void onResponse(@NonNull Call<Void> delcall, @NonNull retrofit2.Response<Void> response) {
 
-						UserTokens createUserToken = new UserTokens("gitnex-app-" + device_id);
-						Call<UserTokens> callCreateToken;
+									if(response.code() == 204) {
 
-						if(loginOTP != 0) {
+										setupToken(instanceUrl, loginUid, loginPass, loginOTP, tokenName);
+									}
+									else {
 
-							callCreateToken = RetrofitClient.getInstance(instanceUrl, ctx)
-								.getApiInterface()
-								.createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken);
-						}
-						else {
+										SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
+										enableProcessButton();
 
-							callCreateToken = RetrofitClient.getInstance(instanceUrl, ctx)
-								.getApiInterface()
-								.createNewToken(credential, loginUid, createUserToken);
-						}
-
-						callCreateToken.enqueue(new Callback<UserTokens>() {
-
-							@Override
-							public void onResponse(@NonNull Call<UserTokens> callCreateToken, @NonNull retrofit2.Response<UserTokens> responseCreate) {
-
-								if(responseCreate.code() == 201) {
-
-									UserTokens newToken = responseCreate.body();
-									assert newToken != null;
-
-									if(!newToken.getSha1().equals("")) {
-
-										Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, ctx)
-											.getApiInterface()
-											.getUserInfo("token " + newToken.getSha1());
-
-										call.enqueue(new Callback<UserInfo>() {
-
-											@Override
-											public void onResponse(@NonNull Call<UserInfo> call, @NonNull retrofit2.Response<UserInfo> response) {
-
-												UserInfo userDetails = response.body();
-
-												switch(response.code()) {
-
-													case 200:
-														assert userDetails != null;
-														tinyDB.remove("loginPass");
-														tinyDB.putBoolean("loggedInMode", true);
-														tinyDB.putString("userLogin", userDetails.getUsername());
-														tinyDB.putString(loginUid + "-token", newToken.getSha1());
-														tinyDB.putString(loginUid + "-token-last-eight", appUtil.getLastCharactersOfWord(newToken.getSha1(), 8));
-
-														// insert new account to db if does not exist
-														String accountName = userDetails.getUsername() + "@" + instanceUrl;
-														UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
-														int checkAccount = userAccountsApi.getCount(accountName);
-
-														if(checkAccount == 0) {
-															userAccountsApi.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), newToken.getSha1(), "");
-														}
-
-														startActivity(new Intent(LoginActivity.this, MainActivity.class));
-														finish();
-														break;
-
-													case 401:
-														SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError));
-														enableProcessButton();
-														break;
-
-													default:
-														SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
-														enableProcessButton();
-
-												}
-
-											}
-
-											@Override
-											public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
-
-												Log.e("onFailure", t.toString());
-												SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError));
-												enableProcessButton();
-
-											}
-										});
 									}
 								}
-								else if(responseCreate.code() == 500) {
 
-									SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + responseCreate.code());
+								@Override
+								public void onFailure(@NonNull Call<Void> delcall, @NonNull Throwable t) {
+
+									Log.e("onFailure-login", t.toString());
+									SnackBar.error(ctx, layoutView, getResources().getString(R.string.malformedJson));
 									enableProcessButton();
 
 								}
-							}
-
-							@Override
-							public void onFailure(@NonNull Call<UserTokens> createUserToken, @NonNull Throwable t) {
-
-								Log.e("onFailure-token", t.toString());
-							}
-						});
+							});
+							return;
+						}
 					}
-					else {
 
-						String instanceToken = "token " + tinyDB.getString(loginUid + "-token");
+					setupToken(instanceUrl, loginUid, loginPass, loginOTP, tokenName);
+				}
+				else {
 
-						Call<UserInfo> callGetUsername = RetrofitClient.getInstance(instanceUrl, ctx)
-							.getApiInterface()
-							.getUserInfo(instanceToken);
+					SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
+					enableProcessButton();
 
-						callGetUsername.enqueue(new Callback<UserInfo>() {
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<UserTokens>> call, @NonNull Throwable t) {
+
+				Log.e("onFailure-login", t.toString());
+				SnackBar.error(ctx, layoutView, getResources().getString(R.string.malformedJson));
+				enableProcessButton();
+
+			}
+		});
+
+	}
+
+	private void setupToken(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP, final String tokenName) {
+
+		final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
+
+		UserTokens createUserToken = new UserTokens(tokenName);
+		Call<UserTokens> callCreateToken;
+
+		if(loginOTP != 0) {
+
+			callCreateToken = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface()
+				.createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken);
+		}
+		else {
+
+			callCreateToken = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().createNewToken(credential, loginUid, createUserToken);
+		}
+
+		callCreateToken.enqueue(new Callback<UserTokens>() {
+
+			@Override
+			public void onResponse(@NonNull Call<UserTokens> callCreateToken, @NonNull retrofit2.Response<UserTokens> responseCreate) {
+
+				if(responseCreate.code() == 201) {
+
+					UserTokens newToken = responseCreate.body();
+					assert newToken != null;
+
+					if(!newToken.getSha1().equals("")) {
+
+						Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface()
+							.getUserInfo("token " + newToken.getSha1());
+
+						call.enqueue(new Callback<UserInfo>() {
 
 							@Override
 							public void onResponse(@NonNull Call<UserInfo> call, @NonNull retrofit2.Response<UserInfo> response) {
@@ -598,8 +559,11 @@ public class LoginActivity extends BaseActivity {
 
 									case 200:
 										assert userDetails != null;
-										tinyDB.putString("userLogin", userDetails.getUsername());
+										tinyDB.remove("loginPass");
 										tinyDB.putBoolean("loggedInMode", true);
+										tinyDB.putString("userLogin", userDetails.getUsername());
+										tinyDB.putString(loginUid + "-token", newToken.getSha1());
+										tinyDB.putString(loginUid + "-token-last-eight", newToken.getToken_last_eight());
 
 										// insert new account to db if does not exist
 										String accountName = userDetails.getUsername() + "@" + instanceUrl;
@@ -607,7 +571,8 @@ public class LoginActivity extends BaseActivity {
 										int checkAccount = userAccountsApi.getCount(accountName);
 
 										if(checkAccount == 0) {
-											userAccountsApi.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), instanceToken, "");
+											userAccountsApi
+												.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), newToken.getSha1(), "");
 										}
 
 										startActivity(new Intent(LoginActivity.this, MainActivity.class));
@@ -638,26 +603,23 @@ public class LoginActivity extends BaseActivity {
 						});
 					}
 				}
-				else {
+				else if(responseCreate.code() == 500) {
 
-					SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
+					SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + responseCreate.code());
 					enableProcessButton();
 
 				}
 			}
 
 			@Override
-			public void onFailure(@NonNull Call<List<UserTokens>> call, @NonNull Throwable t) {
-
-				Log.e("onFailure-login", t.toString());
-				SnackBar.error(ctx, layoutView, getResources().getString(R.string.malformedJson));
-				enableProcessButton();
+			public void onFailure(@NonNull Call<UserTokens> createUserToken, @NonNull Throwable t) {
 
+				Log.e("onFailure-token", t.toString());
 			}
 		});
-
 	}
 
+
 	private void loadDefaults() {
 
 		if(tinyDB.getString("loginType").equals(LoginType.BASIC.name().toLowerCase())) {

app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java

@@ -11,6 +11,9 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.database.api.RepositoriesApi;
+import org.mian.gitnex.database.models.Repository;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.models.NotificationThread;
 import java.util.List;
 
@@ -24,9 +27,11 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 	private List<NotificationThread> notificationThreads;
 	private OnMoreClickedListener onMoreClickedListener;
 	private OnNotificationClickedListener onNotificationClickedListener;
+	private TinyDB tinyDb;
 
 	public NotificationsAdapter(Context context, List<NotificationThread> notificationThreads, OnMoreClickedListener onMoreClickedListener, OnNotificationClickedListener onNotificationClickedListener) {
 
+		this.tinyDb = new TinyDB(context);
 		this.context = context;
 		this.notificationThreads = notificationThreads;
 		this.onMoreClickedListener = onMoreClickedListener;
@@ -101,7 +106,33 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 
 		}
 
-		holder.frame.setOnClickListener(v -> onNotificationClickedListener.onNotificationClicked(notificationThread));
+		holder.frame.setOnClickListener(v -> {
+
+			onNotificationClickedListener.onNotificationClicked(notificationThread);
+
+			String[] parts = notificationThread.getRepository().getFullname().split("/");
+			final String repoOwner = parts[0];
+			final String repoName = parts[1];
+
+			int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+			RepositoriesApi repositoryData = new RepositoriesApi(context);
+
+			Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+			if(count == 0) {
+
+				long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+				tinyDb.putLong("repositoryId", id);
+
+			}
+			else {
+
+				Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+				tinyDb.putLong("repositoryId", data.getRepositoryId());
+
+			}
+		});
+
 		holder.more.setOnClickListener(v -> onMoreClickedListener.onMoreClicked(notificationThread));
 
 	}

app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java

@@ -76,6 +76,12 @@ public interface ApiInterface {
     @POST("users/{username}/tokens") // create new token with 2fa otp
     Call<UserTokens> createNewTokenWithOTP(@Header("Authorization") String authorization, @Header("X-Gitea-OTP") int loginOTP, @Path("username") String loginUid, @Body UserTokens jsonStr);
 
+	@DELETE("users/{username}/tokens/{token}") // delete token by ID
+	Call<Void> deleteToken(@Header("Authorization") String authorization, @Path("username") String loginUid, @Path("token") int tokenID);
+
+	@DELETE("users/{username}/tokens/{token}") // delete token by ID with 2fa otp
+	Call<Void> deleteTokenWithOTP(@Header("Authorization") String authorization, @Header("X-Gitea-OTP") int loginOTP, @Path("username") String loginUid, @Path("token") int tokenID);
+
     @GET("notifications") // List users's notification threads
     Call<List<NotificationThread>> getNotificationThreads(@Header("Authorization") String token, @Query("all") Boolean all, @Query("status-types") String[] statusTypes, @Query("since") String since, @Query("before") String before, @Query("page") Integer page, @Query("limit") Integer limit);
 

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

@@ -46,7 +46,6 @@
         android:id="@+id/gridView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp"
         android:horizontalSpacing="10dp"
         android:numColumns="4"
         android:columnWidth="80dp"
@@ -58,7 +57,6 @@
         android:id="@+id/noDataStargazers"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
@@ -73,4 +71,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</LinearLayout>
+</LinearLayout>

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

@@ -46,7 +46,6 @@
         android:id="@+id/gridView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp"
         android:horizontalSpacing="10dp"
         android:numColumns="4"
         android:columnWidth="80dp"
@@ -58,7 +57,6 @@
         android:id="@+id/noDataWatchers"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
@@ -73,4 +71,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</LinearLayout>
+</LinearLayout>

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

@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:gravity="center_horizontal"
             android:orientation="vertical">
 
@@ -69,7 +69,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:background="@android:color/transparent"
             android:contentDescription="@string/generalImgContentText"
             app:srcCompat="@drawable/ic_dotted_menu_horizontal" />

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

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:paddingStart="10dp"
+    android:paddingEnd="10dp"
+    android:orientation="vertical"
+    tools:ignore="UseCompoundDrawables">
 
     <ImageView
         android:id="@+id/memberAvatar"

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

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:paddingStart="10dp"
+    android:paddingEnd="10dp"
+    android:orientation="vertical"
+    tools:ignore="UseCompoundDrawables">
 
     <ImageView
         android:id="@+id/memberAvatar"

app/src/main/res/xml/changelog.xml

@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
 
-    <release version="3.0.0" versioncode="300">
-        <change>New: Notifications</change>
-        <change>New: Delete comments</change>
-        <change>New: New file downloader (no permission required)</change>
-        <change>New: Drafts for comments</change>
-        <change>New: New icons set</change>
-        <change>New: Switch branches in File Browser</change>
-        <change>New: Close/open filter Milestones</change>
-        <change>New: New settings screen</change>
-        <change>New: New diff view for PR files</change>
-        <change>New: Cite code in PR diff and comment on it by long press</change>
-        <change>New: Clear cache, configure cache size (settings)</change>
-        <change>New: Delete branch after merge</change>
-        <change>New: Redesigned milestones screen</change>
-        <change>New: Redesigned releases screen</change>
-        <change>New: Quote and reply on issue comment or copy it to clipboard</change>
-        <change>New: Delete draft when comment is posted (enable/disable in settings)</change>
-        <change>New: Change tabs of issues to filters(closed/open)</change>
-        <change>New: Add/remove member from a team</change>
+    <release version="3.0.1" versioncode="301">
+        <change>Bugfix: Fix draft creation when coming from notification</change>
+        <change>Bugfix: Fix logout loop with email logins (drop email support for now, please use login id)</change>
+        <change>Bugfix: Fix token creation bug in some cases</change>
+        <change>Bugfix: Fix stargazers/watchers layout</change>
     </release>
 
 </changelog>

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

@@ -0,0 +1,6 @@
+- Bugfix: Fix draft creation when coming from notification
+- Bugfix: Fix logout loop with email logins (drop email support for now, please use login id)
+- Bugfix: Fix token creation bug in some cases
+- Bugfix: Fix stargazers/watchers layout
+
+https://codeberg.org/gitnex/GitNex/releases