Merge pull request #284 from nextcloud/fix-min-version-check (ee319e4e) · Commits · e / os / Android SingleSignOn

src/main/java/com/nextcloud/android/sso/helper/VersionCheckHelper.java

+26 −10

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager;
		import android.util.Log;

		import com.nextcloud.android.sso.Constants;
		import com.nextcloud.android.sso.exceptions.NextcloudFilesAppNotInstalledException;
		import com.nextcloud.android.sso.exceptions.NextcloudFilesAppNotSupportedException;
		import com.nextcloud.android.sso.ui.UiExceptionManager;
		@@ -18,25 +19,40 @@ public final class VersionCheckHelper {

		public static boolean verifyMinVersion(Activity activity, int minVersion) {
		try {
		int verCode = getNextcloudFilesVersionCode(activity);

		int verCode = getNextcloudFilesVersionCode(activity, true);
		if (verCode < minVersion) {
		UiExceptionManager.showDialogForException(activity, new NextcloudFilesAppNotSupportedException());
		return false;
		}
		return true;
		} catch (PackageManager.NameNotFoundException e) {
		Log.e(TAG, "PackageManager.NameNotFoundException (app with package-name not found): " + e.getMessage());
		UiExceptionManager.showDialogForException(activity, new NextcloudFilesAppNotInstalledException());
		Log.e(TAG, "PackageManager.NameNotFoundException (prod files app not found): " + e.getMessage());

		// Stable Files App is not installed at all. Therefore we need to run the test on the dev app
		try {
		int verCode = getNextcloudFilesVersionCode(activity, false);
		// The dev app follows a different versioning schema.. therefore we can't do our normal checks
		// However beta users are probably always up to date so we will just ignore it for now
		Log.d(TAG, "Dev files app version is: " + verCode);
		/*
		if (verCode < minVersion) {
		UiExceptionManager.showDialogForException(activity, new NextcloudFilesAppNotSupportedException());
		return false;
		}

		*/
		return true;
		} catch (PackageManager.NameNotFoundException ex) {
		Log.e(TAG, "PackageManager.NameNotFoundException (dev files app not found): " + e.getMessage());
		UiExceptionManager.showDialogForException(activity, new NextcloudFilesAppNotInstalledException());
		}
		}
		return false;
		}

		public static int getNextcloudFilesVersionCode(Context context) throws PackageManager.NameNotFoundException {
		PackageInfo pInfo = context.getPackageManager().getPackageInfo("com.nextcloud.client", 0);
		public static int getNextcloudFilesVersionCode(Context context, boolean prod) throws PackageManager.NameNotFoundException {
		PackageInfo pInfo = context.getPackageManager().getPackageInfo(prod ? Constants.PACKAGE_NAME_PROD : Constants.PACKAGE_NAME_DEV, 0);
		int verCode = pInfo.versionCode;
		Log.e("VersionCheckHelper", "Version Code: " + verCode);
		Log.d("VersionCheckHelper", "Version Code: " + verCode);
		return verCode;
		}
		}