Skip to content

Commit a7f8ff6

Browse files
levlamlevlam
committed
Fix Java interface with SplitSource.
1 parent ac74eca commit a7f8ff6

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎example/java/td_jni.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static jint register_native(JavaVM *vm) {
168168
#undef TD_OBJECT
169169

170170
td::jni::init_vars(env, PACKAGE_NAME);
171-
td::td_api::set_package_name(PACKAGE_NAME);
171+
td::td_api::get_package_name_ref() = PACKAGE_NAME;
172172

173173
return JAVA_VERSION;
174174
}

‎td/generate/DoxygenTlDocumentationGenerator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ protected function needSkipLine($line)
130130
strpos($tline, 'result += ') === 0 || strpos($tline, 'result = ') || strpos($tline, ' : values') ||
131131
strpos($line, 'JNIEnv') || strpos($line, 'jfieldID') || $tline === 'virtual ~Object() {' ||
132132
$tline === 'virtual void store(TlStorerToString &s, const char *field_name) const = 0;' ||
133-
$tline === 'void set_package_name(const char *new_package_name);';
133+
$tline === 'const char *&get_package_name_ref();';
134134
}
135135

136136
protected function isHeaderLine($line)

‎td/generate/tl_writer_jni_cpp.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ namespace td {
1313

1414
std::string TD_TL_writer_jni_cpp::gen_output_begin_once() const {
1515
return TD_TL_writer_cpp::gen_output_begin_once() +
16-
"\nstatic const char *package_name = \"Call set_package_name\";\n\n"
17-
"void set_package_name(const char *new_package_name) {\n"
18-
" package_name = new_package_name;\n"
16+
"\nconst char *&get_package_name_ref() {\n"
17+
" static const char *package_name = \"Package name must be initialized first\";\n"
18+
" return package_name;\n"
1919
"}\n";
2020
}
2121

@@ -538,7 +538,7 @@ std::string TD_TL_writer_jni_cpp::gen_basic_java_class_name(std::string name) co
538538
}
539539

540540
std::string TD_TL_writer_jni_cpp::gen_java_class_name(std::string name) const {
541-
return "(PSLICE() << package_name << \"/TdApi$" + gen_basic_java_class_name(name) + "\").c_str()";
541+
return "(PSLICE() << get_package_name_ref() << \"/TdApi$" + gen_basic_java_class_name(name) + "\").c_str()";
542542
}
543543

544544
std::string TD_TL_writer_jni_cpp::gen_type_signature(const tl::tl_tree_type *tree_type) const {
@@ -600,7 +600,7 @@ std::string TD_TL_writer_jni_cpp::gen_additional_function(const std::string &fun
600600
std::string new_type_signature = "(PSLICE()";
601601
std::size_t pos = type_signature.find("%PACKAGE_NAME%");
602602
while (pos != std::string::npos) {
603-
new_type_signature += " << \"" + type_signature.substr(0, pos) + "\" << package_name";
603+
new_type_signature += " << \"" + type_signature.substr(0, pos) + "\" << get_package_name_ref()";
604604
type_signature = type_signature.substr(pos + 14);
605605
pos = type_signature.find("%PACKAGE_NAME%");
606606
}

‎td/generate/tl_writer_jni_h.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ std::string TD_TL_writer_jni_h::gen_output_begin_once() const {
8787
";\n"
8888
"using BaseObject = " +
8989
gen_base_tl_class_name());
90-
return result + "void set_package_name(const char *new_package_name);\n\n";
90+
return result + "const char *&get_package_name_ref();\n\n";
9191
}
9292

9393
std::string TD_TL_writer_jni_h::gen_class_begin(const std::string &class_name, const std::string &base_class_name,

0 commit comments

Comments
 (0)