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

removed obsolete scheme

Browse source
This commit is contained in:
Nikolay Pultsin 2015-05-20 00:25:01 +01:00
parent b27344fcff
commit 0fee6dc2ff
3 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
AndroidManifest.xml
View file

@ -217,11 +217,6 @@
</activity> </activity>
<activity android:name="org.geometerplus.android.fbreader.TOCActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize"/> <activity android:name="org.geometerplus.android.fbreader.TOCActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize"/>
<activity android:name="org.geometerplus.android.fbreader.preferences.PreferenceActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize" android:process=":preferences"> <activity android:name="org.geometerplus.android.fbreader.preferences.PreferenceActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize" android:process=":preferences">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:scheme="fbreader-preferences"/>
</intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.fbreader.action.PREFERENCES"/> <action android:name="android.fbreader.action.PREFERENCES"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>

5
AndroidManifest.xml.pattern
View file

@ -217,11 +217,6 @@
</activity> </activity>
<activity android:name="org.geometerplus.android.fbreader.TOCActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize"/> <activity android:name="org.geometerplus.android.fbreader.TOCActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize"/>
<activity android:name="org.geometerplus.android.fbreader.preferences.PreferenceActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize" android:process=":preferences"> <activity android:name="org.geometerplus.android.fbreader.preferences.PreferenceActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize" android:process=":preferences">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:scheme="fbreader-preferences"/>
</intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.fbreader.action.PREFERENCES"/> <action android:name="android.fbreader.action.PREFERENCES"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>

8
src/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java
View file

@ -135,13 +135,7 @@ abstract class ZLPreferenceActivity extends android.preference.PreferenceActivit
final Intent intent = getIntent(); final Intent intent = getIntent();
final Uri data = intent.getData(); final Uri data = intent.getData();
final String screenId; final String screenId = intent.getStringExtra(SCREEN_KEY);
if (Intent.ACTION_VIEW.equals(intent.getAction())
&& data != null && "fbreader-preferences".equals(data.getScheme())) {
screenId = data.getEncodedSchemeSpecificPart();
} else {
screenId = intent.getStringExtra(SCREEN_KEY);
}
Config.Instance().runOnConnect(new Runnable() { Config.Instance().runOnConnect(new Runnable() {
public void run() { public void run() {