SetupWizard: Remove useless WhisperPushUtils
WISP-41 Change-Id: Ia93d9f9d5d1b2f4d2613491e203451247ca9b474 Signed-off-by: Zdrowy Gosciu <ZdrowyGosciu+GITHUB@gmail.com> (cherry picked from commit 9710862296c94cd6d9b5d16f146e9fb4ec899009)
This commit is contained in:
parent
1b1b991da5
commit
13539517cf
@ -27,7 +27,6 @@ import android.net.Uri;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.RemoteException;
|
import android.os.RemoteException;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
import android.provider.Settings;
|
|
||||||
import android.text.Spannable;
|
import android.text.Spannable;
|
||||||
import android.text.SpannableString;
|
import android.text.SpannableString;
|
||||||
import android.text.SpannableStringBuilder;
|
import android.text.SpannableStringBuilder;
|
||||||
|
@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2014 The CyanogenMod Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package com.cyanogenmod.setupwizard.util;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.telephony.TelephonyManager;
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
import com.google.i18n.phonenumbers.NumberParseException;
|
|
||||||
import com.google.i18n.phonenumbers.PhoneNumberUtil;
|
|
||||||
import com.google.i18n.phonenumbers.Phonenumber;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Utilities for interacting with WhisperPush
|
|
||||||
*
|
|
||||||
* @author Chris Soyars
|
|
||||||
*/
|
|
||||||
public class WhisperPushUtils {
|
|
||||||
|
|
||||||
private static final String TAG = WhisperPushUtils.class.getSimpleName();
|
|
||||||
private static final String ACTION_REGISTER_NUMBER = "org.thoughtcrime.securesms.RegistrationService.REGISTER_NUMBER";
|
|
||||||
|
|
||||||
private static boolean isEmpty(String value) {
|
|
||||||
return value == null || value.trim().length() == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String getPhoneNumber(Context context) {
|
|
||||||
String localNumber = ((TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE))
|
|
||||||
.getLine1Number();
|
|
||||||
|
|
||||||
if (!isEmpty(localNumber) && !localNumber.startsWith("+")) {
|
|
||||||
if (localNumber.length() == 10) {
|
|
||||||
localNumber = "+1" + localNumber;
|
|
||||||
} else {
|
|
||||||
localNumber = "+" + localNumber;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (!isEmpty(localNumber)) {
|
|
||||||
PhoneNumberUtil numberUtil = PhoneNumberUtil.getInstance();
|
|
||||||
Phonenumber.PhoneNumber localNumberObject = numberUtil.parse(localNumber, null);
|
|
||||||
return numberUtil.format(localNumberObject, PhoneNumberUtil.PhoneNumberFormat.E164);
|
|
||||||
}
|
|
||||||
} catch (NumberParseException npe) {
|
|
||||||
Log.w(TAG, npe);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void startRegistration(Context context) {
|
|
||||||
String phoneNumber = getPhoneNumber(context);
|
|
||||||
Log.d(TAG, "Starting WhisperPush registration with number: " + phoneNumber);
|
|
||||||
if (phoneNumber != null) {
|
|
||||||
Intent intent = new Intent();
|
|
||||||
intent.setAction(ACTION_REGISTER_NUMBER);
|
|
||||||
intent.setClassName("org.whispersystems.whisperpush", "org.whispersystems.whisperpush.service.RegistrationService");
|
|
||||||
intent.putExtra("e164number", phoneNumber);
|
|
||||||
context.startService(intent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user