Compare commits

...

3 Commits

Author SHA1 Message Date
Balazs Toldi
053c9e73b0
Fix parsing Community/post title with "&" characters 2023-08-13 17:03:25 +02:00
Balazs Toldi
acd1aef851
Fix editing post with empty URL field 2023-08-13 16:44:36 +02:00
Balazs Toldi
a3a753a9dd
Add "Nightly" build type variant 2023-08-13 15:57:32 +02:00
4 changed files with 39 additions and 3 deletions

View File

@ -2,6 +2,18 @@ plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}
def getCommitVersionCode = { ->
try {
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'rev-list', 'HEAD', '--count'
standardOutput = stdout
}
return Integer.valueOf(stdout.toString().trim())
} catch (ignored) {
return null
}
}
android {
compileSdk 33
@ -19,10 +31,12 @@ android {
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
minifiedRelease {
initWith buildTypes.release
zipAlignEnabled true
@ -34,6 +48,27 @@ android {
applicationIdSuffix '.debug'
versionNameSuffix ' (DEBUG)'
}
nightly {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
applicationIdSuffix '.nightly'
versionNameSuffix ' (NIGHTLY)'
}
applicationVariants.all { variant ->
variant.resValue "string", "applicationId", variant.applicationId
if (variant.buildType.name == 'nightly' || variant.buildType.name == 'nopebble') {
variant.outputs.all {
setVersionCodeOverride(getCommitVersionCode())
setVersionNameOverride(variant.versionName)
outputFileName = "${applicationId}_${variant.versionName}.apk"
}
}
}
}
sourceSets {
@ -207,3 +242,4 @@ dependencies {
// debugImplementation because LeakCanary should only run in debug builds.
//debugImplementation 'com.squareup.leakcanary:leakcanary-android:x.y'
}

View File

@ -308,7 +308,7 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
isSubmitting = true;
Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_SHORT).show();
mRetrofit.getRetrofit().create(LemmyAPI.class).postUpdate(new EditPostDTO(mPost.getId(), titleEditText.getText().toString(), linkEditText.getText().toString(), contentEditText.getText().toString(), mPost.isNSFW(), null, mAccessToken))
mRetrofit.getRetrofit().create(LemmyAPI.class).postUpdate(new EditPostDTO(mPost.getId(), titleEditText.getText().toString(), (linkEditText.getText().toString().isEmpty()) ? null : linkEditText.getText().toString(), contentEditText.getText().toString(), mPost.isNSFW(), null, mAccessToken))
.enqueue(new Callback<String>() {
@Override
public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {

View File

@ -174,7 +174,7 @@ public class ParsePost {
}
}
String title = post.getString("name");
String title = post.getString("name").replace("&amp;", "&");
String permalink = post.getString("ap_id");
int score = counts.getInt("score");
int upvotes = counts.getInt("upvotes");

View File

@ -34,7 +34,7 @@ public class ParseSubredditData {
return null;
}
String title = community.getString(JSONUtils.TITLE_KEY);
String title = community.getString(JSONUtils.TITLE_KEY).replace("&amp;", "&");
String bannerImageUrl = "";
if (!community.isNull("banner")) {
bannerImageUrl = community.getString("banner");