Remove MemorizingTrustManager, not used right now

This commit is contained in:
Daniel Martí 2015-03-31 20:31:51 +02:00
parent c81eb9ec69
commit 246d1c5f32
7 changed files with 0 additions and 24 deletions

4
.gitmodules vendored
View File

@ -1,7 +1,3 @@
[submodule "extern/MemorizingTrustManager"]
path = extern/MemorizingTrustManager
url = https://github.com/ge0rg/MemorizingTrustManager.git
ignore = dirty
[submodule "extern/Support"] [submodule "extern/Support"]
path = extern/Support path = extern/Support
url = https://android.googlesource.com/platform/frameworks/support url = https://android.googlesource.com/platform/frameworks/support

View File

@ -404,11 +404,6 @@
android:resource="@xml/searchable" /> android:resource="@xml/searchable" />
</activity> </activity>
<!--Used for SSL TOFU, supported by extern/MemorizingTrustManager lib -->
<activity
android:name="de.duenndns.ssl.MemorizingActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
<receiver android:name=".receiver.StartupReceiver" > <receiver android:name=".receiver.StartupReceiver" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" /> <action android:name="android.intent.action.BOOT_COMPLETED" />

View File

@ -32,8 +32,6 @@ android update lib-project --path $EXTERN/UniversalImageLoader/library
android update lib-project --path $EXTERN/AndroidPinning android update lib-project --path $EXTERN/AndroidPinning
android update lib-project --path $EXTERN/MemorizingTrustManager
android update lib-project --path $EXTERN/libsuperuser/libsuperuser android update lib-project --path $EXTERN/libsuperuser/libsuperuser
android update lib-project --path $EXTERN/zxing-core android update lib-project --path $EXTERN/zxing-core

View File

@ -39,10 +39,6 @@ if ( !hasProperty( 'sourceDeps' ) ) {
// Upstream doesn't have a binary on mavenCentral. // Upstream doesn't have a binary on mavenCentral.
compile(name: 'zipsigner') compile(name: 'zipsigner')
// Upstream doesn't have a binary on mavenCentral, but we are currently not using this
// library due to bugs anyway. In the future, it will likely get included again though.
// compile(name: 'MemorizingTrustManager-release', ext: 'aar')
} }
} else { } else {
@ -80,9 +76,6 @@ if ( !hasProperty( 'sourceDeps' ) ) {
compile 'com.android.support:support-v4:20.0.+', compile 'com.android.support:support-v4:20.0.+',
'com.android.support:appcompat-v7:20.0.+', 'com.android.support:appcompat-v7:20.0.+',
'com.android.support:support-annotations:20.0.+' 'com.android.support:support-annotations:20.0.+'
// Removed for now, until it is reimplemented.
// compile project(':extern:MemorizingTrustManager')
} }
} }
@ -108,9 +101,6 @@ task binaryDeps(type: Copy, dependsOn: ':F-Droid:prepareReleaseDependencies') {
'nanohttpd/core/build/libs/nanohttpd-2.1.0.jar', 'nanohttpd/core/build/libs/nanohttpd-2.1.0.jar',
'zipsigner/build/libs/zipsigner.jar', 'zipsigner/build/libs/zipsigner.jar',
'Support/v4/build/libs/support-v4.jar' 'Support/v4/build/libs/support-v4.jar'
// Removed for now, until it is reimplemented.
// 'MemorizingTrustManager/build/outputs/aar/MemorizingTrustManager-release.aar'
} }
into 'libs/binaryDeps' into 'libs/binaryDeps'

View File

@ -1,7 +1,6 @@
target=android-21 target=android-21
android.library.reference.1=../extern/UniversalImageLoader/library android.library.reference.1=../extern/UniversalImageLoader/library
android.library.reference.2=../extern/MemorizingTrustManager
android.library.reference.3=../extern/AndroidPinning android.library.reference.3=../extern/AndroidPinning
android.library.reference.4=../extern/libsuperuser/libsuperuser android.library.reference.4=../extern/libsuperuser/libsuperuser
android.library.reference.5=../extern/zxing-core android.library.reference.5=../extern/zxing-core

@ -1 +0,0 @@
Subproject commit 36f86bd1592671a1eb28264e1f6c81c7173d4b9b

View File

@ -3,7 +3,6 @@ include ':F-Droid'
if ( hasProperty( 'sourceDeps' ) ) { if ( hasProperty( 'sourceDeps' ) ) {
include ':extern:AndroidPinning' include ':extern:AndroidPinning'
include ':extern:UniversalImageLoader:library' include ':extern:UniversalImageLoader:library'
include ':extern:MemorizingTrustManager'
include ':extern:libsuperuser:libsuperuser' include ':extern:libsuperuser:libsuperuser'
include ':extern:nanohttpd:core' include ':extern:nanohttpd:core'
include ':extern:jmdns' include ':extern:jmdns'