Skip to content

Commit

Permalink
Fix UploadManager
Browse files Browse the repository at this point in the history
  • Loading branch information
@tretdm
tretdm committed Nov 18, 2023
1 parent 95e53e6 commit d58295b
Show file tree
Hide file tree
Showing 13 changed files with 181 additions and 111 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/uk/openvk/android/legacy/api/OpenVKAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public OpenVKAPI(Context ctx, SharedPreferences global_prefs, SharedPreferences
global_prefs.getString("proxy_address", ""));
dlman.setForceCaching(global_prefs.getBoolean("forcedCaching", true));
ulman = new UploadManager(ctx, global_prefs.getBoolean("useHTTPS", true),
global_prefs.getBoolean("legacyHttpClient", false));
global_prefs.getBoolean("legacyHttpClient", false), handler);
ulman.setProxyConnection(global_prefs.getBoolean("useProxy", false),
global_prefs.getString("proxy_address", ""));
if(instance_prefs != null && instance_prefs.contains("server")) {
Expand Down
18 changes: 13 additions & 5 deletions app/src/main/java/uk/openvk/android/legacy/api/wrappers/DownloadManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,20 @@ public java.security.cert.X509Certificate[] getAcceptedIssuers() {
sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
javax.net.ssl.SSLSocketFactory ssf = (javax.net.ssl.SSLSocketFactory)
sslContext.getSocketFactory();
httpClient = new OkHttpClient.Builder().sslSocketFactory(sslContext.getSocketFactory())
.connectTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS).retryOnConnectionFailure(false).build();
httpClient = new OkHttpClient.Builder()
.sslSocketFactory(sslContext.getSocketFactory())
.connectTimeout(30, TimeUnit.SECONDS)
.writeTimeout(30, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS)
.retryOnConnectionFailure(false)
.build();
} catch (Exception e) {
httpClient = new OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS).writeTimeout
(30, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).retryOnConnectionFailure(false).build();
httpClient = new OkHttpClient.Builder()
.connectTimeout(30, TimeUnit.SECONDS)
.writeTimeout(30, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS)
.retryOnConnectionFailure(false)
.build();
}
legacy_mode = false;
}
Expand Down
151 changes: 66 additions & 85 deletions app/src/main/java/uk/openvk/android/legacy/api/wrappers/UploadManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.content.pm.PackageInfo;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.util.Log;

