Removed paypal link from Google Play version.

routerkeygen · Sep 12, 2015 · dce8903 · dce8903
1 parent 5888420
commit dce8903
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/android/routerKeygen/src/main/java/org/exobel/routerkeygen/ui/NetworksListActivity.java b/android/routerKeygen/src/main/java/org/exobel/routerkeygen/ui/NetworksListActivity.java
@@ -125,7 +125,7 @@ public void onCreate(Bundle savedInstanceState) {
             if (!AdsUtils.checkDonation(this)) {
                 final String whatsNewTitle = getString(R.string.msg_welcome_title);
                 final String whatsNewText = getString(R.string.msg_welcome_text);
-                new AlertDialog.Builder(this)
+                final AlertDialog.Builder initialDialog = new AlertDialog.Builder(this)
                         .setIcon(android.R.drawable.ic_dialog_alert)
                         .setTitle(whatsNewTitle)
                         .setMessage(whatsNewText)
@@ -136,17 +136,6 @@ public void onClick(DialogInterface dialog,
                                         dialog.dismiss();
                                     }
                                 })
-                        .setNeutralButton(R.string.bt_paypal,
-                                new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog,
-                                                        int which) {
-                                        final String donateLink = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V3FFBTRTTV5DN";
-                                        Uri uri = Uri.parse(donateLink);
-                                        startActivity(new Intent(
-                                                Intent.ACTION_VIEW, uri));
-                                        dialog.dismiss();
-                                    }
-                                })
                         .setPositiveButton(R.string.bt_google_play,
                                 new DialogInterface.OnClickListener() {
                                     public void onClick(DialogInterface dialog,
@@ -167,7 +156,22 @@ public void onClick(DialogInterface dialog,
                                                 Toast.LENGTH_LONG).show();
                                         dialog.dismiss();
                                     }
-                                }).show();
+                                });
+                if (BuildConfig.APPLICATION_ID.equals("org.exobel.routerkeygen")) {
+                    initialDialog.setNeutralButton(R.string.bt_paypal,
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog,
+                                                    int which) {
+                                    final String donateLink = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V3FFBTRTTV5DN";
+                                    Uri uri = Uri.parse(donateLink);
+                                    startActivity(new Intent(
+                                            Intent.ACTION_VIEW, uri));
+                                    dialog.dismiss();
+                                }
+                            }).show();
+                } else {
+                    initialDialog.show();
+                }
             }
         }
         if (welcomeScreenShown) {

diff --git a/android/routerKeygen/src/main/res/raw/changelog.xml b/android/routerKeygen/src/main/res/raw/changelog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="true">
 
-    <changelogversion changeDate="Ago 31,2015" versionName="3.15.0">
+    <changelogversion changeDate="Sep 11,2015" versionName="3.15.0">
         <changelogtext>[b]New![/b] Alcatel Lucent algorithm</changelogtext>
         <changelogtext>[b]New![/b] Sitecom algorithm</changelogtext>
         <changelogtext>[b]New![/b] Huawei algorithm</changelogtext>