github-starred/gitnex
2
0
Fork 0
mirror of https://github.com/gitnex-org/gitnex.git synced 2026-04-25 18:48:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Download a file, allow to use : in labels, update libs, fix download notifications

Browse Source
This commit is contained in:
M M Arif
2023-10-23 22:34:22 +05:00
parent f4b367441f
commit 562b881583
7 changed files with 216 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/build.gradle
View File

@@ -57,9 +57,9 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0-alpha03'
implementation 'androidx.compose.material3:material3:1.2.0-alpha08'
implementation 'androidx.compose.material3:material3-window-size-class:1.2.0-alpha08'
implementation 'com.google.android.material:material:1.11.0-beta01'
implementation 'androidx.compose.material3:material3:1.2.0-alpha10'
implementation 'androidx.compose.material3:material3-window-size-class:1.2.0-alpha10'
implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.legacy:legacy-support-v4:1.0.0"
@@ -99,8 +99,8 @@ dependencies {
implementation 'ch.acra:acra-mail:5.11.2'
implementation 'ch.acra:acra-limiter:5.11.2'
implementation 'ch.acra:acra-notification:5.11.2'
implementation 'androidx.room:room-runtime:2.5.2'
annotationProcessor 'androidx.room:room-compiler:2.5.2'
implementation 'androidx.room:room-runtime:2.6.0'
annotationProcessor 'androidx.room:room-compiler:2.6.0'
implementation "androidx.work:work-runtime:2.8.1"
implementation "io.mikael:urlbuilder:2.0.9"
implementation "org.codeberg.gitnex-garage:emoji-java:v5.1.2"
@@ -110,7 +110,7 @@ dependencies {
implementation 'com.github.chrisvest:stormpot:2.4.2'
implementation 'androidx.browser:browser:1.6.0'
implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation('org.codeberg.gitnex:tea4j-autodeploy:89e78b1585') {
implementation('org.codeberg.gitnex:tea4j-autodeploy:4646f53557') {
exclude module: 'org.apache.oltu.oauth2.common'
}
implementation 'io.github.amrdeveloper:codeview:1.3.8'

4
app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
View File

@@ -168,7 +168,7 @@ public class CreateLabelActivity extends BaseActivity {
return;
}
if (!AppUtil.checkStrings(updateLabelName)) {
if (!AppUtil.checkLabel(updateLabelName)) {
SnackBar.error(
ctx, findViewById(android.R.id.content), getString(R.string.labelNameError));
@@ -205,7 +205,7 @@ public class CreateLabelActivity extends BaseActivity {
return;
}
if (!AppUtil.checkStrings(newLabelName)) {
if (!AppUtil.checkLabel(newLabelName)) {
SnackBar.error(
ctx, findViewById(android.R.id.content), getString(R.string.labelNameError));

29
app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
View File

@@ -21,6 +21,7 @@ import com.vdurmont.emoji.EmojiParser;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Arrays;
import java.util.Objects;
import okhttp3.ResponseBody;
import org.apache.commons.io.FilenameUtils;
import org.gitnex.tea4j.v2.models.ContentsResponse;
@@ -60,7 +61,9 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
OutputStream outputStream =
getContentResolver()
.openOutputStream(result.getData().getData());
.openOutputStream(
Objects.requireNonNull(
result.getData().getData()));
NotificationCompat.Builder builder =
new NotificationCompat.Builder(ctx, ctx.getPackageName())
@@ -108,6 +111,17 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
assert response.body() != null;
builder.setOngoing(false)
.setContentTitle(
getString(
R.string
.fileViewerNotificationTitleFinished))
.setContentText(
getString(
R.string
.fileViewerNotificationDescriptionFinished,
file.getName()));
AppUtil.copyProgress(
response.body().byteStream(),
outputStream,
@@ -120,19 +134,10 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
builder.build());
});
builder.setContentTitle(
getString(
R.string
.fileViewerNotificationTitleFinished))
.setContentText(
getString(
R.string
.fileViewerNotificationDescriptionFinished,
file.getName()));
} catch (IOException ignored) {
builder.setContentTitle(
builder.setOngoing(false)
.setContentTitle(
getString(
R.string
.fileViewerNotificationTitleFailed))

232
app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
View File

@@ -1,5 +1,8 @@
package org.mian.gitnex.activities;
import android.app.Activity;
import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
import android.graphics.Color;
@@ -21,6 +24,7 @@ import android.widget.ScrollView;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.core.app.NotificationCompat;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.text.HtmlCompat;
import androidx.core.widget.ImageViewCompat;
@@ -30,6 +34,8 @@ import com.amulyakhare.textdrawable.TextDrawable;
import com.google.android.material.card.MaterialCardView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.vdurmont.emoji.EmojiParser;
import java.io.IOException;
import java.io.OutputStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -39,6 +45,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import okhttp3.ResponseBody;
import org.apache.commons.io.FilenameUtils;
import org.gitnex.tea4j.v2.models.Attachment;
import org.gitnex.tea4j.v2.models.EditIssueOption;
@@ -69,14 +76,14 @@ import org.mian.gitnex.helpers.AlertDialogs;
import org.mian.gitnex.helpers.AppUtil;
import org.mian.gitnex.helpers.ClickListener;
import org.mian.gitnex.helpers.ColorInverter;
import org.mian.gitnex.helpers.DownloadService;
import org.mian.gitnex.helpers.Constants;
import org.mian.gitnex.helpers.LabelWidthCalculator;
import org.mian.gitnex.helpers.Markdown;
import org.mian.gitnex.helpers.RoundedTransformation;
import org.mian.gitnex.helpers.TimeHelper;
import org.mian.gitnex.helpers.Toasty;
import org.mian.gitnex.helpers.UrlHelper;
import org.mian.gitnex.helpers.contexts.IssueContext;
import org.mian.gitnex.notifications.Notifications;
import org.mian.gitnex.structs.BottomSheetListener;
import org.mian.gitnex.viewmodels.IssueCommentsViewModel;
import org.mian.gitnex.views.ReactionList;
@@ -117,6 +124,13 @@ public class IssueDetailActivity extends BaseActivity
private boolean loadingFinishedIssue = false;
private boolean loadingFinishedPr = false;
private boolean loadingFinishedRepo = false;
private String filename;
private Long filesize;
private String filehash;
private String instanceUrlOnly;
private String token;
private int page = 1;
public ActivityResultLauncher<Intent> editIssueLauncher =
registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(),
@@ -136,7 +150,116 @@ public class IssueDetailActivity extends BaseActivity
}
}
});
private int page = 1;
ActivityResultLauncher<Intent> downloadAttachmentLauncher =
registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(),
result -> {
if (result.getResultCode() == Activity.RESULT_OK) {
assert result.getData() != null;
try {
OutputStream outputStream =
getContentResolver()
.openOutputStream(
Objects.requireNonNull(
result.getData().getData()));
NotificationCompat.Builder builder =
new NotificationCompat.Builder(ctx, ctx.getPackageName())
.setContentTitle(
getString(
R.string
.fileViewerNotificationTitleStarted))
.setContentText(
getString(
R.string
.fileViewerNotificationDescriptionStarted,
filename))
.setSmallIcon(R.drawable.gitnex_transparent)
.setPriority(NotificationCompat.PRIORITY_LOW)
.setChannelId(
Constants.downloadNotificationChannelId)
.setProgress(100, 0, false)
.setOngoing(true);
int notificationId = Notifications.uniqueNotificationId(ctx);
NotificationManager notificationManager =
(NotificationManager)
getSystemService(Context.NOTIFICATION_SERVICE);
notificationManager.notify(notificationId, builder.build());
Thread thread =
new Thread(
() -> {
try {
Call<ResponseBody> call =
RetrofitClient.getWebInterface(
ctx,
instanceUrlOnly)
.getAttachment(filehash);
Response<ResponseBody> response =
call.execute();
assert response.body() != null;
builder.setOngoing(false)
.setContentTitle(
getString(
R.string
.fileViewerNotificationTitleFinished))
.setContentText(
getString(
R.string
.fileViewerNotificationDescriptionFinished,
filename));
AppUtil.copyProgress(
response.body().byteStream(),
outputStream,
filesize,
progress -> {
builder.setProgress(
100, progress, false);
notificationManager.notify(
notificationId,
builder.build());
});
} catch (IOException ignored) {
builder.setOngoing(false)
.setContentTitle(
getString(
R.string
.fileViewerNotificationTitleFailed))
.setContentText(
getString(
R.string
.fileViewerNotificationDescriptionFailed,
filename));
} finally {
builder.setProgress(0, 0, false)
.setOngoing(false);
notificationManager.notify(
notificationId, builder.build());
}
});
thread.start();
} catch (IOException ignored) {
}
}
});
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -155,6 +278,11 @@ public class IssueDetailActivity extends BaseActivity
Objects.requireNonNull(getSupportActionBar()).setTitle(repoName);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
String instanceUrl = ((BaseActivity) ctx).getAccount().getAccount().getInstanceUrl();
instanceUrlOnly = instanceUrl.substring(0, instanceUrl.lastIndexOf("api/v1/"));
token = ((BaseActivity) ctx).getAccount().getAccount().getToken();
materialAlertDialogBuilder =
new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
@@ -201,7 +329,7 @@ public class IssueDetailActivity extends BaseActivity
fetchDataAsync(repoOwner, repoName, issueIndex);
if (getIntent().getStringExtra("openPrDiff") != null
&& getIntent().getStringExtra("openPrDiff").equals("true")) {
&& Objects.equals(getIntent().getStringExtra("openPrDiff"), "true")) {
startActivity(issue.getIntent(ctx, DiffActivity.class));
}
}
@@ -463,7 +591,7 @@ public class IssueDetailActivity extends BaseActivity
if (issue.hasIssue()
&& getIntent().getStringExtra("openedFromLink") != null
&& getIntent().getStringExtra("openedFromLink").equals("true")) {
&& Objects.equals(getIntent().getStringExtra("openedFromLink"), "true")) {
Intent intent = issue.getRepository().getIntent(ctx, RepoDetailActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
@@ -1160,12 +1288,9 @@ public class IssueDetailActivity extends BaseActivity
PicassoService.getInstance(ctx)
.get()
.load(
UrlHelper.appendPath(
getAccount()
.getAccount()
.getInstanceUrl(),
"/attachments/")
+ attachment.get(i).getUuid())
attachment.get(i).getBrowserDownloadUrl()
+ "?token="
+ token)
.placeholder(R.drawable.loader_animated)
.resize(120, 120)
.centerCrop()
@@ -1178,38 +1303,11 @@ public class IssueDetailActivity extends BaseActivity
int finalI1 = i;
materialCardView.setOnClickListener(
v1 -> {
CustomImageViewDialogBinding
imageViewDialogBinding =
CustomImageViewDialogBinding
.inflate(
LayoutInflater
.from(
ctx));
View view = imageViewDialogBinding.getRoot();
materialAlertDialogBuilder.setView(view);
materialAlertDialogBuilder.setNeutralButton(
getString(R.string.close), null);
PicassoService.getInstance(ctx)
.get()
.load(
UrlHelper.appendPath(
getAccount()
.getAccount()
.getInstanceUrl(),
"/attachments/")
+ attachment
.get(finalI1)
.getUuid())
.placeholder(R.drawable.loader_animated)
.resize(0, 1600)
.onlyScaleDown()
.centerCrop()
.error(R.drawable.ic_close)
.into(imageViewDialogBinding.imageView);
materialAlertDialogBuilder.create().show();
});
v1 ->
imageViewDialog(
attachment
.get(finalI1)
.getBrowserDownloadUrl()));
} else {
@@ -1223,19 +1321,10 @@ public class IssueDetailActivity extends BaseActivity
int finalI = i;
materialCardView.setOnClickListener(
v1 -> {
DownloadService downloadService =
new DownloadService();
downloadService.downloadFile(
ctx,
UrlHelper.appendPath(
getAccount()
.getAccount()
.getInstanceUrl(),
"/attachments/")
+ attachment
.get(finalI)
.getUuid(),
attachment.get(finalI).getName());
filesize = attachment.get(finalI).getSize();
filename = attachment.get(finalI).getName();
filehash = attachment.get(finalI).getUuid();
requestFileDownload();
});
}
}
@@ -1250,4 +1339,35 @@ public class IssueDetailActivity extends BaseActivity
@NonNull Call<List<Attachment>> call, @NonNull Throwable t) {}
});
}
private void requestFileDownload() {
Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);
intent.putExtra(Intent.EXTRA_TITLE, filename);
intent.setType("*/*");
downloadAttachmentLauncher.launch(intent);
}
private void imageViewDialog(String url) {
CustomImageViewDialogBinding imageViewDialogBinding =
CustomImageViewDialogBinding.inflate(LayoutInflater.from(ctx));
View view = imageViewDialogBinding.getRoot();
materialAlertDialogBuilder.setView(view);
materialAlertDialogBuilder.setNeutralButton(getString(R.string.close), null);
PicassoService.getInstance(ctx)
.get()
.load(url + "?token=" + token)
.placeholder(R.drawable.loader_animated)
.resize(0, 1600)
.onlyScaleDown()
.centerCrop()
.error(R.drawable.ic_close)
.into(imageViewDialogBinding.imageView);
materialAlertDialogBuilder.create().show();
}
}

