diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java index b839022de..2bea73451 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java @@ -1,7 +1,6 @@ package ru.vtosters.lite.ui.fragments.multiaccount; import static android.content.Context.MODE_PRIVATE; - import static ru.vtosters.lite.utils.Helper.GetContext; import android.content.SharedPreferences; @@ -18,7 +17,6 @@ import com.vk.audio.AudioMessageUtils; import com.vk.auth.api.VKAccount; import com.vk.core.f.FileUtils; import com.vk.core.util.AppContextHolder; -import com.vk.core.util.ToastUtils; import com.vk.imageloader.VKImageLoader; import com.vk.imageloader.view.VKCircleImageView; import com.vk.pushes.PushSubscriber; @@ -32,7 +30,7 @@ import ru.vtosters.lite.utils.Helper; public class MultiAccountAdapter extends RecyclerView.a { - private List mAccounts = new ArrayList<>(); + private final List mAccounts = new ArrayList<>(); public MultiAccountAdapter() { CharSequence[] getAccAmountNames = MultiAccountManager.getAccAmountNames(); @@ -96,8 +94,7 @@ public class MultiAccountAdapter extends RecyclerView.a { @@ -153,19 +150,14 @@ public class MultiAccountAdapter extends RecyclerView.a { // здесь удаление аккаунта из префов - VKImageLoader.b(); - ImEngineProvider.a().h(); - AudioMessageUtils.j(); - FileUtils.l(); - VKAccount b = VKAccountManager.b(); - PushSubscriber.a.a(b.b(), b.c()); - AppContextHolder.a.getSharedPreferences("gcm", 0).edit().clear().apply(); - ToastUtils.a(Helper.getString("restartapp")); + GetContext().getSharedPreferences("pref_account_manager" + pos, MODE_PRIVATE).edit().clear().commit(); + Helper.restarting(); }); mAction.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java index ace8d0681..f89759382 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java @@ -46,13 +46,14 @@ public class MultiAccountManager { } public static String getAvatar(String str) { - Pattern pattern = Pattern.compile(".*\"name\":\\{.*?:\"(.*?)\"\\}.*"); + Pattern pattern = Pattern.compile(".*\"photo\":\\{.*?:\"(.*?)\"\\}.*"); Matcher matcher = pattern.matcher(getNeededAccount(str).getString("key_vk_account", "")); if (matcher.find()) { String group = matcher.group(1); - return group; + String replaced = group.replace("\\/", "/"); + return replaced; } - return "err"; + return "https://vk.com/images/camera_200.png"; } public static int getAvalibleAcc() { @@ -88,7 +89,7 @@ public class MultiAccountManager { ArrayList list = new ArrayList(); while (true) { if (getAvatar(Integer.toString(intg)) != "err") { - list.add(getName(Integer.toString(intg))); + list.add(getAvatar(Integer.toString(intg))); intg++; } else { break;