iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb

Browse Source 
Conflicts:
	res/values/strings.xml
This commit is contained in:
Andrew Dolgov 2012-12-31 03:15:27 +04:00
commit fc4111ae22
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="122" android:versionCode="123"
android:versionName="1.0" > android:versionName="1.1" >
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"

1
res/values/strings.xml
View File

@ -152,4 +152,5 @@
<string name="trial_expired">Trial expired</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_expired_message">To continue using Tiny Tiny RSS please unlock the full version by purchasing the key.</string>
<string name="theme_sepia">Sepia</string> <string name="theme_sepia">Sepia</string>
<string name="trial_thanks">Full version, thank you for support!</string>
</resources> </resources>

17
src/org/fox/ttrss/OnlineActivity.java
View File

@ -25,6 +25,7 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
@ -450,18 +451,8 @@ public class OnlineActivity extends CommonActivity {
} }
public void checkTrial(boolean notify) { public void checkTrial(boolean notify) {
List<PackageInfo> pkgs = getPackageManager() boolean isTrial = getPackageManager().checkSignatures(
.getInstalledPackages(0); getPackageName(), "org.fox.ttrss.key") != PackageManager.SIGNATURE_MATCH;
boolean isTrial = true;
for (PackageInfo p : pkgs) {
if ("org.fox.ttrss.key".equals(p.packageName)) {
//toast(R.string.donate_thanks);
isTrial = false;
break;
}
}
if (isTrial) { if (isTrial) {
long firstStart = m_prefs.getLong("date_firstlaunch_trial", -1); long firstStart = m_prefs.getLong("date_firstlaunch_trial", -1);
@ -512,6 +503,8 @@ public class OnlineActivity extends CommonActivity {
toast(getString(R.string.trial_mode_prompt, Long.valueOf(daysLeft))); toast(getString(R.string.trial_mode_prompt, Long.valueOf(daysLeft)));
} }
} }
} else if (notify) {
toast(R.string.trial_thanks);
} }
} }