Skip to content

Commit bf429b5

Browse files
author
creepynerd
committed
SSL supported added (unstable). AAC packetizer improved. Some code cleaning.
1 parent 53f5ad9 commit bf429b5

25 files changed

+1509
-637
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ gen/
1212
local.properties
1313
custom_rules.xml
1414
ant.properties
15+
*~

‎AndroidManifest.xml‎

Lines changed: 46 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,60 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
package="net.majorkernelpanic.spydroid"
5-
android:versionCode="700"
6-
android:versionName="7.0">
7-
8-
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14" />
9-
10-
<uses-permission android:name="android.permission.CAMERA"></uses-permission>
11-
<uses-feature android:name="android.hardware.camera" />
12-
<uses-feature android:name="android.hardware.camera.autofocus" />
13-
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
14-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
15-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
16-
<uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission>
17-
<uses-permission android:name="android.permission.WAKE_LOCK"></uses-permission>
18-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
19-
20-
<application android:icon="@drawable/icon" android:label="@string/app_name" android:name="net.majorkernelpanic.spydroid.SpydroidApplication" android:allowBackup="true">
3+
package="net.majorkernelpanic.spydroid"
4+
android:versionCode="800"
5+
android:versionName="8.0" >
6+
7+
<uses-sdk
8+
android:minSdkVersion="9"
9+
android:targetSdkVersion="14" />
10+
11+
<uses-permission android:name="android.permission.CAMERA" >
12+
</uses-permission>
13+
14+
<uses-feature android:name="android.hardware.camera" />
15+
<uses-feature android:name="android.hardware.camera.autofocus" />
16+
17+
<uses-permission android:name="android.permission.INTERNET" />
18+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
19+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
20+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
21+
<uses-permission android:name="android.permission.WAKE_LOCK" />
22+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
23+
24+
<application
25+
android:name="net.majorkernelpanic.spydroid.SpydroidApplication"
26+
android:allowBackup="true"
27+
android:icon="@drawable/icon"
28+
android:label="@string/app_name" >
2129

2230
<activity
23-
android:name="net.majorkernelpanic.spydroid.ui.SpydroidActivity"
24-
android:launchMode="singleInstance"
25-
android:label="@string/app_name">
31+
android:name="net.majorkernelpanic.spydroid.ui.SpydroidActivity"
32+
android:label="@string/app_name"
33+
android:launchMode="singleInstance" >
2634
<intent-filter>
2735
<action android:name="android.intent.action.MAIN" />
36+
2837
<category android:name="android.intent.category.LAUNCHER" />
2938
</intent-filter>
3039
</activity>
31-
<activity android:name="com.google.ads.AdActivity"
32-
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>
33-
<activity android:name="net.majorkernelpanic.spydroid.ui.OptionsActivity"
34-
android:label="@string/options_activity_title">
40+
41+
<activity
42+
android:name="com.google.ads.AdActivity"
43+
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
44+
45+
<activity
46+
android:name="net.majorkernelpanic.spydroid.ui.OptionsActivity"
47+
android:label="@string/options_activity_title" >
3548
</activity>
36-
<activity android:name="net.majorkernelpanic.spydroid.ui.AboutActivity"
37-
android:label="@string/about_activity_title">
49+
50+
<activity
51+
android:name="net.majorkernelpanic.spydroid.ui.AboutActivity"
52+
android:label="@string/about_activity_title" >
3853
</activity>
54+
55+
<service
56+
android:name="net.majorkernelpanic.spydroid.api.CustomHttpServer"/>
3957

4058
</application>
4159

42-
</manifest>
60+
</manifest>

‎libs/sc-light-jdk15on-1.47.0.2.jar‎

1.41 MB
Binary file not shown.

‎libs/scpkix-jdk15on-1.47.0.2.jar‎

587 KB
Binary file not shown.

‎libs/scprov-jdk15on-1.47.0.2.jar‎

965 KB
Binary file not shown.

‎res/values/strings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
<string name="settings21">Port used by the HTTP server</string>
4747
<string name="settings22">Enabled</string>
4848
<string name="settings23">Enable/Disable the HTTP server. Leave it on if you don\'t know what you are doing !</string>
49+
<string name="settings24">Use HTTPS</string>
50+
<string name="settings25">By far more secure, see the FAQ for further information. Do not forget the S.</string>
4951
<string name="page0">Main</string>
5052
<string name="page1">Preview</string>
5153
<string name="page2">About</string>

‎res/xml/preferences.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,14 @@
4949
<PreferenceCategory android:title="@string/settings19" >
5050
<CheckBoxPreference
5151
android:defaultValue="true"
52-
android:key="enable_http"
52+
android:key="http_enabled"
5353
android:summary="@string/settings23"
5454
android:title="@string/settings22" />
55+
<CheckBoxPreference
56+
android:defaultValue="false"
57+
android:key="https_enabled"
58+
android:summary="@string/settings25"
59+
android:title="@string/settings24" />
5560
<EditTextPreference
5661
android:defaultValue="8080"
5762
android:inputType="number"

0 commit comments

Comments
 (0)