Skip to content

Commit eaa5342

Browse files
author
Dmitry Tretyakov
committed
feat(themes): Remove Monet theme as unsupported feature
1 parent ef884e0 commit eaa5342

37 files changed

+91
-121
lines changed

‎app/src/main/java/uk/openvk/android/refresh/api/OpenVKAPI.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,29 @@ public OpenVKAPI(Context ctx, SharedPreferences global_prefs, SharedPreferences
6363
wrapper.setServer(instance_prefs.getString("server", ""));
6464
wrapper.setAccessToken(instance_prefs.getString("access_token", ""));
6565
}
66+
6667
dlman = new DownloadManager(ctx, global_prefs.getBoolean("useHTTPS", true), handler);
6768
if(instance_prefs != null && instance_prefs.contains("server")) {
6869
dlman.setInstance(instance_prefs.getString("server", ""));
6970
}
71+
7072
dlman.setProxyConnection(global_prefs.getBoolean("useProxy", false),
7173
global_prefs.getString("proxy_address", ""));
7274
dlman.setForceCaching(global_prefs.getBoolean("forcedCaching", true));
75+
7376
ulman = new UploadManager(ctx, global_prefs.getBoolean("useHTTPS", true), handler);
7477
ulman.setProxyConnection(global_prefs.getBoolean("useProxy", false),
7578
global_prefs.getString("proxy_address", ""));
7679
if(instance_prefs != null && instance_prefs.contains("server")) {
7780
ulman.setInstance(instance_prefs.getString("server", ""));
7881
}
7982
ulman.setForceCaching(global_prefs.getBoolean("forcedCaching", true));
83+
8084
account = new Account(ctx);
8185
if(instance_prefs != null && instance_prefs.contains("server")) {
8286
account.getProfileInfo(wrapper);
8387
}
88+
8489
newsfeed = new Newsfeed();
8590
user = new User();
8691
likes = new Likes();

‎app/src/main/java/uk/openvk/android/refresh/api/wrappers/DownloadManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import uk.openvk.android.refresh.api.attachments.PhotoAttachment;
3232
import uk.openvk.android.refresh.api.enumerations.HandlerMessages;
3333
import uk.openvk.android.refresh.api.interfaces.OvkAPIListeners;
34-
import uk.openvk.android.refresh.ui.core.activities.base.NetworkActivity;
34+
import uk.openvk.android.refresh.ui.core.activities.base.BaseNetworkActivity;
3535