Expand Down Expand Up @@ -37,8 +38,12 @@
import uk.openvk.android.legacy.api.TrackingRequestBody;
import uk.openvk.android.legacy.api.attachments.PhotoAttachment;
import uk.openvk.android.legacy.api.enumerations.HandlerMessages;
import uk.openvk.android.legacy.api.interfaces.OvkAPIListeners;
import uk.openvk.android.legacy.ui.core.activities.AppActivity;
import uk.openvk.android.legacy.ui.core.activities.AuthActivity;
import uk.openvk.android.legacy.ui.core.activities.base.NetworkActivity;
import uk.openvk.android.legacy.ui.core.activities.base.NetworkAuthActivity;
import uk.openvk.android.legacy.ui.core.activities.base.NetworkFragmentActivity;
import uk.openvk.android.legacy.ui.core.activities.intents.FriendsIntentActivity;
import uk.openvk.android.legacy.ui.core.activities.intents.GroupIntentActivity;
import uk.openvk.android.legacy.ui.core.activities.NewPostActivity;
Expand Down Expand Up @@ -77,8 +82,15 @@ public class UploadManager {
private HttpClient httpClientLegacy = null;
private boolean forceCaching;
private String instance;
private Handler handler;
private OvkAPIListeners apiListeners;

public UploadManager(Context ctx, boolean use_https, boolean legacy_mode) {
public UploadManager(Context ctx, boolean use_https, boolean legacy_mode, Handler handler) {
this.handler = handler;
apiListeners = new OvkAPIListeners();
if(handler == null) {
searchHandler();
}
this.ctx = ctx;
this.use_https = use_https;
this.legacy_mode = legacy_mode;
Expand Down Expand Up @@ -121,12 +133,20 @@ public java.security.cert.X509Certificate[] getAcceptedIssuers() {
sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
javax.net.ssl.SSLSocketFactory ssf = (javax.net.ssl.SSLSocketFactory)
sslContext.getSocketFactory();
httpClient = new OkHttpClient.Builder().sslSocketFactory(sslContext.getSocketFactory())
.connectTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS).retryOnConnectionFailure(false).build();
httpClient = new OkHttpClient.Builder()
.sslSocketFactory(sslContext.getSocketFactory())
.connectTimeout(30, TimeUnit.SECONDS)
.writeTimeout(30, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS)
.retryOnConnectionFailure(false)
.build();
} catch (Exception e) {
httpClient = new OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS).writeTimeout
(30, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).retryOnConnectionFailure(false).build();
httpClient = new OkHttpClient.Builder()
.connectTimeout(30, TimeUnit.SECONDS)
.writeTimeout(30, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS)
.retryOnConnectionFailure(false)
.build();
}
legacy_mode = false;
}
Expand All @@ -151,11 +171,15 @@ public void setProxyConnection(boolean useProxy, String address) {
if (legacy_mode) {
httpClientLegacy.setProxy(address_array[0], Integer.valueOf(address_array[1]));
} else {
httpClient = new OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS)
.writeTimeout(15, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS)
.retryOnConnectionFailure(false).proxy(new Proxy(Proxy.Type.HTTP,
httpClient = new OkHttpClient.Builder()
.connectTimeout(30, TimeUnit.SECONDS)
.writeTimeout(15, TimeUnit.SECONDS
).readTimeout(30, TimeUnit.SECONDS)
.retryOnConnectionFailure(false)
.proxy(new Proxy(Proxy.Type.HTTP,
new InetSocketAddress(address_array[0],
Integer.valueOf(address_array[1])))).build();
Integer.valueOf(address_array[1]))))
.build();
}
}
}
Expand All @@ -168,7 +192,8 @@ private String generateUserAgent(Context ctx) {
String version_name = "";
String user_agent = "";
try {
PackageInfo packageInfo = ctx.getPackageManager().getPackageInfo(ctx.getApplicationContext().getPackageName(), 0);
PackageInfo packageInfo = ctx.getPackageManager()
.getPackageInfo(ctx.getApplicationContext().getPackageName(), 0);
version_name = packageInfo.versionName;
} catch (Exception e) {
OvkApplication app = ((OvkApplication) ctx.getApplicationContext());
Expand Down Expand Up @@ -309,98 +334,54 @@ public void onLoad(long position, long max) {
thread.start();
}

private void sendMessage(int message, String filename, String response) {
private void sendMessage(final int message, String filename, String response) {
Message msg = new Message();
msg.what = message;
Bundle bundle = new Bundle();
final Bundle bundle = new Bundle();
bundle.putString("filename", filename);
bundle.putString("response", response);
msg.setData(bundle);
if(ctx.getClass().getSimpleName().equals("AuthActivity")) {
((AuthActivity) ctx).handler.sendMessage(msg);
} else if(ctx.getClass().getSimpleName().equals("AppActivity")) {
((AppActivity) ctx).handler.sendMessage(msg);
} else if(ctx.getClass().getSimpleName().equals("NewPostActivity")) {
((NewPostActivity) ctx).handler.sendMessage(msg);
} else if(ctx.getClass().getSimpleName().equals("QuickSearchActivity")) {
((QuickSearchActivity) ctx).handler.sendMessage(msg);
} else if(ctx.getClass().getSimpleName().equals("ProfileIntentActivity")) {
((ProfileIntentActivity) ctx).handler.sendMessage(msg);
} else if(ctx.getClass().getSimpleName().equals("FriendsIntentActivity")) {
((FriendsIntentActivity) ctx).handler.sendMessage(msg);
} else if(ctx.getClass().getSimpleName().equals("GroupIntentActivity")) {
((GroupIntentActivity) ctx).handler.sendMessage(msg);
} else if(ctx.getClass().getSimpleName().equals("WallPostActivity")) {
((WallPostActivity) ctx).handler.sendMessage(msg);
} else if(ctx.getClass().getSimpleName().equals("PhotoViewerActivity")) {
((PhotoViewerActivity) ctx).handler.sendMessage(msg);
}
handler.post(new Runnable() {
@Override
public void run() {
if(message < 0) {
apiListeners.failListener.onAPIFailed(ctx, message, bundle);
} else {
apiListeners.successListener.onAPISuccess(ctx, message, bundle);
}
}
});
}


public void updateLoadProgress(String filename, String url, long position, long length) {
public void updateLoadProgress(String filename, String url, final long position, final long length) {
Message msg = new Message();
msg.what = HandlerMessages.UPLOAD_PROGRESS;
Bundle bundle = new Bundle();
final Bundle bundle = new Bundle();
bundle.putString("filename", filename);
bundle.putString("url", url);
bundle.putLong("position", position);
bundle.putLong("length", length);
msg.setData(bundle);
if(ctx instanceof NewPostActivity) {
NewPostActivity newpost_a = ((NewPostActivity) ctx);
newpost_a.handler.sendMessage(msg);
}
handler.post(new Runnable() {
@Override
public void run() {
apiListeners.processListener.onAPIProcess(ctx, bundle, position, length);
}
});
}

public boolean clearCache(File dir) {
if (dir == null) {
dir = ctx.getCacheDir();
if (dir != null && dir.isDirectory()) {
String[] children = dir.list();
for (String aChildren : children) {
boolean success = clearCache(new File(dir, aChildren));
if (!success) {
return false;
}
}
return dir.delete();
} else
return dir != null && dir.isFile() && dir.delete();
} else if (dir != null && dir.isDirectory()) {
String[] children = dir.list();
for (String aChildren : children) {
boolean success = clearCache(new File(dir, aChildren));
if (!success) {
return false;
}
}
return dir.delete();
} else
return dir != null && dir.isFile() && dir.delete();
private void searchHandler() {
if(ctx instanceof NetworkFragmentActivity) {
this.handler = ((NetworkFragmentActivity) ctx).handler;
} else if(ctx instanceof NetworkAuthActivity) {
this.handler = ((NetworkAuthActivity) ctx).handler;
} else if(ctx instanceof NetworkActivity) {
this.handler = ((NetworkActivity) ctx).handler;
}
}

public long getCacheSize() {
final long[] size = {0};
Runnable runnable = new Runnable() {
@Override
public void run() {
long foldersize = 0;
File[] filelist = new File(ctx.getCacheDir().getAbsolutePath()).listFiles();
for (File aFilelist : filelist) {
if (aFilelist.isDirectory()) {
File[] filelist2 = new File(aFilelist.getAbsolutePath()).listFiles();
for (File aFilelist2 : filelist2) {
foldersize += filelist2.length;
}
} else {
foldersize += aFilelist.length();
}
}
size[0] = foldersize;
}
};
new Thread(runnable).run();
return size[0];
public void setAPIListeners(OvkAPIListeners apiListeners) {
this.apiListeners = apiListeners;
}
}
3 changes: 2 additions & 1 deletion app/src/main/java/uk/openvk/android/legacy/ui/core/activities/NewPostActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,8 @@ public void receiveState(int message, Bundle data) {
if(data.containsKey("method")) {
if (data.getString("method").equals("Wall.post")) {
Toast.makeText(getApplicationContext(),
getResources().getString(R.string.posting_error), Toast.LENGTH_LONG).show();
getResources().getString(R.string.posting_error),
Toast.LENGTH_LONG).show();
if (connectionDialog != null)
connectionDialog.cancel();
} else if(data.getString("method").startsWith("Photos.save")) {
Expand Down
15 changes: 15 additions & 0 deletions app/src/main/java/uk/openvk/android/legacy/ui/core/activities/base/NetworkActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,23 @@ public void onAPIFailed(Context ctx, int msg_code, final Bundle data) {
receiveState(msg_code, data);
}
};
listeners.processListener = new OvkAPIListeners.OnAPIProcessListener() {
@Override
public void onAPIProcess(Context ctx, Bundle data, long value, long length) {
if(!BuildConfig.BUILD_TYPE.equals("release"))
Log.d(OvkApplication.APP_TAG,
String.format(
"Handling API message %s in %s",
HandlerMessages.UPLOAD_PROGRESS,
getLocalClassName()
)
);
receiveState(HandlerMessages.UPLOAD_PROGRESS, data);
}
};
ovk_api.wrapper.setAPIListeners(listeners);
ovk_api.dlman.setAPIListeners(listeners);
ovk_api.ulman.setAPIListeners(listeners);
}

public void receiveState(int message, Bundle data) {
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/java/uk/openvk/android/legacy/ui/core/activities/base/NetworkAuthActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,20 @@ public void onAPIFailed(Context ctx, int msg_code, final Bundle data) {
receiveState(msg_code, data);
}
};
listeners.processListener = new OvkAPIListeners.OnAPIProcessListener() {
@Override
public void onAPIProcess(Context ctx, Bundle data, long value, long length) {
if(!BuildConfig.BUILD_TYPE.equals("release"))
Log.d(OvkApplication.APP_TAG,
String.format(
"Handling API message %s in %s",
HandlerMessages.UPLOAD_PROGRESS,
getLocalClassName()
)
);
receiveState(HandlerMessages.UPLOAD_PROGRESS, data);
}
};
ovk_api.wrapper.setAPIListeners(listeners);
}

Expand Down
15 changes: 15 additions & 0 deletions ...c/main/java/uk/openvk/android/legacy/ui/core/activities/base/NetworkFragmentActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,23 @@ public void onAPIFailed(Context ctx, int msg_code, final Bundle data) {
receiveState(msg_code, data);
}
};
listeners.processListener = new OvkAPIListeners.OnAPIProcessListener() {
@Override
public void onAPIProcess(Context ctx, Bundle data, long value, long length) {
if(!BuildConfig.BUILD_TYPE.equals("release"))
Log.d(OvkApplication.APP_TAG,
String.format(
"Handling API message %s in %s",
HandlerMessages.UPLOAD_PROGRESS,
getLocalClassName()
)
);
receiveState(HandlerMessages.UPLOAD_PROGRESS, data);
}
};
ovk_api.wrapper.setAPIListeners(listeners);
ovk_api.dlman.setAPIListeners(listeners);
ovk_api.ulman.setAPIListeners(listeners);
}

public void receiveState(int message, Bundle data) {
Expand Down
17 changes: 12 additions & 5 deletions app/src/main/java/uk/openvk/android/legacy/ui/core/activities/base/TranslucentActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,18 @@ private void setTranslucentStatusBar() {
public void setTranslucentStatusBar(int type, int res) {
SystemBarTintManager tintManager = new SystemBarTintManager(this);
tintManager.setStatusBarTintEnabled(true);
if(type == 0) { // Drawable (or color resource ID)
tintManager.setTintDrawable(
getResources().getDrawable(res));
} else { // Color
tintManager.setTintColor(res);
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
Window window = getWindow();
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
window.setStatusBarColor(getResources().getColor(res));
} else {
if (type == 0) { // Drawable (or color resource ID)
tintManager.setTintDrawable(
getResources().getDrawable(res));
} else { // Color
tintManager.setTintColor(res);
}
}
}
}
17 changes: 12 additions & 5 deletions ...c/main/java/uk/openvk/android/legacy/ui/core/activities/base/TranslucentAuthActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,18 @@ private void setTranslucentStatusBar() {
public void setTranslucentStatusBar(int type, int res) {
SystemBarTintManager tintManager = new SystemBarTintManager(this);
tintManager.setStatusBarTintEnabled(true);
if(type == 0) { // Drawable (or color resource ID)
tintManager.setTintDrawable(
getResources().getDrawable(res));
} else { // Color
tintManager.setTintColor(res);
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
Window window = getWindow();
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
window.setStatusBarColor(getResources().getColor(res));
} else {
if (type == 0) { // Drawable (or color resource ID)
tintManager.setTintDrawable(
getResources().getDrawable(res));
} else { // Color
tintManager.setTintColor(res);
}
}
}
}
Loading

0 comments on commit d58295b

Please sign in to comment.