remove trailing white space...
This commit is contained in:
parent
3a0d40d86d
commit
301ac10515
src/org/fdroid/fdroid
test/src/org/fdroid/fdroid
@ -29,7 +29,7 @@ public class AppFilter {
|
||||
boolean dontFilterRequiringRoot = Preferences.get().filterAppsRequiringRoot();
|
||||
|
||||
if (app.requirements == null || dontFilterRequiringRoot) return false;
|
||||
|
||||
|
||||
for (String r : app.requirements) {
|
||||
if (r.equals("root"))
|
||||
return true;
|
||||
|
@ -58,6 +58,7 @@ public class FDroidApp extends Application {
|
||||
private static enum Theme {
|
||||
dark, light
|
||||
}
|
||||
|
||||
private static Theme curTheme = Theme.dark;
|
||||
|
||||
public void reloadTheme() {
|
||||
@ -65,6 +66,7 @@ public class FDroidApp extends Application {
|
||||
.getDefaultSharedPreferences(getBaseContext())
|
||||
.getString(Preferences.PREF_THEME, "dark"));
|
||||
}
|
||||
|
||||
public void applyTheme(Activity activity) {
|
||||
switch (curTheme) {
|
||||
case dark:
|
||||
@ -147,16 +149,16 @@ public class FDroidApp extends Application {
|
||||
try {
|
||||
SSLContext sc = SSLContext.getInstance("TLS");
|
||||
X509TrustManager defaultTrustManager = null;
|
||||
|
||||
|
||||
/*
|
||||
* init a trust manager factory with a null keystore to access the system trust managers
|
||||
*/
|
||||
TrustManagerFactory tmf =
|
||||
TrustManagerFactory tmf =
|
||||
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
|
||||
KeyStore ks = null;
|
||||
tmf.init(ks);
|
||||
TrustManager[] mgrs = tmf.getTrustManagers();
|
||||
|
||||
|
||||
if(mgrs.length > 0 && mgrs[0] instanceof X509TrustManager)
|
||||
defaultTrustManager = (X509TrustManager) mgrs[0];
|
||||
|
||||
@ -166,7 +168,7 @@ public class FDroidApp extends Application {
|
||||
*/
|
||||
PinningTrustManager pinMgr = new PinningTrustManager(SystemKeyStore.getInstance(ctx),FDroidCertPins.getPinList(), 0);
|
||||
MemorizingTrustManager memMgr = new MemorizingTrustManager(ctx, pinMgr, defaultTrustManager);
|
||||
|
||||
|
||||
/*
|
||||
* initialize a SSLContext with the outermost trust manager, use this
|
||||
* context to set the default SSL socket factory for the HTTPSURLConnection
|
||||
|
@ -31,8 +31,8 @@ public class FDroidCertPins {
|
||||
* SPKI Pin: 638F93856E1F5EDFCBD40C46D4160CFF21B0713A
|
||||
*/
|
||||
"638F93856E1F5EDFCBD40C46D4160CFF21B0713A",
|
||||
|
||||
/*
|
||||
|
||||
/*
|
||||
* SubjectDN: CN=guardianproject.info, OU=Gandi Standard SSL, OU=Domain Control Validated
|
||||
* IssuerDN: CN=Gandi Standard SSL CA, O=GANDI SAS, C=FR
|
||||
* Fingerprint: 187C2573E924DFCBFF2A781A2F99D71C6E031828
|
||||
|
@ -248,7 +248,7 @@ abstract public class RepoUpdater {
|
||||
+ repo.version + " to " + handler.getVersion());
|
||||
values.put(RepoProvider.DataColumns.VERSION, handler.getVersion());
|
||||
}
|
||||
|
||||
|
||||
if (handler.getMaxAge() != -1 && handler.getMaxAge() != repo.maxage) {
|
||||
Log.d("FDroid",
|
||||
"Repo specified a new maximum age - updated");
|
||||
|
@ -231,7 +231,7 @@ public class ApkProviderTest extends FDroidProviderTest<ApkProvider> {
|
||||
ApkProvider.DataColumns.APK_ID,
|
||||
ApkProvider.DataColumns.VERSION_CODE
|
||||
};
|
||||
|
||||
|
||||
Cursor cursor = getMockContentResolver().query(uri, projections, null, null, null);
|
||||
cursor.moveToFirst();
|
||||
Apk apk = new Apk(cursor);
|
||||
|
Loading…
x
Reference in New Issue
Block a user