3636
/** Copyleft © 2022, 2023, 2026 OpenVK Team
3737
* Copyleft © 2022, 2023, 2026 Dmitry Tretyakov (aka. Tinelix)
@@ -523,8 +523,8 @@ public void run() {
523523
}
524524

525525
private void searchHandler() {
526-
if(ctx instanceof NetworkActivity) {
527-
this.handler = ((NetworkActivity) ctx).handler;
526+
if(ctx instanceof BaseNetworkActivity) {
527+
this.handler = ((BaseNetworkActivity) ctx).handler;
528528
}
529529
}
530530

‎app/src/main/java/uk/openvk/android/refresh/api/wrappers/OvkAPIWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import uk.openvk.android.refresh.api.entities.Error;
3030
import uk.openvk.android.refresh.api.enumerations.HandlerMessages;
3131
import uk.openvk.android.refresh.api.interfaces.OvkAPIListeners;
32-
import uk.openvk.android.refresh.ui.core.activities.base.NetworkActivity;
32+
import uk.openvk.android.refresh.ui.core.activities.base.BaseNetworkActivity;
3333

3434
/** Copyleft © 2022, 2023, 2026 OpenVK Team
3535
* Copyleft © 2022, 2023, 2026 Dmitry Tretyakov (aka. Tinelix)
@@ -125,7 +125,7 @@ public void onAPISuccess(Context ctx, int msg_code, Bundle data) {
125125
}
126126

127127
private void searchHandler() {
128-
this.handler = ((NetworkActivity) ctx).handler;
128+
this.handler = ((BaseNetworkActivity) ctx).handler;
129129
}
130130

131131
public String getStatus() {

‎app/src/main/java/uk/openvk/android/refresh/api/wrappers/UploadManager.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import android.util.Log;
1111

1212
import java.io.File;
13-
import java.io.FileInputStream;
1413
import java.io.IOException;
1514
import java.net.InetSocketAddress;
1615
import java.net.Proxy;
@@ -33,7 +32,7 @@
3332
import uk.openvk.android.refresh.api.attachments.PhotoAttachment;
3433
import uk.openvk.android.refresh.api.enumerations.HandlerMessages;
3534
import uk.openvk.android.refresh.api.interfaces.OvkAPIListeners;
36-
import uk.openvk.android.refresh.ui.core.activities.base.NetworkActivity;
35+
import uk.openvk.android.refresh.ui.core.activities.base.BaseNetworkActivity;
3736

3837
/** Copyleft © 2022, 2023, 2026 OpenVK Team
3938
* Copyleft © 2022, 2023, 2026 Dmitry Tretyakov (aka. Tinelix)
@@ -312,8 +311,8 @@ public void run() {
312311
}
313312

314313
private void searchHandler() {
315-
if(ctx instanceof NetworkActivity) {
316-
this.handler = ((NetworkActivity) ctx).handler;
314+
if(ctx instanceof BaseNetworkActivity) {
315+
this.handler = ((BaseNetworkActivity) ctx).handler;
317316
}
318317
}
319318

‎app/src/main/java/uk/openvk/android/refresh/receivers/OvkAPIReceiver.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import uk.openvk.android.refresh.ui.core.activities.ProfileIntentActivity;
2626
import uk.openvk.android.refresh.ui.core.activities.QuickSearchActivity;
2727
import uk.openvk.android.refresh.ui.core.activities.WallPostActivity;
28-
import uk.openvk.android.refresh.ui.core.activities.base.NetworkActivity;
28+
import uk.openvk.android.refresh.ui.core.activities.base.BaseNetworkActivity;
2929

3030
public class OvkAPIReceiver extends BroadcastReceiver {
3131
private Activity activity;
@@ -43,7 +43,7 @@ public void setActivity(Activity activity) {
4343

4444
@Override
4545
public void onReceive(Context context, Intent intent) {
46-
if(activity instanceof final NetworkActivity netActivity) {
46+
if(activity instanceof final BaseNetworkActivity netActivity) {
4747
OpenVKAPI ovk_api = netActivity.ovk_api;
4848
final Bundle data = intent.getExtras();
4949
if(data.getString("address").equals(activity.getLocalClassName())) {

‎app/src/main/java/uk/openvk/android/refresh/ui/core/activities/AppActivity.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
import uk.openvk.android.refresh.api.wrappers.NotificationManager;
7070
import uk.openvk.android.refresh.services.LongPollService;
7171
import uk.openvk.android.refresh.ui.FragmentNavigator;
72-
import uk.openvk.android.refresh.ui.core.activities.base.NetworkActivity;
72+
import uk.openvk.android.refresh.ui.core.activities.base.BaseNetworkActivity;
7373
import uk.openvk.android.refresh.ui.core.enumerations.PublicPageCounters;
7474
import uk.openvk.android.refresh.ui.core.fragments.app.AboutApplicationFragment;
7575
import uk.openvk.android.refresh.ui.core.fragments.app.FriendsFragment;
@@ -82,10 +82,9 @@
8282
import uk.openvk.android.refresh.ui.core.fragments.app.settings.VideoSettingsFragment;
8383
import uk.openvk.android.refresh.ui.list.adapters.NewsfeedToolbarSpinnerAdapter;
8484
import uk.openvk.android.refresh.ui.list.items.ToolbarSpinnerItem;
85-
import uk.openvk.android.refresh.ui.view.layouts.ProfileHeader;
8685
import uk.openvk.android.refresh.ui.wrappers.LocaleContextWrapper;
8786

88-
public class AppActivity extends NetworkActivity {
87+
public class AppActivity extends BaseNetworkActivity {
8988
public Handler handler;
9089
public Menu activity_menu;
9190
public int old_friends_size;

‎app/src/main/java/uk/openvk/android/refresh/ui/core/activities/AuthActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import uk.openvk.android.refresh.R;
4040
import uk.openvk.android.refresh.api.entities.Authorization;
4141
import uk.openvk.android.refresh.api.enumerations.HandlerMessages;
42-
import uk.openvk.android.refresh.ui.core.activities.base.NetworkActivity;
42+
import uk.openvk.android.refresh.ui.core.activities.base.BaseNetworkActivity;
4343
import uk.openvk.android.refresh.ui.core.enumerations.UiMessages;
4444
import uk.openvk.android.refresh.ui.core.fragments.auth.AuthFragment;
4545
import uk.openvk.android.refresh.ui.core.fragments.auth.AuthProgressFragment;
@@ -49,7 +49,7 @@
4949
import uk.openvk.android.refresh.ui.view.layouts.XConstraintLayout;
5050
import uk.openvk.android.refresh.ui.wrappers.LocaleContextWrapper;
5151

52-
public class AuthActivity extends NetworkActivity {
52+
public class AuthActivity extends BaseNetworkActivity {
5353
private FragmentTransaction ft;
5454
private XConstraintLayout auth_layout;
5555
private String instance;

‎app/src/main/java/uk/openvk/android/refresh/ui/core/activities/ConversationActivity.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@
22

33
import android.annotation.SuppressLint;
44
import android.content.Context;
5-
import android.content.SharedPreferences;
65
import android.content.res.Configuration;
76
import android.graphics.Color;
87
import android.os.Bundle;
9-
import android.os.Handler;
10-
import android.os.Looper;
11-
import android.os.Message;
128
import android.text.Editable;
139
import android.text.TextWatcher;
14-
import android.util.Log;
1510
import android.util.TypedValue;
1611
import android.view.View;
1712
import android.view.Window;
@@ -39,13 +34,12 @@
3934
import uk.openvk.android.refresh.api.entities.Conversation;
4035
import uk.openvk.android.refresh.api.enumerations.HandlerMessages;
4136
import uk.openvk.android.refresh.api.wrappers.DownloadManager;
42-
import uk.openvk.android.refresh.api.wrappers.OvkAPIWrapper;
43-
import uk.openvk.android.refresh.ui.core.activities.base.NetworkActivity;
37+
import uk.openvk.android.refresh.ui.core.activities.base.BaseNetworkActivity;
4438
import uk.openvk.android.refresh.ui.list.adapters.MessagesAdapter;
4539
import uk.openvk.android.refresh.ui.view.layouts.SendTextBottomPanel;
4640
import uk.openvk.android.refresh.ui.wrappers.LocaleContextWrapper;
4741

48-
public class ConversationActivity extends NetworkActivity {
42+
public class ConversationActivity extends BaseNetworkActivity {
4943
public Conversation conversation;
5044
public long peer_id;
5145
public String conv_title;

‎app/src/main/java/uk/openvk/android/refresh/ui/core/activities/FriendsIntentActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import uk.openvk.android.refresh.R;
2525
import uk.openvk.android.refresh.api.entities.Friend;
2626
import uk.openvk.android.refresh.api.enumerations.HandlerMessages;
27-
import uk.openvk.android.refresh.ui.core.activities.base.NetworkActivity;
27+
import uk.openvk.android.refresh.ui.core.activities.base.BaseNetworkActivity;
2828
import uk.openvk.android.refresh.ui.core.fragments.app.FriendsFragment;
2929
import uk.openvk.android.refresh.ui.wrappers.LocaleContextWrapper;
3030

31-
public class FriendsIntentActivity extends NetworkActivity {
31+
public class FriendsIntentActivity extends BaseNetworkActivity {
3232
private FragmentTransaction ft;
3333
private String args;
3434
private MaterialToolbar toolbar;

‎app/src/main/java/uk/openvk/android/refresh/ui/core/activities/GroupIntentActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
import uk.openvk.android.refresh.R;
2626
import uk.openvk.android.refresh.api.entities.Group;
2727
import uk.openvk.android.refresh.api.enumerations.HandlerMessages;
28-
import uk.openvk.android.refresh.ui.core.activities.base.NetworkActivity;
28+
import uk.openvk.android.refresh.ui.core.activities.base.BaseNetworkActivity;
2929
import uk.openvk.android.refresh.ui.core.enumerations.PublicPageCounters;
3030
import uk.openvk.android.refresh.ui.core.fragments.app.CommunityFragment;
3131
import uk.openvk.android.refresh.ui.wrappers.LocaleContextWrapper;
3232

33-
public class GroupIntentActivity extends NetworkActivity {
33+
public class GroupIntentActivity extends BaseNetworkActivity {
3434
private CommunityFragment communityFragment;
3535
private FragmentTransaction ft;
3636
private String args;

0 commit comments

Comments
 (0)