Merge pull request #12459 from nextcloud/brandedUserAgent

Allow to add custom name to user agent

app/src/main/java/com/owncloud/android/MainApp.java

@@ -718,6 +718,7 @@ public class MainApp extends MultiDexApplication implements HasAndroidInjector {
     // user agent
     private static String getUserAgent(@StringRes int agent) {
         String appString = getAppContext().getResources().getString(agent);
+        String brandedName = getAppContext().getString(R.string.name_for_branded_user_agent);
         String packageName = getAppContext().getPackageName();
         String version = "";
 
@@ -730,7 +731,7 @@ public class MainApp extends MultiDexApplication implements HasAndroidInjector {
             Log_OC.e(TAG, "Trying to get packageName", e.getCause());
         }
 
-        return String.format(appString, version);
+        return String.format(appString, version, brandedName);
     }
 
     private static void updateToAutoUpload() {

app/src/main/res/values/setup.xml

@@ -17,8 +17,9 @@
     <string name="db_name">nextcloud</string>
     <string name="data_folder">nextcloud</string>
     <string name="default_display_name_for_root_folder">Nextcloud</string>
-    <string name="nextcloud_user_agent">Mozilla/5.0 (Android) Nextcloud-android/%1$s</string>
+    <string name="nextcloud_user_agent">Mozilla/5.0 (Android) Nextcloud-android/%1$s%2$s</string>
     <string name="only_office_user_agent">Mozilla/5.0 (Android %1$s) Mobile Nextcloud-android/%2$s</string>
+    <string name="name_for_branded_user_agent"></string>
 
     <!-- URLs and flags related -->
     <bool name="show_server_url_input">true</bool>