Check signatures when opening files app

Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-08-12 09:23:58 +02:00
parent de89e7615d
commit 38df5d2859

View File

@ -28,6 +28,7 @@ import android.accounts.AccountManager;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.Signature;
import android.util.Log; import android.util.Log;
import com.nextcloud.talk.R; import com.nextcloud.talk.R;
import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.application.NextcloudTalkApplication;
@ -35,6 +36,7 @@ import com.nextcloud.talk.models.ImportAccount;
import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.models.database.UserEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
public class AccountUtils { public class AccountUtils {
@ -108,12 +110,19 @@ public class AccountUtils {
PackageInfo packageInfo = PackageInfo packageInfo =
pm.getPackageInfo(context.getString(R.string.nc_import_accounts_from), 0); pm.getPackageInfo(context.getString(R.string.nc_import_accounts_from), 0);
if (packageInfo.versionCode >= 30060151) { if (packageInfo.versionCode >= 30060151) {
final AccountManager accMgr = AccountManager.get(context); Signature[] ownSignatures = pm.getPackageInfo(context.getPackageName(), PackageManager.GET_SIGNATURES).signatures;
final Account[] accounts = accMgr.getAccountsByType(context.getString(R.string.nc_import_account_type)); Signature[] filesAppSignatures = pm.getPackageInfo(context.getString(R.string.nc_import_accounts_from), PackageManager.GET_SIGNATURES).signatures;
for (Account account : accounts) {
if (account.name.equals(accountName)) { if (Arrays.equals(ownSignatures, filesAppSignatures)) {
return true; final AccountManager accMgr = AccountManager.get(context);
final Account[] accounts = accMgr.getAccountsByType(context.getString(R.string.nc_import_account_type));
for (Account account : accounts) {
if (account.name.equals(accountName)) {
return true;
}
} }
} else {
return true;
} }
} }
} catch (PackageManager.NameNotFoundException appNotFoundException) { } catch (PackageManager.NameNotFoundException appNotFoundException) {