remove trailing white space...

This commit is contained in:
Hans-Christoph Steiner 2014-02-19 19:59:31 -05:00
parent 3a0d40d86d
commit 301ac10515
5 changed files with 11 additions and 9 deletions

View File

@ -29,7 +29,7 @@ public class AppFilter {
boolean dontFilterRequiringRoot = Preferences.get().filterAppsRequiringRoot(); boolean dontFilterRequiringRoot = Preferences.get().filterAppsRequiringRoot();
if (app.requirements == null || dontFilterRequiringRoot) return false; if (app.requirements == null || dontFilterRequiringRoot) return false;
for (String r : app.requirements) { for (String r : app.requirements) {
if (r.equals("root")) if (r.equals("root"))
return true; return true;

View File

@ -58,6 +58,7 @@ public class FDroidApp extends Application {
private static enum Theme { private static enum Theme {
dark, light dark, light
} }
private static Theme curTheme = Theme.dark; private static Theme curTheme = Theme.dark;
public void reloadTheme() { public void reloadTheme() {
@ -65,6 +66,7 @@ public class FDroidApp extends Application {
.getDefaultSharedPreferences(getBaseContext()) .getDefaultSharedPreferences(getBaseContext())
.getString(Preferences.PREF_THEME, "dark")); .getString(Preferences.PREF_THEME, "dark"));
} }
public void applyTheme(Activity activity) { public void applyTheme(Activity activity) {
switch (curTheme) { switch (curTheme) {
case dark: case dark:
@ -147,16 +149,16 @@ public class FDroidApp extends Application {
try { try {
SSLContext sc = SSLContext.getInstance("TLS"); SSLContext sc = SSLContext.getInstance("TLS");
X509TrustManager defaultTrustManager = null; X509TrustManager defaultTrustManager = null;
/* /*
* init a trust manager factory with a null keystore to access the system trust managers * init a trust manager factory with a null keystore to access the system trust managers
*/ */
TrustManagerFactory tmf = TrustManagerFactory tmf =
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
KeyStore ks = null; KeyStore ks = null;
tmf.init(ks); tmf.init(ks);
TrustManager[] mgrs = tmf.getTrustManagers(); TrustManager[] mgrs = tmf.getTrustManagers();
if(mgrs.length > 0 && mgrs[0] instanceof X509TrustManager) if(mgrs.length > 0 && mgrs[0] instanceof X509TrustManager)
defaultTrustManager = (X509TrustManager) mgrs[0]; defaultTrustManager = (X509TrustManager) mgrs[0];
@ -166,7 +168,7 @@ public class FDroidApp extends Application {
*/ */
PinningTrustManager pinMgr = new PinningTrustManager(SystemKeyStore.getInstance(ctx),FDroidCertPins.getPinList(), 0); PinningTrustManager pinMgr = new PinningTrustManager(SystemKeyStore.getInstance(ctx),FDroidCertPins.getPinList(), 0);
MemorizingTrustManager memMgr = new MemorizingTrustManager(ctx, pinMgr, defaultTrustManager); MemorizingTrustManager memMgr = new MemorizingTrustManager(ctx, pinMgr, defaultTrustManager);
/* /*
* initialize a SSLContext with the outermost trust manager, use this * initialize a SSLContext with the outermost trust manager, use this
* context to set the default SSL socket factory for the HTTPSURLConnection * context to set the default SSL socket factory for the HTTPSURLConnection

View File

@ -31,8 +31,8 @@ public class FDroidCertPins {
* SPKI Pin: 638F93856E1F5EDFCBD40C46D4160CFF21B0713A * SPKI Pin: 638F93856E1F5EDFCBD40C46D4160CFF21B0713A
*/ */
"638F93856E1F5EDFCBD40C46D4160CFF21B0713A", "638F93856E1F5EDFCBD40C46D4160CFF21B0713A",
/* /*
* SubjectDN: CN=guardianproject.info, OU=Gandi Standard SSL, OU=Domain Control Validated * SubjectDN: CN=guardianproject.info, OU=Gandi Standard SSL, OU=Domain Control Validated
* IssuerDN: CN=Gandi Standard SSL CA, O=GANDI SAS, C=FR * IssuerDN: CN=Gandi Standard SSL CA, O=GANDI SAS, C=FR
* Fingerprint: 187C2573E924DFCBFF2A781A2F99D71C6E031828 * Fingerprint: 187C2573E924DFCBFF2A781A2F99D71C6E031828

View File

@ -248,7 +248,7 @@ abstract public class RepoUpdater {
+ repo.version + " to " + handler.getVersion()); + repo.version + " to " + handler.getVersion());
values.put(RepoProvider.DataColumns.VERSION, handler.getVersion()); values.put(RepoProvider.DataColumns.VERSION, handler.getVersion());
} }
if (handler.getMaxAge() != -1 && handler.getMaxAge() != repo.maxage) { if (handler.getMaxAge() != -1 && handler.getMaxAge() != repo.maxage) {
Log.d("FDroid", Log.d("FDroid",
"Repo specified a new maximum age - updated"); "Repo specified a new maximum age - updated");

View File

@ -231,7 +231,7 @@ public class ApkProviderTest extends FDroidProviderTest<ApkProvider> {
ApkProvider.DataColumns.APK_ID, ApkProvider.DataColumns.APK_ID,
ApkProvider.DataColumns.VERSION_CODE ApkProvider.DataColumns.VERSION_CODE
}; };
Cursor cursor = getMockContentResolver().query(uri, projections, null, null, null); Cursor cursor = getMockContentResolver().query(uri, projections, null, null, null);
cursor.moveToFirst(); cursor.moveToFirst();
Apk apk = new Apk(cursor); Apk apk = new Apk(cursor);