Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion library/src/main/java/com/qiniu/android/http/UserAgent.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.qiniu.android.http;

import android.os.Build;
import android.text.TextUtils;

import com.qiniu.android.common.Constants;

import java.util.Random;
Expand Down Expand Up @@ -30,10 +33,35 @@ private static String genId() {

private static String getUserAgent(String id) {
return format("QiniuAndroid/%s (%s; %s; %s)", Constants.VERSION,
android.os.Build.VERSION.RELEASE, android.os.Build.MODEL, id);
android.os.Build.VERSION.RELEASE, device(), id);
}

public String toString() {
return ua;
}

private static String device()
{
String model = Build.MODEL.trim();
String device = deviceName(Build.MANUFACTURER.trim(), model);
if (TextUtils.isEmpty(device)) {
device = deviceName(Build.BRAND.trim(), model);
}
return (device == null ? "" : device) + "-" + model;
}

private static String deviceName(String manufacturer, String model)
{
String str = manufacturer.toLowerCase();
if ((str.startsWith("unknown")) || (str.startsWith("alps")) ||
(str.startsWith("android")) || (str.startsWith("sprd")) ||
(str.startsWith("spreadtrum")) || (str.startsWith("rockchip")) ||
(str.startsWith("wondermedia")) || (str.startsWith("mtk")) ||
(str.startsWith("mt65")) || (str.startsWith("nvidia")) ||
(str.startsWith("brcm")) || (str.startsWith("marvell")) ||
(model.toLowerCase().contains(str))) {
return null;
}
return manufacturer;
}
}