yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 03:50:19 +02:00
Code Issues Releases Wiki Activity

CHANGE_WIFI_STATE permission

Browse source
This commit is contained in:
Nikolay Pultsin 2012-01-18 22:37:51 +00:00
parent a04d524f7a
commit b42c6d2b1c
4 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AndroidManifest.xml
View file

@ -6,7 +6,6 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
<application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader">
<activity android:name=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" android:process=":crash" />

1
AndroidManifest.xml.pattern
View file

@ -6,7 +6,6 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
<application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader">
<activity android:name=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" android:process=":crash" />

1
ChangeLog
View file

@ -1,5 +1,6 @@
===== 1.3.4 (??? ??, 2012) =====
* About section in the preferences dialog
* CHANGE_WIFI_STATE permission is not required more
===== 1.3.3 (Jan 18, 2012) =====
* Proguard -dontoptimize option, looks like these optimizations are buggy :(

4
src/org/geometerplus/android/fbreader/network/ScanLocalNetworkActivity.java
View file

@ -83,6 +83,7 @@ public class ScanLocalNetworkActivity extends ListActivity {
errorView.setVisibility(View.VISIBLE);
errorView.setText(myResource.getResource("turnWiFiOn").getValue());
/*
final Button turnOnButton = (Button)buttonView.findViewById(R.id.ok_button);
turnOnButton.setText(buttonResource.getResource("turnOn").getValue());
turnOnButton.setOnClickListener(new View.OnClickListener() {
@ -91,6 +92,9 @@ public class ScanLocalNetworkActivity extends ListActivity {
finish();
}
});
*/
buttonView.findViewById(R.id.ok_button).setVisibility(View.GONE);
cancelButton.setText(buttonResource.getResource("ok").getValue());
myLock = null;
} else {