updated .gitignore
This commit is contained in:
parent
25464da78c
commit
4eb84d8bd5
|
@ -1,6 +1,28 @@
|
|||
.gradle
|
||||
/local.properties
|
||||
/.idea/workspace.xml
|
||||
.DS_Store
|
||||
# Built application files
|
||||
/build
|
||||
|
||||
# Local configuration file (sdk path, etc)
|
||||
local.properties
|
||||
|
||||
# Gradle generated files
|
||||
/gradle
|
||||
.gradle/
|
||||
|
||||
# Signing files
|
||||
.signing/
|
||||
|
||||
# User-specific configurations
|
||||
/.idea
|
||||
*.iml
|
||||
|
||||
# OS-specific files
|
||||
.DS_Store
|
||||
.DS_Store?
|
||||
._*
|
||||
.Spotlight-V100
|
||||
.Trashes
|
||||
ehthumbs.db
|
||||
Thumbs.db
|
||||
|
||||
# Private files
|
||||
/signing.properties
|
|
@ -13,7 +13,8 @@
|
|||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?sensor=true"></script>
|
||||
<script type="text/javascript"
|
||||
src="http://maps.googleapis.com/maps/api/js?sensor=true"></script>
|
||||
<script type="text/javascript">
|
||||
var map;
|
||||
function initialize() {
|
||||
|
@ -67,6 +68,7 @@
|
|||
}
|
||||
|
||||
google.maps.event.addDomListener(window, 'load', initialize);
|
||||
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
|
|
|
@ -77,7 +77,7 @@ public class GLImageLoader extends AsyncTaskLoader<GLImageLoader.Result> impleme
|
|||
@Override
|
||||
public GLImageLoader.Result loadInBackground() {
|
||||
if (mUri == null) {
|
||||
Result.nullInstance();
|
||||
return Result.nullInstance();
|
||||
}
|
||||
final String scheme = mUri.getScheme();
|
||||
if ("http".equals(scheme) || "https".equals(scheme)) {
|
||||
|
@ -93,7 +93,8 @@ public class GLImageLoader extends AsyncTaskLoader<GLImageLoader.Result> impleme
|
|||
return Result.nullInstance();
|
||||
try {
|
||||
// from SD cache
|
||||
if (ImageValidator.checkImageValidity(cacheFile)) return decodeImageInternal(cacheFile);
|
||||
if (ImageValidator.checkImageValidity(cacheFile))
|
||||
return decodeImageInternal(cacheFile);
|
||||
|
||||
final InputStream is = mDownloader.getStream(url, new AccountExtra(mAccountId));
|
||||
if (is == null) return Result.nullInstance();
|
||||
|
|
|
@ -19,13 +19,6 @@
|
|||
|
||||
package org.mariotaku.twidere.app;
|
||||
|
||||
import static org.mariotaku.twidere.util.UserColorNicknameUtils.initUserColor;
|
||||
import static org.mariotaku.twidere.util.Utils.getBestCacheDir;
|
||||
import static org.mariotaku.twidere.util.Utils.getInternalCacheDir;
|
||||
import static org.mariotaku.twidere.util.Utils.initAccountColor;
|
||||
import static org.mariotaku.twidere.util.Utils.startProfilingServiceIfNeeded;
|
||||
import static org.mariotaku.twidere.util.Utils.startRefreshServiceIfNeeded;
|
||||
|
||||
import android.app.Application;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
|
@ -48,8 +41,6 @@ import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
|
|||
import com.nostra13.universalimageloader.core.download.ImageDownloader;
|
||||
import com.nostra13.universalimageloader.utils.L;
|
||||
|
||||
import edu.ucdavis.earlybird.UCDService;
|
||||
|
||||
import org.acra.ACRA;
|
||||
import org.acra.ReportField;
|
||||
import org.acra.annotation.ReportsCrashes;
|
||||
|
@ -75,12 +66,20 @@ import org.mariotaku.twidere.util.imageloader.TwidereImageDownloader;
|
|||
import org.mariotaku.twidere.util.imageloader.URLFileNameGenerator;
|
||||
import org.mariotaku.twidere.util.net.TwidereHostAddressResolver;
|
||||
|
||||
import twitter4j.http.HostAddressResolver;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Date;
|
||||
import java.util.Locale;
|
||||
|
||||
import edu.ucdavis.earlybird.UCDService;
|
||||
import twitter4j.http.HostAddressResolver;
|
||||
|
||||
import static org.mariotaku.twidere.util.UserColorNicknameUtils.initUserColor;
|
||||
import static org.mariotaku.twidere.util.Utils.getBestCacheDir;
|
||||
import static org.mariotaku.twidere.util.Utils.getInternalCacheDir;
|
||||
import static org.mariotaku.twidere.util.Utils.initAccountColor;
|
||||
import static org.mariotaku.twidere.util.Utils.startProfilingServiceIfNeeded;
|
||||
import static org.mariotaku.twidere.util.Utils.startRefreshServiceIfNeeded;
|
||||
|
||||
@ReportsCrashes(formKey = "", mailTo = Constants.APP_PROJECT_EMAIL, sharedPreferencesMode = Context.MODE_PRIVATE,
|
||||
sharedPreferencesName = Constants.SHARED_PREFERENCES_NAME)
|
||||
public class TwidereApplication extends Application implements Constants, OnSharedPreferenceChangeListener {
|
||||
|
@ -108,12 +107,12 @@ public class TwidereApplication extends Application implements Constants, OnShar
|
|||
|
||||
public DiskCache getDiskCache() {
|
||||
if (mDiskCache != null) return mDiskCache;
|
||||
return mDiskCache = getDiskCache(DIR_NAME_IMAGE_CACHE);
|
||||
return mDiskCache = createDiskCache(DIR_NAME_IMAGE_CACHE);
|
||||
}
|
||||
|
||||
public DiskCache getFullDiskCache() {
|
||||
if (mFullDiskCache != null) return mFullDiskCache;
|
||||
return mFullDiskCache = getDiskCache(DIR_NAME_FULL_IMAGE_CACHE);
|
||||
return mFullDiskCache = createDiskCache(DIR_NAME_FULL_IMAGE_CACHE);
|
||||
}
|
||||
|
||||
public ImageDownloader getFullImageDownloader() {
|
||||
|
@ -258,9 +257,13 @@ public class TwidereApplication extends Application implements Constants, OnShar
|
|||
ACRA.getErrorReporter().setReportSender(new EmailIntentSender(this));
|
||||
}
|
||||
|
||||
private DiskCache getDiskCache(final String dirName) {
|
||||
private DiskCache createDiskCache(final String dirName) {
|
||||
final File cacheDir = getBestCacheDir(this, dirName);
|
||||
final File fallbackCacheDir = getInternalCacheDir(this, dirName);
|
||||
// final LruDiscCache discCache = new LruDiscCache(cacheDir, new URLFileNameGenerator(), 384 *
|
||||
// 1024 * 1024);
|
||||
// discCache.setReserveCacheDir(fallbackCacheDir);
|
||||
// return discCache;
|
||||
return new UnlimitedDiscCache(cacheDir, fallbackCacheDir, new URLFileNameGenerator());
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue