Go to GitHub releases when checking for updates if Play Store isn't a…

…vailable
farmerbb · Oct 29, 2018 · b37f436 · b37f436
1 parent 7b42946
commit b37f436
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/ProfileEditFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/ProfileEditFragment.java
@@ -254,7 +254,7 @@ public void onCreate(Bundle savedInstanceState) {
         else
             addPreferencesFromResource(R.xml.display_settings);
 
-        if(isPlayStoreInstalled(getActivity())
+        if(U.isPlayStoreInstalled(getActivity())
                 && U.isPlayStoreRelease(getActivity())
                 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             addPreferencesFromResource(R.xml.desktop_optimization);
@@ -879,13 +879,4 @@ private void disablePreference(SharedPreferences prefNew, String preferenceName,
         if(preference instanceof CheckBoxPreference)
             ((CheckBoxPreference) preference).setChecked(false);
     }
-
-    public static boolean isPlayStoreInstalled(Context context) {
-        try {
-            context.getPackageManager().getPackageInfo("com.android.vending", 0);
-            return true;
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-    }
 }
diff --git a/app/src/main/java/com/farmerbb/secondscreen/util/U.java b/app/src/main/java/com/farmerbb/secondscreen/util/U.java
@@ -1007,9 +1007,13 @@ public static boolean castScreenActive(Context context) {
     // Directs the user to check for updates
     public static void checkForUpdates(Context context) {
         String url;
-        if(isPlayStoreRelease(context))
-            url = "https://play.google.com/store/apps/details?id=" + BuildConfig.APPLICATION_ID;
-        else
+        if(isPlayStoreRelease(context)) {
+            if(BuildConfig.APPLICATION_ID.equals("com.farmerbb.secondscreen.free")
+                    && !isPlayStoreInstalled(context))
+                url = "https://github.com/farmerbb/SecondScreen/releases";
+            else
+                url = "https://play.google.com/store/apps/details?id=" + BuildConfig.APPLICATION_ID;
+        } else
             url = "https://f-droid.org/repository/browse/?fdid=" + BuildConfig.APPLICATION_ID;
 
         Intent intent = new Intent(Intent.ACTION_VIEW);
@@ -1430,4 +1434,13 @@ public static boolean hasSupportLibrary(Context context) {
             return false;
         }
     }
+
+    public static boolean isPlayStoreInstalled(Context context) {
+        try {
+            context.getPackageManager().getPackageInfo("com.android.vending", 0);
+            return true;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
 }