summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml4
-rw-r--r--res/values/strings.xml1
-rw-r--r--src/org/fox/ttrss/OnlineActivity.java17
3 files changed, 8 insertions, 14 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index df98441d..ebf91fe0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
- android:versionCode="122"
- android:versionName="1.0" >
+ android:versionCode="123"
+ android:versionName="1.1" >
<uses-sdk
android:minSdkVersion="8"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 93f97cc1..7b1ab5fb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -151,4 +151,5 @@
<string name="trial_purchase">Unlock full version</string>
<string name="trial_expired">Trial expired</string>
<string name="trial_expired_message">To continue using Tiny Tiny RSS please unlock the full version by purchasing the key.</string>
+ <string name="trial_thanks">Full version, thank you for support!</string>
</resources> \ No newline at end of file
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java
index 36c46461..47ad86c0 100644
--- a/src/org/fox/ttrss/OnlineActivity.java
+++ b/src/org/fox/ttrss/OnlineActivity.java
@@ -25,6 +25,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
@@ -447,18 +448,8 @@ public class OnlineActivity extends CommonActivity {
}
public void checkTrial(boolean notify) {
- List<PackageInfo> pkgs = getPackageManager()
- .getInstalledPackages(0);
-
- boolean isTrial = true;
-
- for (PackageInfo p : pkgs) {
- if ("org.fox.ttrss.key".equals(p.packageName)) {
- //toast(R.string.donate_thanks);
- isTrial = false;
- break;
- }
- }
+ boolean isTrial = getPackageManager().checkSignatures(
+ getPackageName(), "org.fox.ttrss.key") != PackageManager.SIGNATURE_MATCH;
if (isTrial) {
long firstStart = m_prefs.getLong("date_firstlaunch_trial", -1);
@@ -509,6 +500,8 @@ public class OnlineActivity extends CommonActivity {
toast(getString(R.string.trial_mode_prompt, Long.valueOf(daysLeft)));
}
}
+ } else if (notify) {
+ toast(R.string.trial_thanks);
}
}