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

repackaging: network.auth subpackage

Browse source
This commit is contained in:
Nikolay Pultsin 2014-07-20 17:43:38 +01:00
parent a2b16f350b
commit 44597168a5
11 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -232,7 +232,7 @@
</intent-filter>
<meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
</activity>
<activity android:name="org.geometerplus.android.fbreader.network.WebAuthorisationScreen" android:process=":networkLibrary" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize" android:exported="false"/>
<activity android:name="org.geometerplus.android.fbreader.network.auth.WebAuthorisationScreen" android:process=":networkLibrary" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize" android:exported="false"/>
<activity android:name="org.geometerplus.android.fbreader.network.NetworkLibraryPrimaryActivity" android:process=":networkLibrary" android:launchMode="singleTask" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.network.NetworkSearchActivity"/>
<intent-filter>

2
AndroidManifest.xml.pattern
View file

@ -232,7 +232,7 @@
</intent-filter>
<meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
</activity>
<activity android:name="org.geometerplus.android.fbreader.network.WebAuthorisationScreen" android:process=":networkLibrary" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize" android:exported="false"/>
<activity android:name="org.geometerplus.android.fbreader.network.auth.WebAuthorisationScreen" android:process=":networkLibrary" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize" android:exported="false"/>
<activity android:name="org.geometerplus.android.fbreader.network.NetworkLibraryPrimaryActivity" android:process=":networkLibrary" android:launchMode="singleTask" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.network.NetworkSearchActivity"/>
<intent-filter>

1
src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
View file

@ -40,6 +40,7 @@ import org.geometerplus.fbreader.network.opds.OPDSCustomNetworkLink;
import org.geometerplus.fbreader.network.urlInfo.*;
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.network.auth.ActivityNetworkContext;
import org.geometerplus.android.util.UIUtil;
public class AddCustomCatalogActivity extends Activity {

1
src/org/geometerplus/android/fbreader/network/BookDownloaderService.java
View file

@ -40,6 +40,7 @@ import org.geometerplus.fbreader.network.urlInfo.BookUrlInfo;
import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
import org.geometerplus.android.fbreader.network.auth.ServiceNetworkContext;
public class BookDownloaderService extends Service {
private final ZLNetworkContext myNetworkContext = new ServiceNetworkContext(this);

1
src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
View file

@ -51,6 +51,7 @@ import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.fbreader.network.action.NetworkBookActions;
import org.geometerplus.android.fbreader.network.action.OpenCatalogAction;
import org.geometerplus.android.fbreader.network.auth.ActivityNetworkContext;
import org.geometerplus.android.fbreader.util.AndroidImageSynchronizer;
import org.geometerplus.android.util.UIUtil;

1
src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
View file

@ -42,6 +42,7 @@ import org.geometerplus.fbreader.tree.FBTree;
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.network.action.*;
import org.geometerplus.android.fbreader.network.auth.ActivityNetworkContext;
import org.geometerplus.android.fbreader.tree.TreeActivity;
import org.geometerplus.android.util.UIUtil;

3
src/org/geometerplus/android/fbreader/network/ActivityNetworkContext.java → src/org/geometerplus/android/fbreader/network/auth/ActivityNetworkContext.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA.
*/
package org.geometerplus.android.fbreader.network;
package org.geometerplus.android.fbreader.network.auth;
import java.io.*;
import java.net.URI;
@ -40,6 +40,7 @@ import org.apache.http.impl.cookie.BasicClientCookie2;
import org.geometerplus.zlibrary.core.network.*;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
public final class ActivityNetworkContext extends AndroidNetworkContext {
private final Activity myActivity;

2
src/org/geometerplus/android/fbreader/network/AndroidNetworkContext.java → src/org/geometerplus/android/fbreader/network/auth/AndroidNetworkContext.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA.
*/
package org.geometerplus.android.fbreader.network;
package org.geometerplus.android.fbreader.network.auth;
import java.net.URI;
import java.util.Map;

2
src/org/geometerplus/android/fbreader/network/ServiceNetworkContext.java → src/org/geometerplus/android/fbreader/network/auth/ServiceNetworkContext.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA.
*/
package org.geometerplus.android.fbreader.network;
package org.geometerplus.android.fbreader.network.auth;
import java.net.URI;
import java.util.Map;

3
src/org/geometerplus/android/fbreader/network/WebAuthorisationScreen.java → src/org/geometerplus/android/fbreader/network/auth/WebAuthorisationScreen.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA.
*/
package org.geometerplus.android.fbreader.network;
package org.geometerplus.android.fbreader.network.auth;
import java.util.HashMap;
@ -31,6 +31,7 @@ import android.view.Window;
import android.webkit.*;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
public class WebAuthorisationScreen extends Activity {
@Override

2
src/org/geometerplus/android/fbreader/synchroniser/SynchroniserService.java
View file

@ -33,7 +33,7 @@ import org.geometerplus.zlibrary.core.network.*;
import org.geometerplus.zlibrary.ui.android.network.SQLiteCookieDatabase;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
import org.geometerplus.android.fbreader.network.ServiceNetworkContext;
import org.geometerplus.android.fbreader.network.auth.ServiceNetworkContext;
public class SynchroniserService extends Service implements IBookCollection.Listener, Runnable {
private final ZLNetworkContext myNetworkContext = new ServiceNetworkContext(this);