TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-20 06:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly check for disabled play services if needs update

Browse Source 
Fixes #6381
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-06-02 09:59:23 -07:00
parent 5672701a60
commit 58273997b9
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/thoughtcrime/securesms/RegistrationActivity.java
View File

@ -3,6 +3,8 @@ package org.thoughtcrime.securesms;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
@ -279,6 +281,16 @@ public class RegistrationActivity extends BaseActionBarActivity {
case ConnectionResult.SUCCESS: case ConnectionResult.SUCCESS:
return PlayServicesStatus.SUCCESS; return PlayServicesStatus.SUCCESS;
case ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED: case ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED:
try {
ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo("com.google.android.gms", 0);
if (applicationInfo != null && !applicationInfo.enabled) {
return PlayServicesStatus.MISSING;
}
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, e);
}
return PlayServicesStatus.NEEDS_UPDATE; return PlayServicesStatus.NEEDS_UPDATE;
case ConnectionResult.SERVICE_DISABLED: case ConnectionResult.SERVICE_DISABLED:
case ConnectionResult.SERVICE_MISSING: case ConnectionResult.SERVICE_MISSING: