Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

updated .gitignore

This commit is contained in:
Mariotaku Lee 2014-09-20 13:33:27 +08:00
parent 25464da78c
commit 4eb84d8bd5
4 changed files with 499 additions and 471 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.gitignore vendored
View File

@ -1,6 +1,28 @@
.gradle # Built application files
/local.properties
/.idea/workspace.xml
.DS_Store
/build /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 /signing.properties

14
twidere/src/main/assets/mapview.html
View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Google Maps</title> <title>Google Maps</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" user-scalable="no"/> <meta name="viewport" user-scalable="no"/>
@ -13,7 +13,8 @@
height: 100%; height: 100%;
} }
</style> </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"> <script type="text/javascript">
var map; var map;
function initialize() { function initialize() {
@ -67,9 +68,10 @@
} }
google.maps.event.addDomListener(window, 'load', initialize); google.maps.event.addDomListener(window, 'load', initialize);
</script> </script>
</head> </head>
<body> <body>
<div id="map_canvas"></div> <div id="map_canvas"></div>
</body> </body>
</html> </html>

5
twidere/src/main/java/org/mariotaku/gallery3d/GLImageLoader.java
View File

@ -77,7 +77,7 @@ public class GLImageLoader extends AsyncTaskLoader<GLImageLoader.Result> impleme
@Override @Override
public GLImageLoader.Result loadInBackground() { public GLImageLoader.Result loadInBackground() {
if (mUri == null) { if (mUri == null) {
Result.nullInstance(); return Result.nullInstance();
} }
final String scheme = mUri.getScheme(); final String scheme = mUri.getScheme();
if ("http".equals(scheme) || "https".equals(scheme)) { if ("http".equals(scheme) || "https".equals(scheme)) {
@ -93,7 +93,8 @@ public class GLImageLoader extends AsyncTaskLoader<GLImageLoader.Result> impleme
return Result.nullInstance(); return Result.nullInstance();
try { try {
// from SD cache // 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)); final InputStream is = mDownloader.getStream(url, new AccountExtra(mAccountId));
if (is == null) return Result.nullInstance(); if (is == null) return Result.nullInstance();

33
twidere/src/main/java/org/mariotaku/twidere/app/TwidereApplication.java
View File

@ -19,13 +19,6 @@
package org.mariotaku.twidere.app; 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.app.Application;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; 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.core.download.ImageDownloader;
import com.nostra13.universalimageloader.utils.L; import com.nostra13.universalimageloader.utils.L;
import edu.ucdavis.earlybird.UCDService;
import org.acra.ACRA; import org.acra.ACRA;
import org.acra.ReportField; import org.acra.ReportField;
import org.acra.annotation.ReportsCrashes; 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.imageloader.URLFileNameGenerator;
import org.mariotaku.twidere.util.net.TwidereHostAddressResolver; import org.mariotaku.twidere.util.net.TwidereHostAddressResolver;
import twitter4j.http.HostAddressResolver;
import java.io.File; import java.io.File;
import java.util.Date; import java.util.Date;
import java.util.Locale; 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, @ReportsCrashes(formKey = "", mailTo = Constants.APP_PROJECT_EMAIL, sharedPreferencesMode = Context.MODE_PRIVATE,
sharedPreferencesName = Constants.SHARED_PREFERENCES_NAME) sharedPreferencesName = Constants.SHARED_PREFERENCES_NAME)
public class TwidereApplication extends Application implements Constants, OnSharedPreferenceChangeListener { public class TwidereApplication extends Application implements Constants, OnSharedPreferenceChangeListener {
@ -108,12 +107,12 @@ public class TwidereApplication extends Application implements Constants, OnShar
public DiskCache getDiskCache() { public DiskCache getDiskCache() {
if (mDiskCache != null) return mDiskCache; if (mDiskCache != null) return mDiskCache;
return mDiskCache = getDiskCache(DIR_NAME_IMAGE_CACHE); return mDiskCache = createDiskCache(DIR_NAME_IMAGE_CACHE);
} }
public DiskCache getFullDiskCache() { public DiskCache getFullDiskCache() {
if (mFullDiskCache != null) return mFullDiskCache; if (mFullDiskCache != null) return mFullDiskCache;
return mFullDiskCache = getDiskCache(DIR_NAME_FULL_IMAGE_CACHE); return mFullDiskCache = createDiskCache(DIR_NAME_FULL_IMAGE_CACHE);
} }
public ImageDownloader getFullImageDownloader() { public ImageDownloader getFullImageDownloader() {
@ -258,9 +257,13 @@ public class TwidereApplication extends Application implements Constants, OnShar
ACRA.getErrorReporter().setReportSender(new EmailIntentSender(this)); 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 cacheDir = getBestCacheDir(this, dirName);
final File fallbackCacheDir = getInternalCacheDir(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()); return new UnlimitedDiscCache(cacheDir, fallbackCacheDir, new URLFileNameGenerator());
} }
@ -293,7 +296,7 @@ public class TwidereApplication extends Application implements Constants, OnShar
email.setType("text/plain"); email.setType("text/plain");
email.putExtra(Intent.EXTRA_SUBJECT, String.format("%s Crash Report", getAppName())); email.putExtra(Intent.EXTRA_SUBJECT, String.format("%s Crash Report", getAppName()));
email.putExtra(Intent.EXTRA_TEXT, buildBody(errorContent)); email.putExtra(Intent.EXTRA_TEXT, buildBody(errorContent));
email.putExtra(Intent.EXTRA_EMAIL, new String[] { APP_PROJECT_EMAIL }); email.putExtra(Intent.EXTRA_EMAIL, new String[]{APP_PROJECT_EMAIL});
final Intent chooser = Intent.createChooser(email, mContext.getString(R.string.send_crash_report)); final Intent chooser = Intent.createChooser(email, mContext.getString(R.string.send_crash_report));
chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mContext.startActivity(chooser); mContext.startActivity(chooser);