{
// } else {
if (FileUtils.isSymLink(file)) {
File target = FileUtils.getSymLinkTarget(file);
- if (target.equals(com.quseit.util.FileUtils.getPath(App.getContext()))) {
+ if (target.equals(FileUtil.getPath(App.getContext()))) {
icon = R.drawable.prev;
} else if (target.isDirectory()) {
icon = R.drawable.ic_editor_folder_little;
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/common/TedChangelog.java b/qpython/src/main/java/org/qpython/qpy/texteditor/common/TedChangelog.java
deleted file mode 100644
index a8a0755950e7990791d7f1c59a5f579714ebf126..0000000000000000000000000000000000000000
--- a/qpython/src/main/java/org/qpython/qpy/texteditor/common/TedChangelog.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.qpython.qpy.texteditor.common;
-
-import org.qpython.qpy.R;
-
-public class TedChangelog extends org.qpython.qpy.texteditor.androidlib.common.ChangeLog {
-
- /**
- * @see fr.xgouchet.androidlib.common.ChangeLog#getTitleResourceForVersion(int)
- */
- @Override
- public int getTitleResourceForVersion(int version) {
- int res = 0;
- switch (version) {
- case 18:
- default:
- res = R.string.release18;
- }
- return res;
- }
-
- /**
- * @see fr.xgouchet.androidlib.common.ChangeLog#getChangeLogResourceForVersion(int)
- */
- @Override
- public int getChangeLogResourceForVersion(int version) {
- int res = 0;
- switch (version) {
- case 18:
- default:
- res = R.string.release18_log;
- }
- return res;
- }
-
-}
diff --git a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EnterDialog.java b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EnterDialog.java
index 07db3b2c0a45fb3d313b0ea1c6b28db89ad42e8a..34246a9bb18e50bdd47c1e50f43e50aee3b84357 100644
--- a/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EnterDialog.java
+++ b/qpython/src/main/java/org/qpython/qpy/texteditor/ui/view/EnterDialog.java
@@ -1,14 +1,12 @@
package org.qpython.qpy.texteditor.ui.view;
-import android.support.v7.app.AlertDialog;
-import android.app.Dialog;
import android.content.Context;
import android.databinding.DataBindingUtil;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
+import android.support.v7.app.AlertDialog;
import android.view.Gravity;
import android.view.LayoutInflater;
-import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/DownloadUtil.java b/qpython/src/main/java/org/qpython/qpy/utils/DownloadUtil.java
index fa912331ab2b3b2e4fc0291394a9f7cd0760f709..82b20e31669ff161d7b00783fd2ccd60b046445e 100644
--- a/qpython/src/main/java/org/qpython/qpy/utils/DownloadUtil.java
+++ b/qpython/src/main/java/org/qpython/qpy/utils/DownloadUtil.java
@@ -11,6 +11,8 @@ import org.qpython.qpy.R;
import java.io.File;
+import util.FileUtil;
+
/**
* @ProjectName: qpython
* @Package: org.qpython.qpy.utils
@@ -47,7 +49,7 @@ public class DownloadUtil {
String filePath = null;
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {//SD卡是否正常挂载
- filePath = FileUtils.getAbsolutePath(context) + File.separator + "download";
+ filePath = FileUtil.getAbsolutePath(context) + File.separator + "download";
} else {
return;
}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java b/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java
index be40a24b1f62ac11e1eb41d3937fa55ffde22dbe..705913496ceef91f30cd170ebd8037b1ffe37798 100644
--- a/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java
+++ b/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java
@@ -1,20 +1,19 @@
package org.qpython.qpy.utils;
import android.content.Context;
-import android.os.Environment;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import com.loopj.android.http.AsyncHttpResponseHandler;
import com.quseit.base.QBaseApp;
-import com.quseit.util.FileUtils;
import com.quseit.util.NAction;
import com.quseit.util.NStorage;
import com.quseit.util.NUtil;
import org.apache.http.Header;
import org.qpython.qpy.console.ScriptExec;
+import org.qpython.qpy.main.activity.QWebViewActivity;
import org.qpython.qpy.main.app.App;
import org.qpython.qpysdk.QPyConstants;
@@ -28,6 +27,7 @@ import okhttp3.Callback;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
+import util.FileUtil;
/**
* 文 件 名: NotebookCheckUtil
@@ -40,8 +40,9 @@ import okhttp3.Response;
public class NotebookUtil {
private static final String TAG = "NotebookUtil";
- public static final String RELEASE_PATH = FileUtils.getAbsolutePath(App.getContext()) + "/.notebook";
+ public static final String RELEASE_PATH = FileUtil.getAbsolutePath(App.getContext()) + "/.notebook";
public static final String NB_SERVER = "http://127.0.0.1:13000";
+ public static final String TOKEN = "?token=123456";
public static final String KILL_SERVER = NB_SERVER + "/__exit";
public static final String NOTEBOOK_SERVER = NB_SERVER + "/notebooks/files/notebooks";
@@ -81,7 +82,7 @@ public class NotebookUtil {
if (bind.listFiles() != null) {
for (File bin : bind.listFiles()) {
try {
- org.qpython.qpysdk.utils.FileUtils.chmod(bin, 0755);
+ FileUtil.chmod(bin, 0755);
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -226,7 +227,7 @@ public class NotebookUtil {
private static String getTempFilePath(String url) {
//LogUtil.d("NotebookUtil", "getTempFilePath:"+url);
- File dir = new File(FileUtils.getAbsolutePath(App.getContext()), "notebooks");
+ File dir = new File(FileUtil.getAbsolutePath(App.getContext()), "notebooks");
if (!dir.exists()) {
dir.mkdirs();
}
@@ -306,4 +307,9 @@ public class NotebookUtil {
return nb_link+"?"+NAction.getUserUrl(context);
}
+ public static void startNotebookHomePage(Context context) {
+ QWebViewActivity.start(context, "Notebook",
+ NotebookUtil.NB_SERVER + "/tree" + NotebookUtil.TOKEN);
+ }
+
}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/UpdateHelper.java b/qpython/src/main/java/org/qpython/qpy/utils/UpdateHelper.java
index e3dd0e6dbe0d52955c0455cacfce81a8e9bd2b1d..faa1cb214c68f38e7963eedd75f3dd028e17ec9e 100644
--- a/qpython/src/main/java/org/qpython/qpy/utils/UpdateHelper.java
+++ b/qpython/src/main/java/org/qpython/qpy/utils/UpdateHelper.java
@@ -8,9 +8,7 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
-import android.os.Environment;
import android.util.Log;
-import android.widget.Toast;
import com.google.gson.Gson;
@@ -24,7 +22,6 @@ import com.quseit.common.db.CacheLog;
import com.quseit.common.db.UserLog;
import com.quseit.util.DateTimeHelper;
import com.quseit.util.FileHelper;
-import com.quseit.util.FileUtils;
import com.quseit.util.NAction;
import com.quseit.util.NUtil;
import com.quseit.util.VeDate;
@@ -33,7 +30,6 @@ import org.apache.http.Header;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import org.qpython.qpy.R;
import org.qpython.qpy.main.app.App;
import org.qpython.qpy.main.server.model.SettingModel;
import org.qpython.qpysdk.QPyConstants;
@@ -41,6 +37,8 @@ import org.qpython.qpysdk.QPyConstants;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import util.FileUtil;
+
public class UpdateHelper {
private static final String TAG = "UpdateHelper";
@@ -170,7 +168,7 @@ public class UpdateHelper {
checkConfUpdate(context.getApplicationContext());
// 清空图片目录的缓存
- String cacheDir = FileUtils.getPath(context.getApplicationContext()) + "/" + root + "/" + BASE_CONF.DCACHE + "/";
+ String cacheDir = FileUtil.getPath(context.getApplicationContext()) + "/" + root + "/" + BASE_CONF.DCACHE + "/";
FileHelper.clearDir(cacheDir, 0, false);
}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabBroadcastReceiver.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabBroadcastReceiver.java
deleted file mode 100644
index c37805316b5210f86726d11ad2aa13e64741e563..0000000000000000000000000000000000000000
--- a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabBroadcastReceiver.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright (c) 2014 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.qpython.qpy.utils.iap;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-/**
- * Receiver for the "com.android.vending.billing.PURCHASES_UPDATED" Action
- * from the Play Store.
- *
- * It is possible that an in-app item may be acquired without the
- * application calling getBuyIntent(), for example if the item can be
- * redeemed from inside the Play Store using a promotional code. If this
- * application isn't running at the time, then when it is started a call
- * to getPurchases() will be sufficient notification. However, if the
- * application is already running in the background when the item is acquired,
- * a message to this BroadcastReceiver will indicate that the an item
- * has been acquired.
- */
-public class IabBroadcastReceiver extends BroadcastReceiver {
- /**
- * The Intent action that this Receiver should filter for.
- */
- public static final String ACTION = "com.android.vending.billing.PURCHASES_UPDATED";
- private final IabBroadcastListener mListener;
-
- public IabBroadcastReceiver(IabBroadcastListener listener) {
- mListener = listener;
- }
-
- @Override
- public void onReceive(Context context, Intent intent) {
- if (mListener != null) {
- mListener.receivedBroadcast();
- }
- }
-
- /**
- * Listener interface for received broadcast messages.
- */
- public interface IabBroadcastListener {
- void receivedBroadcast();
- }
-}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabException.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabException.java
deleted file mode 100644
index e2839b961165b7ec94e2263b97029521158d4d86..0000000000000000000000000000000000000000
--- a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.qpython.qpy.utils.iap;
-
-/**
- * Exception thrown when something went wrong with in-app billing.
- * An IabException has an associated IabResult (an error).
- * To get the IAB result that caused this exception to be thrown,
- * call {@link #getResult()}.
- */
-public class IabException extends Exception {
- IabResult mResult;
-
- public IabException(IabResult r) {
- this(r, null);
- }
- public IabException(int response, String message) {
- this(new IabResult(response, message));
- }
- public IabException(IabResult r, Exception cause) {
- super(r.getMessage(), cause);
- mResult = r;
- }
- public IabException(int response, String message, Exception cause) {
- this(new IabResult(response, message), cause);
- }
-
- /** Returns the IAB result (error) that this exception signals. */
- public IabResult getResult() { return mResult; }
-}
\ No newline at end of file
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabHelper.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabHelper.java
deleted file mode 100755
index f75f0692ed0b0b2ca3125ea90243f0247e252146..0000000000000000000000000000000000000000
--- a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabHelper.java
+++ /dev/null
@@ -1,1095 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.qpython.qpy.utils.iap;
-
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentSender.SendIntentException;
-import android.content.ServiceConnection;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.text.TextUtils;
-import android.util.Log;
-
-
-import com.android.vending.billing.IInAppBillingService;
-
-import org.json.JSONException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * Provides convenience methods for in-app billing. You can create one instance of this
- * class for your application and use it to process in-app billing operations.
- * It provides synchronous (blocking) and asynchronous (non-blocking) methods for
- * many common in-app billing operations, as well as automatic signature
- * verification.
- *
- * After instantiating, you must perform setup in order to start using the object.
- * To perform setup, call the {@link #startSetup} method and provide a listener;
- * that listener will be notified when setup is complete, after which (and not before)
- * you may call other methods.
- *
- * After setup is complete, you will typically want to request an inventory of owned
- * items and subscriptions. See {@link #queryInventory}, {@link #queryInventoryAsync}
- * and related methods.
- *
- * When you are done with this object, don't forget to call {@link #dispose}
- * to ensure proper cleanup. This object holds a binding to the in-app billing
- * service, which will leak unless you dispose of it correctly. If you created
- * the object on an Activity's onCreate method, then the recommended
- * place to dispose of it is the Activity's onDestroy method. It is invalid to
- * dispose the object while an asynchronous operation is in progress. You can
- * call {@link #disposeWhenFinished()} to ensure that any in-progress operation
- * completes before the object is disposed.
- *
- * A note about threading: When using this object from a background thread, you may
- * call the blocking versions of methods; when using from a UI thread, call
- * only the asynchronous versions and handle the results via callbacks.
- * Also, notice that you can only call one asynchronous operation at a time;
- * attempting to start a second asynchronous operation while the first one
- * has not yet completed will result in an exception being thrown.
- *
- */
-public class IabHelper {
- // Billing response codes
- public static final int BILLING_RESPONSE_RESULT_OK = 0;
- public static final int BILLING_RESPONSE_RESULT_USER_CANCELED = 1;
- public static final int BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE = 2;
- public static final int BILLING_RESPONSE_RESULT_BILLING_UNAVAILABLE = 3;
- public static final int BILLING_RESPONSE_RESULT_ITEM_UNAVAILABLE = 4;
- public static final int BILLING_RESPONSE_RESULT_DEVELOPER_ERROR = 5;
- public static final int BILLING_RESPONSE_RESULT_ERROR = 6;
- public static final int BILLING_RESPONSE_RESULT_ITEM_ALREADY_OWNED = 7;
- public static final int BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED = 8;
- // IAB Helper error codes
- public static final int IABHELPER_ERROR_BASE = -1000;
- public static final int IABHELPER_REMOTE_EXCEPTION = -1001;
- public static final int IABHELPER_BAD_RESPONSE = -1002;
- public static final int IABHELPER_VERIFICATION_FAILED = -1003;
- public static final int IABHELPER_SEND_INTENT_FAILED = -1004;
- public static final int IABHELPER_USER_CANCELLED = -1005;
- public static final int IABHELPER_UNKNOWN_PURCHASE_RESPONSE = -1006;
- public static final int IABHELPER_MISSING_TOKEN = -1007;
- public static final int IABHELPER_UNKNOWN_ERROR = -1008;
- public static final int IABHELPER_SUBSCRIPTIONS_NOT_AVAILABLE = -1009;
- public static final int IABHELPER_INVALID_CONSUMPTION = -1010;
- public static final int IABHELPER_SUBSCRIPTION_UPDATE_NOT_AVAILABLE = -1011;
- // Keys for the responses from InAppBillingService
- public static final String RESPONSE_CODE = "RESPONSE_CODE";
- public static final String RESPONSE_GET_SKU_DETAILS_LIST = "DETAILS_LIST";
- public static final String RESPONSE_BUY_INTENT = "BUY_INTENT";
- public static final String RESPONSE_INAPP_PURCHASE_DATA = "INAPP_PURCHASE_DATA";
- public static final String RESPONSE_INAPP_SIGNATURE = "INAPP_DATA_SIGNATURE";
- public static final String RESPONSE_INAPP_ITEM_LIST = "INAPP_PURCHASE_ITEM_LIST";
- public static final String RESPONSE_INAPP_PURCHASE_DATA_LIST = "INAPP_PURCHASE_DATA_LIST";
- public static final String RESPONSE_INAPP_SIGNATURE_LIST = "INAPP_DATA_SIGNATURE_LIST";
- public static final String INAPP_CONTINUATION_TOKEN = "INAPP_CONTINUATION_TOKEN";
- // Item types
- public static final String ITEM_TYPE_INAPP = "inapp";
- public static final String ITEM_TYPE_SUBS = "subs";
- // some fields on the getSkuDetails response bundle
- public static final String GET_SKU_DETAILS_ITEM_LIST = "ITEM_ID_LIST";
- public static final String GET_SKU_DETAILS_ITEM_TYPE_LIST = "ITEM_TYPE_LIST";
- // Ensure atomic access to mAsyncInProgress and mDisposeAfterAsync.
- private final Object mAsyncInProgressLock = new Object();
- // Is debug logging enabled?
- boolean mDebugLog = false;
- String mDebugTag = "IabHelper";
- // Is setup done?
- boolean mSetupDone = false;
- // Has this object been disposed of? (If so, we should ignore callbacks, etc)
- boolean mDisposed = false;
- // Do we need to dispose this object after an in-progress asynchronous operation?
- boolean mDisposeAfterAsync = false;
- // Are subscriptions supported?
- boolean mSubscriptionsSupported = false;
- // Is subscription update supported?
- boolean mSubscriptionUpdateSupported = false;
- // Is an asynchronous operation in progress?
- // (only one at a time can be in progress)
- boolean mAsyncInProgress = false;
- // (for logging/debugging)
- // if mAsyncInProgress == true, what asynchronous operation is in progress?
- String mAsyncOperation = "";
- // Context we were passed during initialization
- Context mContext;
- // Connection to the service
- IInAppBillingService mService;
- ServiceConnection mServiceConn;
- // The request code used to launch purchase flow
- int mRequestCode;
- // The item type of the current purchase flow
- String mPurchasingItemType;
- // Public key for verifying signature, in base64 encoding
- String mSignatureBase64 = null;
- // The listener registered on launchPurchaseFlow, which we have to call back when
- // the purchase finishes
- OnIabPurchaseFinishedListener mPurchaseListener;
-
- /**
- * Creates an instance. After creation, it will not yet be ready to use. You must perform
- * setup by calling {@link #startSetup} and wait for setup to complete. This constructor does not
- * block and is safe to call from a UI thread.
- *
- * @param ctx Your application or Activity context. Needed to bind to the in-app billing service.
- * @param base64PublicKey Your application's public key, encoded in base64.
- * This is used for verification of purchase signatures. You can find your app's base64-encoded
- * public key in your application's page on Google Play Developer Console. Note that this
- * is NOT your "developer public key".
- */
- public IabHelper(Context ctx, String base64PublicKey) {
- mContext = ctx.getApplicationContext();
- mSignatureBase64 = base64PublicKey;
- logDebug("IAB helper created.");
- }
-
- /**
- * Returns a human-readable description for the given response code.
- *
- * @param code The response code
- * @return A human-readable string explaining the result code.
- * It also includes the result code numerically.
- */
- public static String getResponseDesc(int code) {
- String[] iab_msgs = ("0:OK/1:User Canceled/2:Unknown/" +
- "3:Billing Unavailable/4:Item unavailable/" +
- "5:Developer Error/6:Error/7:Item Already Owned/" +
- "8:Item not owned").split("/");
- String[] iabhelper_msgs = ("0:OK/-1001:Remote exception during initialization/" +
- "-1002:Bad response received/" +
- "-1003:Purchase signature verification failed/" +
- "-1004:Send intent failed/" +
- "-1005:User cancelled/" +
- "-1006:Unknown purchase response/" +
- "-1007:Missing token/" +
- "-1008:Unknown error/" +
- "-1009:Subscriptions not available/" +
- "-1010:Invalid consumption attempt").split("/");
-
- if (code <= IABHELPER_ERROR_BASE) {
- int index = IABHELPER_ERROR_BASE - code;
- if (index >= 0 && index < iabhelper_msgs.length) return iabhelper_msgs[index];
- else return String.valueOf(code) + ":Unknown IAB Helper Error";
- }
- else if (code < 0 || code >= iab_msgs.length)
- return String.valueOf(code) + ":Unknown";
- else
- return iab_msgs[code];
- }
-
- /**
- * Enables or disable debug logging through LogCat.
- */
- public void enableDebugLogging(boolean enable, String tag) {
- checkNotDisposed();
- mDebugLog = enable;
- mDebugTag = tag;
- }
-
- public void enableDebugLogging(boolean enable) {
- checkNotDisposed();
- mDebugLog = enable;
- }
-
- /**
- * Starts the setup process. This will start up the setup process asynchronously.
- * You will be notified through the listener when the setup process is complete.
- * This method is safe to call from a UI thread.
- *
- * @param listener The listener to notify when the setup process is complete.
- */
- public void startSetup(final OnIabSetupFinishedListener listener) {
- // If already set up, can't do it again.
- checkNotDisposed();
- if (mSetupDone) throw new IllegalStateException("IAB helper is already set up.");
-
- // Connection to IAB service
- logDebug("Starting in-app billing setup.");
- mServiceConn = new ServiceConnection() {
- @Override
- public void onServiceDisconnected(ComponentName name) {
- logDebug("Billing service disconnected.");
- mService = null;
- }
-
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- if (mDisposed) return;
- logDebug("Billing service connected.");
- mService = IInAppBillingService.Stub.asInterface(service);
- String packageName = mContext.getPackageName();
- try {
- logDebug("Checking for in-app billing 3 support.");
-
- // check for in-app billing v3 support
- int response = mService.isBillingSupported(3, packageName, ITEM_TYPE_INAPP);
- if (response != BILLING_RESPONSE_RESULT_OK) {
- if (listener != null) listener.onIabSetupFinished(new IabResult(response,
- "Error checking for billing v3 support."));
-
- // if in-app purchases aren't supported, neither are subscriptions
- mSubscriptionsSupported = false;
- mSubscriptionUpdateSupported = false;
- return;
- } else {
- logDebug("In-app billing version 3 supported for " + packageName);
- }
-
- // Check for v5 subscriptions support. This is needed for
- // getBuyIntentToReplaceSku which allows for subscription update
- response = mService.isBillingSupported(5, packageName, ITEM_TYPE_SUBS);
- if (response == BILLING_RESPONSE_RESULT_OK) {
- logDebug("Subscription re-signup AVAILABLE.");
- mSubscriptionUpdateSupported = true;
- } else {
- logDebug("Subscription re-signup not available.");
- mSubscriptionUpdateSupported = false;
- }
-
- if (mSubscriptionUpdateSupported) {
- mSubscriptionsSupported = true;
- } else {
- // check for v3 subscriptions support
- response = mService.isBillingSupported(3, packageName, ITEM_TYPE_SUBS);
- if (response == BILLING_RESPONSE_RESULT_OK) {
- logDebug("Subscriptions AVAILABLE.");
- mSubscriptionsSupported = true;
- } else {
- logDebug("Subscriptions NOT AVAILABLE. Response: " + response);
- mSubscriptionsSupported = false;
- mSubscriptionUpdateSupported = false;
- }
- }
-
- mSetupDone = true;
- }
- catch (RemoteException e) {
- if (listener != null) {
- listener.onIabSetupFinished(new IabResult(IABHELPER_REMOTE_EXCEPTION,
- "RemoteException while setting up in-app billing."));
- }
- e.printStackTrace();
- return;
- }
-
- if (listener != null) {
- listener.onIabSetupFinished(new IabResult(BILLING_RESPONSE_RESULT_OK, "Setup successful."));
- }
- }
- };
-
- Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
- serviceIntent.setPackage("com.android.vending");
- List intentServices = mContext.getPackageManager().queryIntentServices(serviceIntent, 0);
- if (intentServices != null && !intentServices.isEmpty()) {
- // service available to handle that Intent
- mContext.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
- }
- else {
- // no service available to handle that Intent
- if (listener != null) {
- listener.onIabSetupFinished(
- new IabResult(BILLING_RESPONSE_RESULT_BILLING_UNAVAILABLE,
- "Billing service unavailable on device."));
- }
- }
- }
-
- /**
- * Dispose of object, releasing resources. It's very important to call this
- * method when you are done with this object. It will release any resources
- * used by it such as service connections. Naturally, once the object is
- * disposed of, it can't be used again.
- */
- public void dispose() throws IabAsyncInProgressException {
- synchronized (mAsyncInProgressLock) {
- if (mAsyncInProgress) {
- throw new IabAsyncInProgressException("Can't dispose because an async operation " +
- "(" + mAsyncOperation + ") is in progress.");
- }
- }
- logDebug("Disposing.");
- mSetupDone = false;
- if (mServiceConn != null) {
- logDebug("Unbinding from service.");
- if (mContext != null) mContext.unbindService(mServiceConn);
- }
- mDisposed = true;
- mContext = null;
- mServiceConn = null;
- mService = null;
- mPurchaseListener = null;
- }
-
- /**
- * Disposes of object, releasing resources. If there is an in-progress async operation, this
- * method will queue the dispose to occur after the operation has finished.
- */
- public void disposeWhenFinished() {
- synchronized (mAsyncInProgressLock) {
- if (mAsyncInProgress) {
- logDebug("Will dispose after async operation finishes.");
- mDisposeAfterAsync = true;
- } else {
- try {
- dispose();
- } catch (IabAsyncInProgressException e) {
- // Should never be thrown, because we call dispose() only after checking that
- // there's not already an async operation in progress.
- }
- }
- }
- }
-
- private void checkNotDisposed() {
- if (mDisposed) throw new IllegalStateException("IabHelper was disposed of, so it cannot be used.");
- }
-
- /** Returns whether subscriptions are supported. */
- public boolean subscriptionsSupported() {
- checkNotDisposed();
- return mSubscriptionsSupported;
- }
-
- public void launchPurchaseFlow(Activity act, String sku, int requestCode, OnIabPurchaseFinishedListener listener)
- throws IabAsyncInProgressException {
- launchPurchaseFlow(act, sku, requestCode, listener, "");
- }
-
- public void launchPurchaseFlow(Activity act, String sku, int requestCode,
- OnIabPurchaseFinishedListener listener, String extraData)
- throws IabAsyncInProgressException {
- launchPurchaseFlow(act, sku, ITEM_TYPE_INAPP, null, requestCode, listener, extraData);
- }
-
- public void launchSubscriptionPurchaseFlow(Activity act, String sku, int requestCode,
- OnIabPurchaseFinishedListener listener) throws IabAsyncInProgressException {
- launchSubscriptionPurchaseFlow(act, sku, requestCode, listener, "");
- }
-
- public void launchSubscriptionPurchaseFlow(Activity act, String sku, int requestCode,
- OnIabPurchaseFinishedListener listener, String extraData)
- throws IabAsyncInProgressException {
- launchPurchaseFlow(act, sku, ITEM_TYPE_SUBS, null, requestCode, listener, extraData);
- }
-
- /**
- * Initiate the UI flow for an in-app purchase. Call this method to initiate an in-app purchase,
- * which will involve bringing up the Google Play screen. The calling activity will be paused
- * while the user interacts with Google Play, and the result will be delivered via the
- * activity's {@link Activity#onActivityResult} method, at which point you must call
- * this object's {@link #handleActivityResult} method to continue the purchase flow. This method
- * MUST be called from the UI thread of the Activity.
- *
- * @param act The calling activity.
- * @param sku The sku of the item to purchase.
- * @param itemType indicates if it's a product or a subscription (ITEM_TYPE_INAPP or
- * ITEM_TYPE_SUBS)
- * @param oldSkus A list of SKUs which the new SKU is replacing or null if there are none
- * @param requestCode A request code (to differentiate from other responses -- as in
- * {@link Activity#startActivityForResult}).
- * @param listener The listener to notify when the purchase process finishes
- * @param extraData Extra data (developer payload), which will be returned with the purchase
- * data when the purchase completes. This extra data will be permanently bound to that
- * purchase and will always be returned when the purchase is queried.
- */
- public void launchPurchaseFlow(Activity act, String sku, String itemType, List oldSkus,
- int requestCode, OnIabPurchaseFinishedListener listener, String extraData)
- throws IabAsyncInProgressException {
- checkNotDisposed();
- checkSetupDone("launchPurchaseFlow");
- flagStartAsync("launchPurchaseFlow");
- IabResult result;
-
- if (itemType.equals(ITEM_TYPE_SUBS) && !mSubscriptionsSupported) {
- IabResult r = new IabResult(IABHELPER_SUBSCRIPTIONS_NOT_AVAILABLE,
- "Subscriptions are not available.");
- flagEndAsync();
- if (listener != null) listener.onIabPurchaseFinished(r, null);
- return;
- }
-
- try {
- logDebug("Constructing buy intent for " + sku + ", item type: " + itemType);
- Bundle buyIntentBundle;
- if (oldSkus == null || oldSkus.isEmpty()) {
- // Purchasing a new item or subscription re-signup
- buyIntentBundle = mService.getBuyIntent(3, mContext.getPackageName(), sku, itemType,
- extraData);
- } else {
- // Subscription upgrade/downgrade
- if (!mSubscriptionUpdateSupported) {
- IabResult r = new IabResult(IABHELPER_SUBSCRIPTION_UPDATE_NOT_AVAILABLE,
- "Subscription updates are not available.");
- flagEndAsync();
- if (listener != null) listener.onIabPurchaseFinished(r, null);
- return;
- }
- buyIntentBundle = mService.getBuyIntentToReplaceSkus(5, mContext.getPackageName(),
- oldSkus, sku, itemType, extraData);
- }
- int response = getResponseCodeFromBundle(buyIntentBundle);
- if (response != BILLING_RESPONSE_RESULT_OK) {
- logError("Unable to buy item, Error response: " + getResponseDesc(response));
- flagEndAsync();
- result = new IabResult(response, "Unable to buy item");
- if (listener != null) listener.onIabPurchaseFinished(result, null);
- return;
- }
-
- PendingIntent pendingIntent = buyIntentBundle.getParcelable(RESPONSE_BUY_INTENT);
- logDebug("Launching buy intent for " + sku + ". Request code: " + requestCode);
- mRequestCode = requestCode;
- mPurchaseListener = listener;
- mPurchasingItemType = itemType;
- act.startIntentSenderForResult(pendingIntent.getIntentSender(),
- requestCode, new Intent(),
- Integer.valueOf(0), Integer.valueOf(0),
- Integer.valueOf(0));
- }
- catch (SendIntentException e) {
- logError("SendIntentException while launching purchase flow for sku " + sku);
- e.printStackTrace();
- flagEndAsync();
-
- result = new IabResult(IABHELPER_SEND_INTENT_FAILED, "Failed to send intent.");
- if (listener != null) listener.onIabPurchaseFinished(result, null);
- }
- catch (RemoteException e) {
- logError("RemoteException while launching purchase flow for sku " + sku);
- e.printStackTrace();
- flagEndAsync();
-
- result = new IabResult(IABHELPER_REMOTE_EXCEPTION, "Remote exception while starting purchase flow");
- if (listener != null) listener.onIabPurchaseFinished(result, null);
- }
- }
-
- /**
- * Handles an activity result that's part of the purchase flow in in-app billing. If you
- * are calling {@link #launchPurchaseFlow}, then you must call this method from your
- * Activity's {@link Activity@onActivityResult} method. This method
- * MUST be called from the UI thread of the Activity.
- *
- * @param requestCode The requestCode as you received it.
- * @param resultCode The resultCode as you received it.
- * @param data The data (Intent) as you received it.
- * @return Returns true if the result was related to a purchase flow and was handled;
- * false if the result was not related to a purchase, in which case you should
- * handle it normally.
- */
- public boolean handleActivityResult(int requestCode, int resultCode, Intent data) {
- IabResult result;
- if (requestCode != mRequestCode) return false;
-
- checkNotDisposed();
- checkSetupDone("handleActivityResult");
-
- // end of async purchase operation that started on launchPurchaseFlow
- flagEndAsync();
-
- if (data == null) {
- logError("Null data in IAB activity result.");
- result = new IabResult(IABHELPER_BAD_RESPONSE, "Null data in IAB result");
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
- return true;
- }
-
- int responseCode = getResponseCodeFromIntent(data);
- String purchaseData = data.getStringExtra(RESPONSE_INAPP_PURCHASE_DATA);
- String dataSignature = data.getStringExtra(RESPONSE_INAPP_SIGNATURE);
-
- if (resultCode == Activity.RESULT_OK && responseCode == BILLING_RESPONSE_RESULT_OK) {
- logDebug("Successful resultcode from purchase activity.");
- logDebug("Purchase data: " + purchaseData);
- logDebug("Data signature: " + dataSignature);
- logDebug("Extras: " + data.getExtras());
- logDebug("Expected item type: " + mPurchasingItemType);
-
- if (purchaseData == null || dataSignature == null) {
- logError("BUG: either purchaseData or dataSignature is null.");
- logDebug("Extras: " + data.getExtras().toString());
- result = new IabResult(IABHELPER_UNKNOWN_ERROR, "IAB returned null purchaseData or dataSignature");
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
- return true;
- }
-
- Purchase purchase = null;
- try {
- purchase = new Purchase(mPurchasingItemType, purchaseData, dataSignature);
- String sku = purchase.getSku();
-
- // Verify signature
- if (!Security.verifyPurchase(mSignatureBase64, purchaseData, dataSignature)) {
- logError("Purchase signature verification FAILED for sku " + sku);
- result = new IabResult(IABHELPER_VERIFICATION_FAILED, "Signature verification failed for sku " + sku);
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, purchase);
- return true;
- }
- logDebug("Purchase signature successfully verified.");
- }
- catch (JSONException e) {
- logError("Failed to parse purchase data.");
- e.printStackTrace();
- result = new IabResult(IABHELPER_BAD_RESPONSE, "Failed to parse purchase data.");
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
- return true;
- }
-
- if (mPurchaseListener != null) {
- mPurchaseListener.onIabPurchaseFinished(new IabResult(BILLING_RESPONSE_RESULT_OK, "Success"), purchase);
- }
- }
- else if (resultCode == Activity.RESULT_OK) {
- // result code was OK, but in-app billing response was not OK.
- logDebug("Result code was OK but in-app billing response was not OK: " + getResponseDesc(responseCode));
- if (mPurchaseListener != null) {
- result = new IabResult(responseCode, "Problem purchashing item.");
- mPurchaseListener.onIabPurchaseFinished(result, null);
- }
- }
- else if (resultCode == Activity.RESULT_CANCELED) {
- logDebug("Purchase canceled - Response: " + getResponseDesc(responseCode));
- result = new IabResult(IABHELPER_USER_CANCELLED, "User canceled.");
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
- }
- else {
- logError("Purchase failed. Result code: " + Integer.toString(resultCode)
- + ". Response: " + getResponseDesc(responseCode));
- result = new IabResult(IABHELPER_UNKNOWN_PURCHASE_RESPONSE, "Unknown purchase response.");
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
- }
- return true;
- }
-
- public Inventory queryInventory() throws IabException {
- return queryInventory(false, null, null);
- }
-
- /**
- * Queries the inventory. This will query all owned items from the server, as well as
- * information on additional skus, if specified. This method may block or take long to execute.
- * Do not call from a UI thread. For that, use the non-blocking version {@link #queryInventoryAsync}.
- *
- * @param querySkuDetails if true, SKU details (price, description, etc) will be queried as well
- * as purchase information.
- * @param moreItemSkus additional PRODUCT skus to query information on, regardless of ownership.
- * Ignored if null or if querySkuDetails is false.
- * @param moreSubsSkus additional SUBSCRIPTIONS skus to query information on, regardless of ownership.
- * Ignored if null or if querySkuDetails is false.
- * @throws IabException if a problem occurs while refreshing the inventory.
- */
- public Inventory queryInventory(boolean querySkuDetails, List moreItemSkus,
- List moreSubsSkus) throws IabException {
- checkNotDisposed();
- checkSetupDone("queryInventory");
- try {
- Inventory inv = new Inventory();
- int r = queryPurchases(inv, ITEM_TYPE_INAPP);
- if (r != BILLING_RESPONSE_RESULT_OK) {
- throw new IabException(r, "Error refreshing inventory (querying owned items).");
- }
-
- if (querySkuDetails) {
- r = querySkuDetails(ITEM_TYPE_INAPP, inv, moreItemSkus);
- if (r != BILLING_RESPONSE_RESULT_OK) {
- throw new IabException(r, "Error refreshing inventory (querying prices of items).");
- }
- }
-
- // if subscriptions are supported, then also query for subscriptions
- if (mSubscriptionsSupported) {
- r = queryPurchases(inv, ITEM_TYPE_SUBS);
- if (r != BILLING_RESPONSE_RESULT_OK) {
- throw new IabException(r, "Error refreshing inventory (querying owned subscriptions).");
- }
-
- if (querySkuDetails) {
- r = querySkuDetails(ITEM_TYPE_SUBS, inv, moreSubsSkus);
- if (r != BILLING_RESPONSE_RESULT_OK) {
- throw new IabException(r, "Error refreshing inventory (querying prices of subscriptions).");
- }
- }
- }
-
- return inv;
- }
- catch (RemoteException e) {
- throw new IabException(IABHELPER_REMOTE_EXCEPTION, "Remote exception while refreshing inventory.", e);
- }
- catch (JSONException e) {
- throw new IabException(IABHELPER_BAD_RESPONSE, "Error parsing JSON response while refreshing inventory.", e);
- }
- }
-
- /**
- * Asynchronous wrapper for inventory query. This will perform an inventory
- * query as described in {@link #queryInventory}, but will do so asynchronously
- * and call back the specified listener upon completion. This method is safe to
- * call from a UI thread.
- *
- * @param querySkuDetails as in {@link #queryInventory}
- * @param moreItemSkus as in {@link #queryInventory}
- * @param moreSubsSkus as in {@link #queryInventory}
- * @param listener The listener to notify when the refresh operation completes.
- */
- public void queryInventoryAsync(final boolean querySkuDetails, final List moreItemSkus,
- final List moreSubsSkus, final QueryInventoryFinishedListener listener)
- throws IabAsyncInProgressException {
- final Handler handler = new Handler();
- checkNotDisposed();
- checkSetupDone("queryInventory");
- flagStartAsync("refresh inventory");
- (new Thread(new Runnable() {
- public void run() {
- IabResult result = new IabResult(BILLING_RESPONSE_RESULT_OK, "Inventory refresh successful.");
- Inventory inv = null;
- try {
- inv = queryInventory(querySkuDetails, moreItemSkus, moreSubsSkus);
- }
- catch (IabException ex) {
- result = ex.getResult();
- }
-
- flagEndAsync();
-
- final IabResult result_f = result;
- final Inventory inv_f = inv;
- if (!mDisposed && listener != null) {
- handler.post(new Runnable() {
- public void run() {
- listener.onQueryInventoryFinished(result_f, inv_f);
- }
- });
- }
- }
- })).start();
- }
-
- public void queryInventoryAsync(QueryInventoryFinishedListener listener)
- throws IabAsyncInProgressException{
- queryInventoryAsync(false, null, null, listener);
- }
-
- /**
- * Consumes a given in-app product. Consuming can only be done on an item
- * that's owned, and as a result of consumption, the user will no longer own it.
- * This method may block or take long to return. Do not call from the UI thread.
- * For that, see {@link #consumeAsync}.
- *
- * @param itemInfo The PurchaseInfo that represents the item to consume.
- * @throws IabException if there is a problem during consumption.
- */
- void consume(Purchase itemInfo) throws IabException {
- checkNotDisposed();
- checkSetupDone("consume");
-
- if (!itemInfo.mItemType.equals(ITEM_TYPE_INAPP)) {
- throw new IabException(IABHELPER_INVALID_CONSUMPTION,
- "Items of type '" + itemInfo.mItemType + "' can't be consumed.");
- }
-
- try {
- String token = itemInfo.getToken();
- String sku = itemInfo.getSku();
- if (token == null || token.equals("")) {
- logError("Can't consume "+ sku + ". No token.");
- throw new IabException(IABHELPER_MISSING_TOKEN, "PurchaseInfo is missing token for sku: "
- + sku + " " + itemInfo);
- }
-
- logDebug("Consuming sku: " + sku + ", token: " + token);
- int response = mService.consumePurchase(3, mContext.getPackageName(), token);
- if (response == BILLING_RESPONSE_RESULT_OK) {
- logDebug("Successfully consumed sku: " + sku);
- }
- else {
- logDebug("Error consuming consuming sku " + sku + ". " + getResponseDesc(response));
- throw new IabException(response, "Error consuming sku " + sku);
- }
- }
- catch (RemoteException e) {
- throw new IabException(IABHELPER_REMOTE_EXCEPTION, "Remote exception while consuming. PurchaseInfo: " + itemInfo, e);
- }
- }
-
- /**
- * Asynchronous wrapper to item consumption. Works like {@link #consume}, but
- * performs the consumption in the background and notifies completion through
- * the provided listener. This method is safe to call from a UI thread.
- *
- * @param purchase The purchase to be consumed.
- * @param listener The listener to notify when the consumption operation finishes.
- */
- public void consumeAsync(Purchase purchase, OnConsumeFinishedListener listener)
- throws IabAsyncInProgressException {
- checkNotDisposed();
- checkSetupDone("consume");
- List purchases = new ArrayList();
- purchases.add(purchase);
- consumeAsyncInternal(purchases, listener, null);
- }
-
- /**
- * Same as {@link #consumeAsync}, but for multiple items at once.
- * @param purchases The list of PurchaseInfo objects representing the purchases to consume.
- * @param listener The listener to notify when the consumption operation finishes.
- */
- public void consumeAsync(List purchases, OnConsumeMultiFinishedListener listener)
- throws IabAsyncInProgressException {
- checkNotDisposed();
- checkSetupDone("consume");
- consumeAsyncInternal(purchases, null, listener);
- }
-
- // Checks that setup was done; if not, throws an exception.
- void checkSetupDone(String operation) {
- if (!mSetupDone) {
- logError("Illegal state for operation (" + operation + "): IAB helper is not set up.");
- throw new IllegalStateException("IAB helper is not set up. Can't perform operation: " + operation);
- }
- }
-
- // Workaround to bug where sometimes response codes come as Long instead of Integer
- int getResponseCodeFromBundle(Bundle b) {
- Object o = b.get(RESPONSE_CODE);
- if (o == null) {
- logDebug("Bundle with null response code, assuming OK (known issue)");
- return BILLING_RESPONSE_RESULT_OK;
- }
- else if (o instanceof Integer) return ((Integer)o).intValue();
- else if (o instanceof Long) return (int)((Long)o).longValue();
- else {
- logError("Unexpected type for bundle response code.");
- logError(o.getClass().getName());
- throw new RuntimeException("Unexpected type for bundle response code: " + o.getClass().getName());
- }
- }
-
- // Workaround to bug where sometimes response codes come as Long instead of Integer
- int getResponseCodeFromIntent(Intent i) {
- Object o = i.getExtras().get(RESPONSE_CODE);
- if (o == null) {
- logError("Intent with no response code, assuming OK (known issue)");
- return BILLING_RESPONSE_RESULT_OK;
- }
- else if (o instanceof Integer) return ((Integer)o).intValue();
- else if (o instanceof Long) return (int)((Long)o).longValue();
- else {
- logError("Unexpected type for intent response code.");
- logError(o.getClass().getName());
- throw new RuntimeException("Unexpected type for intent response code: " + o.getClass().getName());
- }
- }
-
- void flagStartAsync(String operation) throws IabAsyncInProgressException {
- synchronized (mAsyncInProgressLock) {
- if (mAsyncInProgress) {
- throw new IabAsyncInProgressException("Can't start async operation (" +
- operation + ") because another async operation (" + mAsyncOperation +
- ") is in progress.");
- }
- mAsyncOperation = operation;
- mAsyncInProgress = true;
- logDebug("Starting async operation: " + operation);
- }
- }
-
- void flagEndAsync() {
- synchronized (mAsyncInProgressLock) {
- logDebug("Ending async operation: " + mAsyncOperation);
- mAsyncOperation = "";
- mAsyncInProgress = false;
- if (mDisposeAfterAsync) {
- try {
- dispose();
- } catch (IabAsyncInProgressException e) {
- // Should not be thrown, because we reset mAsyncInProgress immediately before
- // calling dispose().
- }
- }
- }
- }
-
- int queryPurchases(Inventory inv, String itemType) throws JSONException, RemoteException {
- // Query purchases
- logDebug("Querying owned items, item type: " + itemType);
- logDebug("Package name: " + mContext.getPackageName());
- boolean verificationFailed = false;
- String continueToken = null;
-
- do {
- logDebug("Calling getPurchases with continuation token: " + continueToken);
- Bundle ownedItems = mService.getPurchases(3, mContext.getPackageName(),
- itemType, continueToken);
-
- int response = getResponseCodeFromBundle(ownedItems);
- logDebug("Owned items response: " + String.valueOf(response));
- if (response != BILLING_RESPONSE_RESULT_OK) {
- logDebug("getPurchases() failed: " + getResponseDesc(response));
- return response;
- }
- if (!ownedItems.containsKey(RESPONSE_INAPP_ITEM_LIST)
- || !ownedItems.containsKey(RESPONSE_INAPP_PURCHASE_DATA_LIST)
- || !ownedItems.containsKey(RESPONSE_INAPP_SIGNATURE_LIST)) {
- logError("Bundle returned from getPurchases() doesn't contain required fields.");
- return IABHELPER_BAD_RESPONSE;
- }
-
- ArrayList ownedSkus = ownedItems.getStringArrayList(
- RESPONSE_INAPP_ITEM_LIST);
- ArrayList purchaseDataList = ownedItems.getStringArrayList(
- RESPONSE_INAPP_PURCHASE_DATA_LIST);
- ArrayList signatureList = ownedItems.getStringArrayList(
- RESPONSE_INAPP_SIGNATURE_LIST);
-
- for (int i = 0; i < purchaseDataList.size(); ++i) {
- String purchaseData = purchaseDataList.get(i);
- String signature = signatureList.get(i);
- String sku = ownedSkus.get(i);
- if (Security.verifyPurchase(mSignatureBase64, purchaseData, signature)) {
- logDebug("Sku is owned: " + sku);
- Purchase purchase = new Purchase(itemType, purchaseData, signature);
-
- if (TextUtils.isEmpty(purchase.getToken())) {
- logWarn("BUG: empty/null token!");
- logDebug("Purchase data: " + purchaseData);
- }
-
- // Record ownership and token
- inv.addPurchase(purchase);
- }
- else {
- logWarn("Purchase signature verification **FAILED**. Not adding item.");
- logDebug(" Purchase data: " + purchaseData);
- logDebug(" Signature: " + signature);
- verificationFailed = true;
- }
- }
-
- continueToken = ownedItems.getString(INAPP_CONTINUATION_TOKEN);
- logDebug("Continuation token: " + continueToken);
- } while (!TextUtils.isEmpty(continueToken));
-
- return verificationFailed ? IABHELPER_VERIFICATION_FAILED : BILLING_RESPONSE_RESULT_OK;
- }
-
- int querySkuDetails(String itemType, Inventory inv, List moreSkus)
- throws RemoteException, JSONException {
- logDebug("Querying SKU details.");
- ArrayList skuList = new ArrayList();
- skuList.addAll(inv.getAllOwnedSkus(itemType));
- if (moreSkus != null) {
- for (String sku : moreSkus) {
- if (!skuList.contains(sku)) {
- skuList.add(sku);
- }
- }
- }
-
- if (skuList.size() == 0) {
- logDebug("queryPrices: nothing to do because there are no SKUs.");
- return BILLING_RESPONSE_RESULT_OK;
- }
-
- // Split the sku list in blocks of no more than 20 elements.
- ArrayList> packs = new ArrayList>();
- ArrayList tempList;
- int n = skuList.size() / 20;
- int mod = skuList.size() % 20;
- for (int i = 0; i < n; i++) {
- tempList = new ArrayList();
- for (String s : skuList.subList(i * 20, i * 20 + 20)) {
- tempList.add(s);
- }
- packs.add(tempList);
- }
- if (mod != 0) {
- tempList = new ArrayList();
- for (String s : skuList.subList(n * 20, n * 20 + mod)) {
- tempList.add(s);
- }
- packs.add(tempList);
- }
-
- for (ArrayList skuPartList : packs) {
- Bundle querySkus = new Bundle();
- querySkus.putStringArrayList(GET_SKU_DETAILS_ITEM_LIST, skuPartList);
- Bundle skuDetails = mService.getSkuDetails(3, mContext.getPackageName(),
- itemType, querySkus);
-
- if (!skuDetails.containsKey(RESPONSE_GET_SKU_DETAILS_LIST)) {
- int response = getResponseCodeFromBundle(skuDetails);
- if (response != BILLING_RESPONSE_RESULT_OK) {
- logDebug("getSkuDetails() failed: " + getResponseDesc(response));
- return response;
- } else {
- logError("getSkuDetails() returned a bundle with neither an error nor a detail list.");
- return IABHELPER_BAD_RESPONSE;
- }
- }
-
- ArrayList responseList = skuDetails.getStringArrayList(
- RESPONSE_GET_SKU_DETAILS_LIST);
-
- for (String thisResponse : responseList) {
- SkuDetails d = new SkuDetails(itemType, thisResponse);
- logDebug("Got sku details: " + d);
- inv.addSkuDetails(d);
- }
- }
-
- return BILLING_RESPONSE_RESULT_OK;
- }
-
- void consumeAsyncInternal(final List purchases,
- final OnConsumeFinishedListener singleListener,
- final OnConsumeMultiFinishedListener multiListener)
- throws IabAsyncInProgressException {
- final Handler handler = new Handler();
- flagStartAsync("consume");
- (new Thread(new Runnable() {
- public void run() {
- final List results = new ArrayList();
- for (Purchase purchase : purchases) {
- try {
- consume(purchase);
- results.add(new IabResult(BILLING_RESPONSE_RESULT_OK, "Successful consume of sku " + purchase.getSku()));
- }
- catch (IabException ex) {
- results.add(ex.getResult());
- }
- }
-
- flagEndAsync();
- if (!mDisposed && singleListener != null) {
- handler.post(new Runnable() {
- public void run() {
- singleListener.onConsumeFinished(purchases.get(0), results.get(0));
- }
- });
- }
- if (!mDisposed && multiListener != null) {
- handler.post(new Runnable() {
- public void run() {
- multiListener.onConsumeMultiFinished(purchases, results);
- }
- });
- }
- }
- })).start();
- }
-
- void logDebug(String msg) {
- if (mDebugLog) Log.d(mDebugTag, msg);
- }
-
- void logError(String msg) {
- Log.e(mDebugTag, "In-app billing error: " + msg);
- }
-
- void logWarn(String msg) {
- Log.w(mDebugTag, "In-app billing warning: " + msg);
- }
-
- /**
- * Callback for setup process. This listener's {@link #onIabSetupFinished} method is called
- * when the setup process is complete.
- */
- public interface OnIabSetupFinishedListener {
- /**
- * Called to notify that setup is complete.
- *
- * @param result The result of the setup process.
- */
- void onIabSetupFinished(IabResult result);
- }
-
- /**
- * Callback that notifies when a purchase is finished.
- */
- public interface OnIabPurchaseFinishedListener {
- /**
- * Called to notify that an in-app purchase finished. If the purchase was successful,
- * then the sku parameter specifies which item was purchased. If the purchase failed,
- * the sku and extraData parameters may or may not be null, depending on how far the purchase
- * process went.
- *
- * @param result The result of the purchase.
- * @param info The purchase information (null if purchase failed)
- */
- void onIabPurchaseFinished(IabResult result, Purchase info);
- }
-
- /**
- * Listener that notifies when an inventory query operation completes.
- */
- public interface QueryInventoryFinishedListener {
- /**
- * Called to notify that an inventory query operation completed.
- *
- * @param result The result of the operation.
- * @param inv The inventory.
- */
- void onQueryInventoryFinished(IabResult result, Inventory inv);
- }
-
- /**
- * Callback that notifies when a consumption operation finishes.
- */
- public interface OnConsumeFinishedListener {
- /**
- * Called to notify that a consumption has finished.
- *
- * @param purchase The purchase that was (or was to be) consumed.
- * @param result The result of the consumption operation.
- */
- void onConsumeFinished(Purchase purchase, IabResult result);
- }
-
- /**
- * Callback that notifies when a multi-item consumption operation finishes.
- */
- public interface OnConsumeMultiFinishedListener {
- /**
- * Called to notify that a consumption of multiple items has finished.
- *
- * @param purchases The purchases that were (or were to be) consumed.
- * @param results The results of each consumption operation, corresponding to each
- * sku.
- */
- void onConsumeMultiFinished(List purchases, List results);
- }
-
- /**
- * Exception thrown when the requested operation cannot be started because an async operation
- * is still in progress.
- */
- public static class IabAsyncInProgressException extends Exception {
- public IabAsyncInProgressException(String message) {
- super(message);
- }
- }
-}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabResult.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/IabResult.java
deleted file mode 100644
index 028cd2c305de5d45940cc83d1a84fd49b72ed056..0000000000000000000000000000000000000000
--- a/qpython/src/main/java/org/qpython/qpy/utils/iap/IabResult.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.qpython.qpy.utils.iap;
-
-/**
- * Represents the result of an in-app billing operation.
- * A result is composed of a response code (an integer) and possibly a
- * message (String). You can get those by calling
- * {@link #getResponse} and {@link #getMessage()}, respectively. You
- * can also inquire whether a result is a success or a failure by
- * calling {@link #isSuccess()} and {@link #isFailure()}.
- */
-public class IabResult {
- int mResponse;
- String mMessage;
-
- public IabResult(int response, String message) {
- mResponse = response;
- if (message == null || message.trim().length() == 0) {
- mMessage = IabHelper.getResponseDesc(response);
- }
- else {
- mMessage = message + " (response: " + IabHelper.getResponseDesc(response) + ")";
- }
- }
- public int getResponse() { return mResponse; }
- public String getMessage() { return mMessage; }
- public boolean isSuccess() { return mResponse == IabHelper.BILLING_RESPONSE_RESULT_OK; }
- public boolean isFailure() { return !isSuccess(); }
- public String toString() { return "IabResult: " + getMessage(); }
-}
-
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/Inventory.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/Inventory.java
deleted file mode 100644
index d5dd6505ef6b3f4ba643c405a5715fb242584450..0000000000000000000000000000000000000000
--- a/qpython/src/main/java/org/qpython/qpy/utils/iap/Inventory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.qpython.qpy.utils.iap;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Represents a block of information about in-app items.
- * An Inventory is returned by such methods as {@link IabHelper#queryInventory}.
- */
-public class Inventory {
- Map mSkuMap = new HashMap();
- Map mPurchaseMap = new HashMap();
-
- Inventory() { }
-
- /** Returns the listing details for an in-app product. */
- public SkuDetails getSkuDetails(String sku) {
- return mSkuMap.get(sku);
- }
-
- /** Returns purchase information for a given product, or null if there is no purchase. */
- public Purchase getPurchase(String sku) {
- return mPurchaseMap.get(sku);
- }
-
- /** Returns whether or not there exists a purchase of the given product. */
- public boolean hasPurchase(String sku) {
- return mPurchaseMap.containsKey(sku);
- }
-
- /** Return whether or not details about the given product are available. */
- public boolean hasDetails(String sku) {
- return mSkuMap.containsKey(sku);
- }
-
- /**
- * Erase a purchase (locally) from the inventory, given its product ID. This just
- * modifies the Inventory object locally and has no effect on the server! This is
- * useful when you have an existing Inventory object which you know to be up to date,
- * and you have just consumed an item successfully, which means that erasing its
- * purchase data from the Inventory you already have is quicker than querying for
- * a new Inventory.
- */
- public void erasePurchase(String sku) {
- if (mPurchaseMap.containsKey(sku)) mPurchaseMap.remove(sku);
- }
-
- /** Returns a list of all owned product IDs. */
- List getAllOwnedSkus() {
- return new ArrayList(mPurchaseMap.keySet());
- }
-
- /** Returns a list of all owned product IDs of a given type */
- List getAllOwnedSkus(String itemType) {
- List result = new ArrayList();
- for (Purchase p : mPurchaseMap.values()) {
- if (p.getItemType().equals(itemType)) result.add(p.getSku());
- }
- return result;
- }
-
- /** Returns a list of all purchases. */
- List getAllPurchases() {
- return new ArrayList(mPurchaseMap.values());
- }
-
- void addSkuDetails(SkuDetails d) {
- mSkuMap.put(d.getSku(), d);
- }
-
- void addPurchase(Purchase p) {
- mPurchaseMap.put(p.getSku(), p);
- }
-}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/Purchase.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/Purchase.java
deleted file mode 100644
index cfa95959700d2ee93ec812931466f7550db16a16..0000000000000000000000000000000000000000
--- a/qpython/src/main/java/org/qpython/qpy/utils/iap/Purchase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.qpython.qpy.utils.iap;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Represents an in-app billing purchase.
- */
-public class Purchase {
- String mItemType; // ITEM_TYPE_INAPP or ITEM_TYPE_SUBS
- String mOrderId;
- String mPackageName;
- String mSku;
- long mPurchaseTime;
- int mPurchaseState;
- String mDeveloperPayload;
- String mToken;
- String mOriginalJson;
- String mSignature;
- boolean mIsAutoRenewing;
-
- public Purchase(String itemType, String jsonPurchaseInfo, String signature) throws JSONException {
- mItemType = itemType;
- mOriginalJson = jsonPurchaseInfo;
- JSONObject o = new JSONObject(mOriginalJson);
- mOrderId = o.optString("orderId");
- mPackageName = o.optString("packageName");
- mSku = o.optString("productId");
- mPurchaseTime = o.optLong("purchaseTime");
- mPurchaseState = o.optInt("purchaseState");
- mDeveloperPayload = o.optString("developerPayload");
- mToken = o.optString("token", o.optString("purchaseToken"));
- mIsAutoRenewing = o.optBoolean("autoRenewing");
- mSignature = signature;
- }
-
- public String getItemType() { return mItemType; }
- public String getOrderId() { return mOrderId; }
- public String getPackageName() { return mPackageName; }
- public String getSku() { return mSku; }
- public long getPurchaseTime() { return mPurchaseTime; }
- public int getPurchaseState() { return mPurchaseState; }
- public String getDeveloperPayload() { return mDeveloperPayload; }
- public String getToken() { return mToken; }
- public String getOriginalJson() { return mOriginalJson; }
- public String getSignature() { return mSignature; }
- public boolean isAutoRenewing() { return mIsAutoRenewing; }
-
- @Override
- public String toString() { return "PurchaseInfo(type:" + mItemType + "):" + mOriginalJson; }
-}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/Security.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/Security.java
deleted file mode 100644
index 973a98949fba842952ee6684333278fab4bdccce..0000000000000000000000000000000000000000
--- a/qpython/src/main/java/org/qpython/qpy/utils/iap/Security.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.qpython.qpy.utils.iap;
-
-import android.text.TextUtils;
-import android.util.Base64;
-import android.util.Log;
-
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.X509EncodedKeySpec;
-
-/**
- * Security-related methods. For a secure implementation, all of this code
- * should be implemented on a server that communicates with the
- * application on the device. For the sake of simplicity and clarity of this
- * example, this code is included here and is executed on the device. If you
- * must verify the purchases on the phone, you should obfuscate this code to
- * make it harder for an attacker to replace the code with stubs that treat all
- * purchases as verified.
- */
-public class Security {
- private static final String TAG = "IABUtil/Security";
-
- private static final String KEY_FACTORY_ALGORITHM = "RSA";
- private static final String SIGNATURE_ALGORITHM = "SHA1withRSA";
-
- /**
- * Verifies that the data was signed with the given signature, and returns
- * the verified purchase. The data is in JSON format and signed
- * with a private key. The data also contains the {@link PurchaseState}
- * and product ID of the purchase.
- * @param base64PublicKey the base64-encoded public key to use for verifying.
- * @param signedData the signed JSON string (signed, not encrypted)
- * @param signature the signature for the data, signed with the private key
- */
- public static boolean verifyPurchase(String base64PublicKey, String signedData, String signature) {
- if (TextUtils.isEmpty(signedData) || TextUtils.isEmpty(base64PublicKey) ||
- TextUtils.isEmpty(signature)) {
- Log.e(TAG, "Purchase verification failed: missing data.");
- return false;
- }
-
- PublicKey key = Security.generatePublicKey(base64PublicKey);
- return Security.verify(key, signedData, signature);
- }
-
- /**
- * Generates a PublicKey instance from a string containing the
- * Base64-encoded public key.
- *
- * @param encodedPublicKey Base64-encoded public key
- * @throws IllegalArgumentException if encodedPublicKey is invalid
- */
- public static PublicKey generatePublicKey(String encodedPublicKey) {
- try {
- byte[] decodedKey = Base64.decode(encodedPublicKey, Base64.DEFAULT);
- KeyFactory keyFactory = KeyFactory.getInstance(KEY_FACTORY_ALGORITHM);
- return keyFactory.generatePublic(new X509EncodedKeySpec(decodedKey));
- } catch (NoSuchAlgorithmException e) {
- throw new RuntimeException(e);
- } catch (InvalidKeySpecException e) {
- Log.e(TAG, "Invalid key specification.");
- throw new IllegalArgumentException(e);
- }
- }
-
- /**
- * Verifies that the signature from the server matches the computed
- * signature on the data. Returns true if the data is correctly signed.
- *
- * @param publicKey public key associated with the developer account
- * @param signedData signed data from server
- * @param signature server signature
- * @return true if the data and signature match
- */
- public static boolean verify(PublicKey publicKey, String signedData, String signature) {
- byte[] signatureBytes;
- try {
- signatureBytes = Base64.decode(signature, Base64.DEFAULT);
- } catch (IllegalArgumentException e) {
- Log.e(TAG, "Base64 decoding failed.");
- return false;
- }
- try {
- Signature sig = Signature.getInstance(SIGNATURE_ALGORITHM);
- sig.initVerify(publicKey);
- sig.update(signedData.getBytes());
- if (!sig.verify(signatureBytes)) {
- Log.e(TAG, "Signature verification failed.");
- return false;
- }
- return true;
- } catch (NoSuchAlgorithmException e) {
- Log.e(TAG, "NoSuchAlgorithmException.");
- } catch (InvalidKeyException e) {
- Log.e(TAG, "Invalid key specification.");
- } catch (SignatureException e) {
- Log.e(TAG, "Signature exception.");
- }
- return false;
- }
-}
diff --git a/qpython/src/main/java/org/qpython/qpy/utils/iap/SkuDetails.java b/qpython/src/main/java/org/qpython/qpy/utils/iap/SkuDetails.java
deleted file mode 100644
index 2c92938a3d6a917da4e212edc7ca7ef5a318b4f7..0000000000000000000000000000000000000000
--- a/qpython/src/main/java/org/qpython/qpy/utils/iap/SkuDetails.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.qpython.qpy.utils.iap;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Represents an in-app product's listing details.
- */
-public class SkuDetails {
- private final String mItemType;
- private final String mSku;
- private final String mType;
- private final String mPrice;
- private final long mPriceAmountMicros;
- private final String mPriceCurrencyCode;
- private final String mTitle;
- private final String mDescription;
- private final String mJson;
-
- public SkuDetails(String jsonSkuDetails) throws JSONException {
- this(IabHelper.ITEM_TYPE_INAPP, jsonSkuDetails);
- }
-
- public SkuDetails(String itemType, String jsonSkuDetails) throws JSONException {
- mItemType = itemType;
- mJson = jsonSkuDetails;
- JSONObject o = new JSONObject(mJson);
- mSku = o.optString("productId");
- mType = o.optString("type");
- mPrice = o.optString("price");
- mPriceAmountMicros = o.optLong("price_amount_micros");
- mPriceCurrencyCode = o.optString("price_currency_code");
- mTitle = o.optString("title");
- mDescription = o.optString("description");
- }
-
- public String getSku() { return mSku; }
- public String getType() { return mType; }
- public String getPrice() { return mPrice; }
- public long getPriceAmountMicros() { return mPriceAmountMicros; }
- public String getPriceCurrencyCode() { return mPriceCurrencyCode; }
- public String getTitle() { return mTitle; }
- public String getDescription() { return mDescription; }
-
- @Override
- public String toString() {
- return "SkuDetails:" + mJson;
- }
-}
diff --git a/qpython/src/main/java/org/qpython/qpylib/MPyApi.java b/qpython/src/main/java/org/qpython/qpylib/MPyApi.java
index bad5eb4f75abac09876e7e9af8000fc22fbd9cbe..15ed00b20669b61fd1b76b14f7e107046e9f01ab 100644
--- a/qpython/src/main/java/org/qpython/qpylib/MPyApi.java
+++ b/qpython/src/main/java/org/qpython/qpylib/MPyApi.java
@@ -22,7 +22,6 @@ import com.quseit.base.QBaseApp;
import org.qpython.qpy.console.ScriptExec;
import com.quseit.util.FileHelper;
-import com.quseit.util.FileUtils;
import com.quseit.util.NAction;
import com.quseit.util.NUtil;
@@ -32,6 +31,8 @@ import org.qpython.qpysdk.QPyConstants;
import java.io.File;
+import util.FileUtil;
+
public class MPyApi extends BaseActivity {
public static final int SleepFinish = 1;
protected static final String TAG = "mpyapi";
@@ -48,7 +49,7 @@ public class MPyApi extends BaseActivity {
}
};
private boolean live = false;
- private String logF = FileUtils.getAbsoluteLogPath(App.getContext());
+ private String logF = FileUtil.getAbsoluteLogPath(App.getContext());
private Handler handler = new Handler() {
@Override
public void handleMessage(Message msg) {
@@ -120,7 +121,7 @@ public class MPyApi extends BaseActivity {
if (type.equals("script")) {
ScriptExec.getInstance().playScript(this,path, null);
} else if (type.equals("project")) {
- ScriptExec.getInstance().playProject(this,path, false);
+ ScriptExec.getInstance().playProject(this,path);
}
} else if (bundle != null) {
@@ -140,8 +141,8 @@ public class MPyApi extends BaseActivity {
} else {
runMode = 1;
}
- String script = FileUtils.getAbsolutePath(App.getContext()) + "/cache/last.py";
- FileHelper.putFileContents(this, script, pycode);
+ String script = FileUtil.getAbsolutePath(App.getContext()) + "/cache/last.py";
+ FileUtil.writeToFile(script, pycode);
ScriptExec.getInstance().playScript(this,script, null);
}
}
@@ -243,7 +244,7 @@ public class MPyApi extends BaseActivity {
rBundle.putString("result", result);
rBundle.putString("param", param);
rBundle.putString("flag", flag);
- rBundle.putString("log", FileUtils.getAbsoluteLogPath(App.getContext()));
+ rBundle.putString("log", FileUtil.getAbsoluteLogPath(App.getContext()));
rIntent.putExtras(rBundle);
diff --git a/qpython/src/main/java/org/qpython/qpylib/MPyService.java b/qpython/src/main/java/org/qpython/qpylib/MPyService.java
index b019f65aa71afb27c4e2a24e0a4c45c060c4f858..8150a6d409e8a2ffbe66336c656aaad1ee0d0a6a 100644
--- a/qpython/src/main/java/org/qpython/qpylib/MPyService.java
+++ b/qpython/src/main/java/org/qpython/qpylib/MPyService.java
@@ -7,8 +7,6 @@ import android.os.Bundle;
import android.os.IBinder;
import android.support.annotation.Nullable;
-import com.quseit.util.FileHelper;
-import com.quseit.util.FileUtils;
import com.quseit.util.NAction;
import com.quseit.util.NUtil;
@@ -16,6 +14,8 @@ import org.qpython.qpy.console.ScriptExec;
import org.qpython.qpy.main.app.App;
import org.qpython.qpysdk.QPyConstants;
+import util.FileUtil;
+
public class MPyService extends Service {
protected static final String TAG = "mpyapi";
protected String param;
@@ -57,7 +57,7 @@ public class MPyService extends Service {
ScriptExec.getInstance().playScript(MPyService.this, path, null);
} else if (type.equals("project")) {
- ScriptExec.getInstance().playProject(MPyService.this, path, false);
+ ScriptExec.getInstance().playProject(MPyService.this, path);
}
} else if (bundle != null) {
@@ -80,8 +80,8 @@ public class MPyService extends Service {
} else {
runMode = 1;
}
- String script = FileUtils.getAbsolutePath(App.getContext()) + "/cache/last.py";
- FileHelper.putFileContents(this, script, pycode);
+ String script = FileUtil.getAbsolutePath(App.getContext()) + "/cache/last.py";
+ FileUtil.writeToFile(script, pycode);
ScriptExec.getInstance().playScript(MPyService.this, script, null);
}
}
diff --git a/qpython/src/main/res/drawable-hdpi/ic_launcher.png b/qpython/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 917e7d2c36d616f16097d7270ec8c5d9e28cd8d4..0000000000000000000000000000000000000000
Binary files a/qpython/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-mdpi/ic_launcher.png b/qpython/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 3e46b2733b9b36a73b117d74614fac0cbfb4fe55..0000000000000000000000000000000000000000
Binary files a/qpython/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp3.png b/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp3.png
deleted file mode 100644
index 6841eeb040f094728a4d825bac35793b71931765..0000000000000000000000000000000000000000
Binary files a/qpython/src/main/res/drawable-xxhdpi/ic_project_webapp3.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy.png
deleted file mode 100644
index 52144a969029d047e30fdd06e963ae49b3dfb5e4..0000000000000000000000000000000000000000
Binary files a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy3.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy3.png
deleted file mode 100644
index 66c2739ee67db6603fc0b9763a5c5fdefef56b84..0000000000000000000000000000000000000000
Binary files a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_kivy3.png and /dev/null differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_notebookapp.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_notebookapp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f681815184884a17062cb24f806a9f86eb5acc1b
Binary files /dev/null and b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_notebookapp.png differ
diff --git a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp3.png b/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp3.png
deleted file mode 100644
index 11f4e4da43d9a3e75ec134a49e8b38fe87f525f3..0000000000000000000000000000000000000000
Binary files a/qpython/src/main/res/drawable-xxhdpi/ic_pyfile_webapp3.png and /dev/null differ
diff --git a/qpython/src/main/res/layout/dialog_enter.xml b/qpython/src/main/res/layout/dialog_enter.xml
index b29f18959effe13801eadd6d39e5ede15a45372e..1065cdfc1c957975a10af4b101d42ff45fffa036 100644
--- a/qpython/src/main/res/layout/dialog_enter.xml
+++ b/qpython/src/main/res/layout/dialog_enter.xml
@@ -10,11 +10,20 @@
android:orientation="vertical"
android:padding="@dimen/default_margin">
-
+
+
+
@@ -31,11 +40,15 @@
android:textColorHint="@color/text_gray"
android:textCursorDrawable="@drawable/edit_text_cursor"/>
+
+
+
+ android:orientation="horizontal"
+ android:layout_weight="3">
+ android:text="@string/selected"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/qpython/src/main/res/menu/qwebview_menu.xml b/qpython/src/main/res/menu/qwebview_menu.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9fa62244648f895a3f78713216d2db7901b27a7a
--- /dev/null
+++ b/qpython/src/main/res/menu/qwebview_menu.xml
@@ -0,0 +1,21 @@
+
+
\ No newline at end of file
diff --git a/qpython/src/main/res/values-zh-rCN/strings.xml b/qpython/src/main/res/values-zh-rCN/strings.xml
index 71f2891a44bd09335942a43721a7d3548e9c92df..d6603eb5ed35b0bc9f90499a7da99ae0aaf37700 100644
--- a/qpython/src/main/res/values-zh-rCN/strings.xml
+++ b/qpython/src/main/res/values-zh-rCN/strings.xml
@@ -16,8 +16,11 @@
在左侧显示的行号
如果某行对于屏幕太宽时，自动换行
如果有性能问题，不要选中
+ 你想要重新加载这个Notebook还是重新启动服务？
+ 重启动
+ 重加载
+ 你想使用QPyNotebook打开它吗？
-
显示Gist按钮
@@ -78,7 +81,7 @@
打开/关闭软键盘
插件删除成功
插件安装失败
- 工具
+ 精选
插件安装完成
验证PATH路径
默认 UTF-8
@@ -210,7 +213,7 @@
http://jackpal.github.com/Android-Terminal-Emulator/help/index.html
键盘
- 精选
+ 包
位置
更多
打开新终端
@@ -507,4 +510,12 @@
命令行界面
QPython初始化中
需要
+ 启动QPyNotebook服务
+ 它将会在QPython启动时运行
+ QPyNotebook服务
+ QPyNotebook未启动
+ Notebook主页
+ 标题
+ 主页
+ 启动SL4A服务……
diff --git a/qpython/src/main/res/values/arrays.xml b/qpython/src/main/res/values/arrays.xml
index df6e2d69c502396dccd12245c9359492c2e0ae76..4032eb04172f23a0f523e7720c170e886a77aaf4 100644
--- a/qpython/src/main/res/values/arrays.xml
+++ b/qpython/src/main/res/values/arrays.xml
@@ -226,17 +226,19 @@
- py
- txt
- - sh
+ - pyw
- html
- htm
+ - log
+ - conf
- js
- css
+ - ini
+ - sh
- md
- - pyx
- - log
- c
- h
- - conf
+ - pyx
diff --git a/qpython/src/main/res/values/history.xml b/qpython/src/main/res/values/history.xml
deleted file mode 100644
index 0b4b4892a98764c9beb54cfe866130976e56c5fe..0000000000000000000000000000000000000000
--- a/qpython/src/main/res/values/history.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
- 1.8 (10 nov 2012)
- "- Bug fixed : current file / last loaded file
-- Updated notification system
-- Possibility to modify the text font used by the editor (You can use any ttf font located on your device's internal and/or external storage)"
-
-
- 1.7 (16 july 2012)
- "- Bug fixed : Save/Save As crash on some phone
-- Added option to disable autosave on existing files"
-
-
- 1.6 (9 july 2012)
- "- Added the Auto Save feature
-- fixed the bug with Search case "
-
-
- 1.5 (21 june 2012)
- "- Adapted for Ice Cream Sandwich
-- Improved the Undo option (bugs with suggestions)
-- Added a Home Screen Widgets (shortcut to favorite files)
-- Added option to open a file by default when starting Ted
-- New Graphics (all made by myself ^^)"
-
-
- 1.3 (5 may 2012)
- "- Added an undo option (check the settings)
-- Added some performance tweaks"
-
-
- 1.2 (18 apr. 2012)
- "- Fixed the scroll bug since last update
-- fixed the fling options in the settings (option was always active)"
-
-
- 1.1 (10 apr. 2012)
- "- Fixed the crash at start caused by the last update
-- Added Fling to Scroll (launches the scroll to navigate in large files)
-- Display the active line
-- Added new color theme (ask for more if needed)"
- 1.0 (27 feb. 2012)
- "- Brand new release version
-- Supports multiple encoding (including UTF-8)
-- Prevent data loss when saving really big files (note that Ted is not meant to open big files though)
-- Added new color theme (ask for more if needed)
-- Replaced the autosave with a warning and popup (prevent saving unwanted changes)"
- βetα 0.9 (7 jan. 2010)
- "- Bug fixed : severall crash on start
-- Added a search tool
-- Ted is listed when opening html, rss, css, php and xml files from any file browser (ask for other types if needed)"
- βetα 0.8 (23 dec. 2010)
- "- Automatic save can be disabled in the settings"
- βetα 0.7 (19 dec. 2010)
- "- App can be installed on the SD Card (on Android 2.2)
-- Automatic detection of end of line in opened files, possibility to define a default end of line for new files
-- Bigger dialog boxes
-- Bug fixed when openning big files"
- βetα 0.6 (8 dec. 2010)
- "- Possibility to change text size in the settings.
-- Possibility to open read-only text files from other location than the SD card
-- Added a backup function for unsaved text "
- βetα 0.5 (29 nov. 2010)
- "- Bug fixed while opening some files
-- New Graphics"
- βetα 0.4 (27 nov. 2010)
- "- Remembers the files opened recently (number of recent files can be changed)
-- display lines numbers (can be changed in the settings)
-- automatically break lines to keep a width of one page (can be changed in the settings)"
- βetα 0.3 (25 nov. 2010)
- "- Bug fixed : crash when trying to open online files"
- βetα 0.2 (13 nov. 2010)
- "- Open existing files - Save and save as"
-
-
\ No newline at end of file
diff --git a/qpython/src/main/res/values/strings.xml b/qpython/src/main/res/values/strings.xml
index 898d1338aae2052ce34ceb7b8f497af60d637ab8..166a6a0b4429e86537390539e536469d5e554053 100644
--- a/qpython/src/main/res/values/strings.xml
+++ b/qpython/src/main/res/values/strings.xml
@@ -46,7 +46,7 @@
Gist
More
- Featured
+ Package
SL4A Server
FTP Server
@@ -498,7 +498,7 @@
Editor
Not support yet
New file
- Tools
+ Selected
enable AIPY from setting]]>
install base packages \n before install related Jupyter packages.]]>
@@ -677,7 +677,6 @@
After starting QPyNotebook Service, you can browse the ipynb file from explorer
QPyNotebook is not started
- QPyNotebook only supports Python 3
notebook_enable
Start to learn
Entertainment
@@ -777,4 +776,9 @@
Shell Interface
QPython Initializing
need
+ Notebook HomePage
+ NotebookHomePage
+ Title
+ HomePage
+ Start SL4A Server …
diff --git a/qpython/src/main/res/xml/qpython_setting.xml b/qpython/src/main/res/xml/qpython_setting.xml
index bbaba0697c4389e63a94472e66226a9173495ebf..a0a9c19c566df02a032d1dec62f0170194be2114 100644
--- a/qpython/src/main/res/xml/qpython_setting.xml
+++ b/qpython/src/main/res/xml/qpython_setting.xml
@@ -106,6 +106,10 @@
android:key="@string/key_notebook_run"
android:summary="@string/notebook_explorer_bg_start"
android:title="@string/notebook_explorer"/>
+
+
diff --git a/termemulator/build.gradle b/termemulator/build.gradle
index e93699a1c87ee85896ec52257167ab4910d602cf..650efc1dffd4125432099387632f08384a3504a5 100644
--- a/termemulator/build.gradle
+++ b/termemulator/build.gradle
@@ -6,8 +6,6 @@ android {
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 1
- versionName "1.0"
}
buildTypes {
@@ -20,4 +18,8 @@ android {
lintOptions {
abortOnError false
}
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_7
+ targetCompatibility JavaVersion.VERSION_1_7
+ }
}
diff --git a/termexec/build.gradle b/termexec/build.gradle
index 91223859642294ec8edcf82800449298e3699bb9..78708e41b85a22ef4cc050adcbea6f92ca71c471 100644
--- a/termexec/build.gradle
+++ b/termexec/build.gradle
@@ -10,7 +10,7 @@ buildscript {
apply plugin: 'com.android.library'
repositories {
- jcenter()
+ mavenCentral()
google()
}
@@ -20,8 +20,6 @@ android {
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.minSdkVersion
- versionCode 1
- versionName "1.0"
ndk {
abiFilters 'armeabi-v7a',"arm64-v8a"