" +
- data.getString("content")
+ text
.replace("&", "&")
.replace("
= Build.VERSION_CODES.FROYO) {
- showConfirmDialog("access_token");
+ showConfirmDialog();
}
return false;
}
@@ -218,7 +209,7 @@ public boolean onPreferenceClick(Preference preference) {
}
@RequiresApi(api = Build.VERSION_CODES.FROYO)
- private void showConfirmDialog(final String target) {
+ private void showConfirmDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(DebugMenuActivity.this);
final View confirm_view = getLayoutInflater().inflate(R.layout.dialog_confirm_with_passw, null, false);
final EditText password_edit = confirm_view.findViewById(R.id.password_edit);
@@ -238,18 +229,20 @@ public void onClick(View view) {
try {
if(instance_prefs.getString("account_password_hash", "")
.equals(Global.GetSHA256Hash(password_edit.getText().toString()))) {
- if (target.equals("access_token")) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
- android.text.ClipboardManager clipboard =
- (android.text.ClipboardManager)
- getSystemService(Context.CLIPBOARD_SERVICE);
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+ android.text.ClipboardManager clipboard =
+ (android.text.ClipboardManager)
+ getSystemService(Context.CLIPBOARD_SERVICE);
+ if (clipboard != null) {
clipboard.setText(instance_prefs.getString("access_token", ""));
- } else {
- android.content.ClipboardManager clipboard =
- (android.content.ClipboardManager)
- getSystemService(Context.CLIPBOARD_SERVICE);
- android.content.ClipData clip = android.content.ClipData
- .newPlainText("OpenVK API Access Token", instance_prefs.getString("access_token", ""));
+ }
+ } else {
+ android.content.ClipboardManager clipboard =
+ (android.content.ClipboardManager)
+ getSystemService(Context.CLIPBOARD_SERVICE);
+ android.content.ClipData clip = android.content.ClipData
+ .newPlainText("OpenVK API Access Token", instance_prefs.getString("access_token", ""));
+ if (clipboard != null) {
clipboard.setPrimaryClip(clip);
}
}
diff --git a/app/src/main/java/uk/openvk/android/legacy/core/activities/settings/ExperimentalFeaturesActivity.java b/app/src/main/java/uk/openvk/android/legacy/core/activities/settings/ExperimentalFeaturesActivity.java
deleted file mode 100644
index 539b895ff..000000000
--- a/app/src/main/java/uk/openvk/android/legacy/core/activities/settings/ExperimentalFeaturesActivity.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package uk.openvk.android.legacy.core.activities.settings;
-
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.PreferenceManager;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import dev.tinelix.retro_ab.ActionBar;
-import uk.openvk.android.legacy.R;
-import uk.openvk.android.legacy.core.activities.base.TranslucentPreferenceActivity;
-
-public class ExperimentalFeaturesActivity extends TranslucentPreferenceActivity {
- private SharedPreferences global_prefs;
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.preferences_experimental);
- setContentView(R.layout.layout_custom_preferences);
-
- // for warning label
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- ((LinearLayout.LayoutParams) findViewById(android.R.id.list).getLayoutParams()).topMargin =
- (int) (8 * getResources().getDisplayMetrics().scaledDensity);
- }
-
- global_prefs = android.preference.PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
- getActionBar().setHomeButtonEnabled(true);
- }
- getActionBar().setDisplayHomeAsUpEnabled(true);
- if(global_prefs.getString("uiTheme", "blue").equals("Gray")) {
- getActionBar().setBackgroundDrawable(
- getResources().getDrawable(R.drawable.bg_actionbar_gray));
- } else if(global_prefs.getString("uiTheme", "blue").equals("Black")) {
- getActionBar().setBackgroundDrawable(
- getResources().getDrawable(R.drawable.bg_actionbar_black));
- }
- } else {
- final ActionBar actionBar = findViewById(R.id.actionbar);
- actionBar.setTitle(R.string.experimental_features);
- actionBar.setHomeLogo(R.drawable.ic_ab_app);
- actionBar.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_actionbar));
- actionBar.setDisplayHomeAsUpEnabled(true);
- actionBar.setHomeAction(new ActionBar.AbstractAction(0) {
- @Override
- public void performAction(View view) {
- onBackPressed();
- }
- });
- switch (global_prefs.getString("uiTheme", "blue")) {
- case "Gray":
- actionBar.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_actionbar));
- break;
- case "Black":
- actionBar.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_actionbar_black));
- break;
- default:
- actionBar.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_actionbar));
- break;
- }
- }
- listenPreferences();
- }
-
- @Override
- public boolean onMenuItemSelected(int featureId, MenuItem item) {
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- if(item.getItemId() == android.R.id.home) {
- onBackPressed();
- }
- }
- return super.onMenuItemSelected(featureId, item);
- }
-
- private void listenPreferences() {
- final SharedPreferences experimental_pref = getSharedPreferences("experimental", 0);
- try {
- final CheckBoxPreference ffmpeg_player =
- (CheckBoxPreference) findPreference("video_ffmpeg_player");
- if(ffmpeg_player != null) {
- ffmpeg_player.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object o) {
- ((CheckBoxPreference) preference).setChecked(!((CheckBoxPreference) preference).isChecked());
- final SharedPreferences.Editor editor = experimental_pref.edit();
- editor.putBoolean("video_ffmpeg_player", ((CheckBoxPreference) preference).isChecked());
- editor.commit();
- return false;
- }
- });
- ffmpeg_player.setChecked(experimental_pref.getBoolean("video_ffmpeg_player", false));
- }
-
- CheckBoxPreference tSysUI_v14 =
- (CheckBoxPreference) findPreference("core_translucent_systemui_v14");
- if(tSysUI_v14 != null) {
- tSysUI_v14.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object o) {
- ((CheckBoxPreference) preference).setChecked(!((CheckBoxPreference) preference).isChecked());
- final SharedPreferences.Editor editor = experimental_pref.edit();
- editor.putBoolean("core_translucent_systemui_v14", ((CheckBoxPreference) preference).isChecked());
- editor.commit();
- return false;
- }
- });
- tSysUI_v14.setChecked(experimental_pref.getBoolean("core_translucent_systemui_v14", false));
- }
-
- CheckBoxPreference xmas_mood =
- (CheckBoxPreference) findPreference("core_xmas_mood");
- if(xmas_mood != null) {
- xmas_mood.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object o) {
- ((CheckBoxPreference) preference).setChecked(!((CheckBoxPreference) preference).isChecked());
- final SharedPreferences.Editor editor = experimental_pref.edit();
- editor.putBoolean("core_xmas_mood", ((CheckBoxPreference) preference).isChecked());
- editor.commit();
- return false;
- }
- });
- xmas_mood.setChecked(experimental_pref.getBoolean("core_xmas_mood", false));
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/app/src/main/java/uk/openvk/android/legacy/core/fragments/AudiosFragment.java b/app/src/main/java/uk/openvk/android/legacy/core/fragments/AudiosFragment.java
index 64abcf009..7e02d3100 100644
--- a/app/src/main/java/uk/openvk/android/legacy/core/fragments/AudiosFragment.java
+++ b/app/src/main/java/uk/openvk/android/legacy/core/fragments/AudiosFragment.java
@@ -157,14 +157,22 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
- inflater.inflate(R.menu.audio, menu);
- fragment_menu = menu;
+ try {
+ inflater.inflate(R.menu.audio, menu);
+ fragment_menu = menu;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@Override
public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
- createSearchItem(menu);
+ try {
+ createSearchItem(menu);
+ } catch (Exception e){
+
+ }
}
private void createSearchItem(Menu menu) {
@@ -265,7 +273,11 @@ public void closeSearchItem() {
ab.getCustomView()
.findViewById(R.id.custom_ab_layout)
.setVisibility(View.VISIBLE);
- searchView.setIconified(true);
+ try {
+ searchView.setIconified(true);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
createSearchResultsAdapter(audios);
} else {
final dev.tinelix.retro_ab.ActionBar actionBar = getActivity().findViewById(R.id.actionbar);
diff --git a/app/src/main/java/uk/openvk/android/legacy/core/fragments/MainSettingsFragment.java b/app/src/main/java/uk/openvk/android/legacy/core/fragments/MainSettingsFragment.java
index c8247c490..ba0c7116e 100644
--- a/app/src/main/java/uk/openvk/android/legacy/core/fragments/MainSettingsFragment.java
+++ b/app/src/main/java/uk/openvk/android/legacy/core/fragments/MainSettingsFragment.java
@@ -77,7 +77,7 @@ public class MainSettingsFragment extends ActivePreferenceFragment {
@SuppressWarnings("ConstantConditions")
@Override
- public void onCreatePreferencesFix(Bundle bundle, String s) {
+ public void onCreatePreferences(Bundle bundle, String s) {
global_prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
instance_prefs = ((OvkApplication) getContext().getApplicationContext()).getAccountPreferences();
Bundle data = getActivity().getIntent().getExtras();
@@ -100,7 +100,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- setDividerPreferences(DIVIDER_PADDING_CHILD | DIVIDER_CATEGORY_AFTER_LAST | DIVIDER_CATEGORY_BETWEEN);
+ // setDividerPreferences(DIVIDER_PADDING_CHILD | DIVIDER_CATEGORY_AFTER_LAST | DIVIDER_CATEGORY_BETWEEN);
view.setBackgroundColor(getResources().getColor(R.color.white));
}
@@ -266,15 +266,9 @@ public boolean onPreferenceClick(Preference preference) {
public boolean onPreferenceClick(Preference preference) {
if (instance_prefs.getString("access_token", "").length() > 0) {
danger_zone_multiple_tap += 1;
- if (danger_zone_multiple_tap == 1) {
- Timer timer = new Timer();
- //timer.schedule(new MainSettingsActivity.HideDangerZone(), 8000, 8000);
- }
if (danger_zone_multiple_tap < 5) {
Intent intent = new Intent(getContext(), DebugMenuActivity.class);
startActivity(intent);
- } else if (danger_zone_multiple_tap == 5) {
- Toast.makeText(getContext(), "злой армянин кушает", Toast.LENGTH_LONG).show();
} else if (danger_zone_multiple_tap == 10) {
global_prefs.edit().putBoolean("debugDangerZone", true).commit();
Intent intent = new Intent(getContext(), DebugMenuActivity.class);
@@ -294,7 +288,6 @@ public boolean onPreferenceClick(Preference preference) {
private void showUiLanguageSelectionDialog() {
int valuePos = 0;
String value = global_prefs.getString("uiLanguage", "System");
- String[] array = getResources().getStringArray(R.array.interface_languages);
selectedPosition = 0;
switch (value) {
default:
@@ -345,7 +338,6 @@ public void onClick(DialogInterface dialog, int which) {
private void showUiThemeSelectionDialog() {
int valuePos = 0;
String value = global_prefs.getString("uiTheme", "Blue");
- String[] array = getResources().getStringArray(R.array.ui_themes);
selectedPosition = 0;
switch (value) {
default:
@@ -556,7 +548,7 @@ public void setNotificationSound(String uri) {
editor.commit();
Preference notif_ringtone = findPreference("notifyRingtone");
if (notif_ringtone != null) {
- Uri notif_uri = Uri.parse("content://settings/system/notification_sound");
+ Uri notif_uri;
if (global_prefs.getString("notifyRingtone", "content://settings/system/notification_sound")
.equals("content://settings/system/notification_sound")) {
notif_ringtone.setSummary("OpenVK");
diff --git a/app/src/main/java/uk/openvk/android/legacy/core/fragments/base/ActivePreferenceFragment.java b/app/src/main/java/uk/openvk/android/legacy/core/fragments/base/ActivePreferenceFragment.java
index 1f179abca..858bb7347 100644
--- a/app/src/main/java/uk/openvk/android/legacy/core/fragments/base/ActivePreferenceFragment.java
+++ b/app/src/main/java/uk/openvk/android/legacy/core/fragments/base/ActivePreferenceFragment.java
@@ -20,11 +20,12 @@
package uk.openvk.android.legacy.core.fragments.base;
import android.os.Bundle;
+import android.preference.PreferenceFragment;
import android.support.v4.app.Fragment;
+import android.support.v7.preference.PreferenceFragmentCompat;
-import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompatDividers;
-public class ActivePreferenceFragment extends PreferenceFragmentCompatDividers {
+public class ActivePreferenceFragment extends PreferenceFragmentCompat {
private boolean isActivated;
public boolean isActivated() {
@@ -43,12 +44,12 @@ public void deactivate() {
onDeactivated();
}
- public void onDeactivated() {
+ public void onDeactivated() {
isActivated = false;
}
@Override
- public void onCreatePreferencesFix(Bundle bundle, String s) {
+ public void onCreatePreferences(Bundle bundle, String s) {
}
}
diff --git a/app/src/main/java/uk/openvk/android/legacy/receivers/OvkAPIReceiver.java b/app/src/main/java/uk/openvk/android/legacy/receivers/OvkAPIReceiver.java
index 7806a5d6f..4717c42df 100644
--- a/app/src/main/java/uk/openvk/android/legacy/receivers/OvkAPIReceiver.java
+++ b/app/src/main/java/uk/openvk/android/legacy/receivers/OvkAPIReceiver.java
@@ -48,6 +48,7 @@
import uk.openvk.android.legacy.core.activities.ConversationActivity;
import uk.openvk.android.legacy.core.activities.GroupMembersActivity;
import uk.openvk.android.legacy.core.activities.NewPostActivity;
+import uk.openvk.android.legacy.core.activities.NoteActivity;
import uk.openvk.android.legacy.core.activities.QuickSearchActivity;
import uk.openvk.android.legacy.core.activities.WallPostActivity;
import uk.openvk.android.legacy.core.activities.base.NetworkActivity;
@@ -382,6 +383,17 @@ public Message parseJSONData(OvkAPIWrapper wrapper, Handler handler, Bundle data
);
break;
}
+ } else if(activity instanceof NoteActivity) {
+ NoteActivity note_a = ((NoteActivity) activity);
+ switch (method) {
+ case "Notes.getById":
+ note_a.ovk_api.notes.parseNote(data.getString("response"));
+ msg.what = HandlerMessages.NOTES_GET_BY_ID;
+ break;
+ case "Notes.edit":
+ msg.what = HandlerMessages.NOTES_EDIT;
+ break;
+ }
}
} else if(activity instanceof GroupMembersActivity) {
GroupMembersActivity group_members_a = ((GroupMembersActivity) activity);
diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/list/adapters/NotesListAdapter.java b/app/src/main/java/uk/openvk/android/legacy/ui/list/adapters/NotesListAdapter.java
index a00fecce0..d6a5ab80a 100644
--- a/app/src/main/java/uk/openvk/android/legacy/ui/list/adapters/NotesListAdapter.java
+++ b/app/src/main/java/uk/openvk/android/legacy/ui/list/adapters/NotesListAdapter.java
@@ -137,6 +137,8 @@ private void showNote(int position) {
Intent intent = new Intent(ctx, NoteActivity.class);
intent.putExtra("title", getItem(position).title);
intent.putExtra("content", getItem(position).content);
+ intent.putExtra("owner_id", getItem(position).owner_id);
+ intent.putExtra("id", getItem(position).id);
if(ctx instanceof AppActivity) {
String author_name = String.format("%s %s",
((AppActivity) ctx).ovk_api.account.first_name,
diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/views/PostAttachmentsView.java b/app/src/main/java/uk/openvk/android/legacy/ui/views/PostAttachmentsView.java
index 5452897ba..334f7b5aa 100644
--- a/app/src/main/java/uk/openvk/android/legacy/ui/views/PostAttachmentsView.java
+++ b/app/src/main/java/uk/openvk/android/legacy/ui/views/PostAttachmentsView.java
@@ -423,6 +423,7 @@ private void viewNoteAttachment(CommonAttachView attachView,
CommonAttachment attachment,
WallPost post) {
Intent intent = new Intent(parent, NoteActivity.class);
+ intent.putExtra("id", 0);
intent.putExtra("title", attachment.title);
intent.putExtra("content", attachment.text);
intent.putExtra("author", post.author_name);
diff --git a/app/src/main/res/drawable-hdpi/checkbox_disabled_on.png b/app/src/main/res/drawable-hdpi/checkbox_disabled_on.png
new file mode 100644
index 000000000..6db89aebe
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/checkbox_disabled_on.png differ
diff --git a/app/src/main/res/drawable-ldpi/checkbox_checked_disabled.png b/app/src/main/res/drawable-ldpi/checkbox_disabled_on.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/checkbox_checked_disabled.png
rename to app/src/main/res/drawable-ldpi/checkbox_disabled_on.png
diff --git a/app/src/main/res/drawable-ldpi/checkbox_unchecked.png b/app/src/main/res/drawable-ldpi/checkbox_off.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/checkbox_unchecked.png
rename to app/src/main/res/drawable-ldpi/checkbox_off.png
diff --git a/app/src/main/res/drawable-ldpi/checkbox_checked.png b/app/src/main/res/drawable-ldpi/checkbox_on.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/checkbox_checked.png
rename to app/src/main/res/drawable-ldpi/checkbox_on.png
diff --git a/app/src/main/res/drawable-mdpi/checkbox_disabled.png b/app/src/main/res/drawable-mdpi/checkbox_disabled.png
new file mode 100644
index 000000000..94601fe00
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/checkbox_disabled.png differ
diff --git a/app/src/main/res/drawable-mdpi/checkbox_disabled_on.png b/app/src/main/res/drawable-mdpi/checkbox_disabled_on.png
new file mode 100644
index 000000000..2959730d6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/checkbox_disabled_on.png differ
diff --git a/app/src/main/res/drawable-nodpi/checkbox_checked.png b/app/src/main/res/drawable-nodpi/checkbox_checked.png
deleted file mode 100644
index 8d26f19ad..000000000
Binary files a/app/src/main/res/drawable-nodpi/checkbox_checked.png and /dev/null differ
diff --git a/app/src/main/res/drawable-nodpi/checkbox_checked_disabled.png b/app/src/main/res/drawable-nodpi/checkbox_checked_disabled.png
deleted file mode 100644
index 203c15057..000000000
Binary files a/app/src/main/res/drawable-nodpi/checkbox_checked_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-nodpi/checkbox_disabled.png b/app/src/main/res/drawable-nodpi/checkbox_disabled.png
index 350111218..91e286edd 100644
Binary files a/app/src/main/res/drawable-nodpi/checkbox_disabled.png and b/app/src/main/res/drawable-nodpi/checkbox_disabled.png differ
diff --git a/app/src/main/res/drawable-nodpi/checkbox_unchecked.png b/app/src/main/res/drawable-nodpi/checkbox_unchecked.png
deleted file mode 100644
index efcfd6404..000000000
Binary files a/app/src/main/res/drawable-nodpi/checkbox_unchecked.png and /dev/null differ
diff --git a/app/src/main/res/drawable-nodpi/ee_adrod_13_installer.jpg b/app/src/main/res/drawable-nodpi/ee_adrod_13_installer.jpg
new file mode 100644
index 000000000..0de3f0c4a
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ee_adrod_13_installer.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/ee_freakbarinov.jpg b/app/src/main/res/drawable-nodpi/ee_freakbarinov.jpg
new file mode 100644
index 000000000..b4d358535
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ee_freakbarinov.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/ee_ovksome_people.png b/app/src/main/res/drawable-nodpi/ee_ovksome_people.png
new file mode 100644
index 000000000..95a13f4e0
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ee_ovksome_people.png differ
diff --git a/app/src/main/res/drawable-xhdpi/checkbox_disabled_on.png b/app/src/main/res/drawable-xhdpi/checkbox_disabled_on.png
new file mode 100644
index 000000000..6641914cd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/checkbox_disabled_on.png differ
diff --git a/app/src/main/res/drawable/checkbox.xml b/app/src/main/res/drawable/checkbox.xml
index 273108a93..5a1822f87 100644
--- a/app/src/main/res/drawable/checkbox.xml
+++ b/app/src/main/res/drawable/checkbox.xml
@@ -16,8 +16,8 @@
Source code: https://github.com/openvk/mobile-android-legacy
!-->
- - @drawable/ic_ab_back_holo_dark
- @style/ActionBarSpinner
- @style/BaseStyle.PreferenceThemeOverlay
+ - @style/TextAppearance.AppCompat.Subhead
-
diff --git a/app/src/main/res/values-v14/style.xml b/app/src/main/res/values-v14/style.xml
index 053e81dff..fa8b7174c 100644
--- a/app/src/main/res/values-v14/style.xml
+++ b/app/src/main/res/values-v14/style.xml
@@ -26,7 +26,7 @@
- @style/BaseStyle.PreferenceThemeOverlay
-
@@ -47,6 +47,7 @@
- false
- true
- @style/PreferenceThemeOverlay
+ - @style/TextAppearance.AppCompat.Subhead
-
@@ -51,6 +51,7 @@
- @style/BaseStyle.DialogStyle
- @style/PreferenceThemeOverlay
- @android:color/transparent
+ - @style/TextAppearance.AppCompat.Subhead