Skip to content

Commit

Permalink
Decrease check interval
Browse files Browse the repository at this point in the history
  • Loading branch information
gsantner committed Sep 26, 2017
1 parent 09b2fb8 commit e23ffb2
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### v1.2.6
### v1.2.7
- Dont include assets at buildtime (fixes #30)
- Download assets at runtime (github assets)
- Allows updating assets
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

# MemeTastic
<img src="/app/src/main/ic_launcher-web.png" align="left" width="100" hspace="10" vspace="10">
<b>Simple Meme Creator</b> which allows to download most common templates. Completly ad-free,
and adds no watermarks. Memes can be created from templates downloaded from the MemeTastic archive,
<b>Simple Meme Creator</b>. Completly ad-free, and adds no watermarks.
Memes can be created from templates downloaded from the MemeTastic archive,
from pictures shared into the app and pictures from gallery & camera.

<div style="display:flex;" >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void setFontToAll(MemeData.Font font) {
}
}

public static class EditorCaption {
public static class EditorCaption implements Serializable {
private MemeConfig.Caption _captionConf;
private MemeData.Font _font = null; // !serializable

Expand Down Expand Up @@ -163,7 +163,7 @@ public void setImgText(MemeConfig.Caption captionConf) {
}


public static class EditorImage {
public static class EditorImage implements Serializable {
private Bitmap _image = null;
private Bitmap _displayImage = null;
private int _rotationDeg = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public static ContextUtils get() {

public static void checkForAssetUpdates(Context context) {
new MigrationThread(context).start();
Date fiveDaysAgo = new Date(System.currentTimeMillis() - 5 * 1000 * 60 * 60 * 24);
if (AppSettings.get().getLastAssetArchiveCheckDate().before(fiveDaysAgo)) {
Date sevenDaysAgo = new Date(System.currentTimeMillis() - 7 * 1000 * 60 * 60 * 24);
if (AppSettings.get().getLastAssetArchiveCheckDate().before(sevenDaysAgo)) {
new AssetUpdater.UpdateThread(context, false).start();
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/net/gsantner/opoc/util/ContextUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ public Bitmap loadImageFromFilesystem(File imagePath, int maxDimen) {
* @return the scaling factor that needs to be applied to the bitmap
*/
public int calculateInSampleSize(BitmapFactory.Options options, int maxDimen) {
// Raw height and width of conf
// Raw height and width of image
int height = options.outHeight;
int width = options.outWidth;
int inSampleSize = 1;
Expand Down Expand Up @@ -429,7 +429,7 @@ public File writeImageToFile(File imageFile, Bitmap image, CompressFormat format
if (folder.exists() || folder.mkdirs()) {
FileOutputStream stream = null;
try {
stream = new FileOutputStream(imageFile); // overwrites this conf every time
stream = new FileOutputStream(imageFile); // overwrites this image every time
image.compress(format, quality, stream);
return imageFile;
} catch (FileNotFoundException ignored) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/net/gsantner/opoc/util/ZipUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public static boolean unzip(final InputStream input, final File destRootFolder,
}

// TODO Maybe there's a way to avoid reading the zip twice,
// but ZipEntry.getSize() may return -1 so we can't just cace the ZipEntries
// but ZipEntry.getSize() may return -1 so we can't just cache the ZipEntries
private static long getZipLength(final File zipFile) {
int count;
long totalSize = 0;
Expand Down
2 changes: 1 addition & 1 deletion metadata

0 comments on commit e23ffb2

Please sign in to comment.