9
app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java
View File

@@ -161,6 +161,15 @@ public class RetrofitClient {
((BaseActivity) context).getAccount().getCacheDir(context));
}
public static WebApi getWebInterface(Context context, String url) {
return getWebInterface(
context,
url,
((BaseActivity) context).getAccount().getAuthorization(),
((BaseActivity) context).getAccount().getCacheDir(context));
}
public static ApiInterface getApiInterface(
Context context, String url, String token, File cacheFile) {

8
app/src/main/java/org/mian/gitnex/helpers/AppUtil.java
View File

@@ -293,8 +293,12 @@ public class AppUtil {
return str.matches("^[\\w]+$");
}
public static Boolean checkStrings(String str) { // [a-zA-Z0-9-_. /]
return str.matches("^[\\w .-/]+$");
public static Boolean checkStrings(String str) { // [a-zA-Z0-9-_. ]
return str.matches("^[\\w .-]+$");
}
public static Boolean checkLabel(String str) { // [a-zA-Z0-9-_. /:]
return str.matches("^[\\w .-/:]+$");
}
public static Boolean checkStringsWithAlphaNumericDashDotUnderscore(

32
app/src/main/java/org/mian/gitnex/helpers/DownloadService.java
View File

@@ -1,32 +0,0 @@
package org.mian.gitnex.helpers;
import static android.content.Context.DOWNLOAD_SERVICE;
import android.app.DownloadManager;
import android.content.Context;
import android.net.Uri;
import android.os.Environment;
/**
* @author M M Arif
*/
public class DownloadService {
public void downloadFile(Context ctx, String fileUri, String filename) {
Uri uri = Uri.parse(fileUri);
DownloadManager.Request request = new DownloadManager.Request(uri);
request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, filename);
request.setNotificationVisibility(
DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
request.setMimeType("*/*");
request.setTitle("Downloading " + filename + " via GitNex");
DownloadManager downloadManager = (DownloadManager) ctx.getSystemService(DOWNLOAD_SERVICE);
downloadManager.enqueue(request);
if (DownloadManager.STATUS_SUCCESSFUL == 8) {
Toasty.success(ctx, "Download completed");
}
}
}