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

misc fixes

Browse source
This commit is contained in:
Nikolay Pultsin 2010-12-23 05:07:52 +00:00
parent b4f14df970
commit 98470c95ae
3 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/litres/buildSignedJar.sh
View file

@ -1,15 +0,0 @@
#!/bin/sh
tools_dir=~/android-sdk-mac_x86/tools
signed_jar=bin/FBReaderJ-plugin-litres.apk
unsigned_jar=bin/FBReaderJ-plugin-litres-unsigned.apk
if ant package; then
rm -f $signed_jar
jarsigner -storepass tinstaafl -keystore ~/.android/geometerplus.keystore $unsigned_jar geometerplus
$tools_dir/zipalign -v 4 $unsigned_jar $signed_jar
if [ $# -eq 1 -a "$1" == "install" ]; then
$tools_dir/adb install -r $signed_jar
fi
fi

2
src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
View file

@ -444,7 +444,7 @@ class NetworkCatalogActions extends NetworkTreeActions {
}
private void processExtraData(final NetworkBaseActivity activity, Map<String,String> extraData, final Runnable postRunnable) {
if (!extraData.isEmpty()) {
if (extraData != null && !extraData.isEmpty()) {
runInstallPluginDialog(activity, extraData, postRunnable);
} else {
postRunnable.run();

12
src/org/geometerplus/android/fbreader/network/Util.java
View file

@ -20,6 +20,7 @@
package org.geometerplus.android.fbreader.network;
import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.net.Uri;
@ -30,10 +31,13 @@ import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationMan
abstract class Util implements UserRegistrationConstants {
static void runRegistrationDialog(Activity activity, INetworkLink link) {
activity.startActivityForResult(new Intent(
"android.fbreader.action.NETWORK_LIBRARY_REGISTER",
Uri.parse(link.getLink(INetworkLink.URL_SIGN_UP))
), USER_REGISTRATION_REQUEST_CODE);
try {
activity.startActivityForResult(new Intent(
"android.fbreader.action.NETWORK_LIBRARY_REGISTER",
Uri.parse(link.getLink(INetworkLink.URL_SIGN_UP))
), USER_REGISTRATION_REQUEST_CODE);
} catch (ActivityNotFoundException e) {
}
}
static void runAfterRegistration(NetworkAuthenticationManager mgr, Intent data) throws ZLNetworkException {