Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion OpenRedmine/OpenRedmine.iml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
Expand All @@ -101,6 +100,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
Expand Down
4 changes: 2 additions & 2 deletions OpenRedmine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
minSdkVersion 9
targetSdkVersion 23

versionCode 54
versionName '3.21-beta1'
versionCode 55
versionName '3.21-beta2'
testApplicationId "jp.redmine.redmineclienttest"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
testHandleProfiling true
Expand Down
2 changes: 2 additions & 0 deletions OpenRedmine/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />

<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
if (convertView == null) {
LayoutInflater infalInflater = (LayoutInflater) parent.getContext()
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = getItemView(infalInflater);
convertView = getItemView(infalInflater, parent);
convertView.setTag(getItemViewId());
}
if(convertView != null){
Expand All @@ -122,8 +122,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
}
return convertView;
}
protected View getItemView(LayoutInflater infalInflater){
return infalInflater.inflate(getItemViewId(), null);
protected View getItemView(LayoutInflater infalInflater, ViewGroup parent){
return infalInflater.inflate(getItemViewId(), parent, false);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.j256.ormlite.stmt.PreparedQuery;
import com.j256.ormlite.stmt.QueryBuilder;

import java.io.IOException;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -107,7 +108,7 @@ public RedmineIssue fetchById(int connection, int issueId) throws SQLException{
return item;
}

public Long getIdByIssue(int connection, int issueId) throws SQLException{
public Long getIdByIssue(int connection, int issueId) throws SQLException, IOException{
QueryBuilder<RedmineIssue, Long> builder = builderByIssue(dao, connection,issueId);

builder.selectRaw(RedmineIssue.ID);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ protected void onDocumentStart(CON con)
throws XmlPullParserException, IOException, SQLException {
if(BuildConfig.DEBUG) Log.d("BaseParser","START_DOCUMENT");
}
protected void onDocumentEnd(CON con)
throws XmlPullParserException, IOException, SQLException{
if(BuildConfig.DEBUG) Log.d("BaseParser","END_DOCUMENT");
}
protected abstract void onTagStart(CON con)
throws XmlPullParserException, IOException, SQLException;
protected abstract void onTagEnd(CON con)
Expand Down Expand Up @@ -75,10 +71,6 @@ public void parse(CON con) throws XmlPullParserException, IOException, SQLExcept
if(BuildConfig.DEBUG) Log.d("BaseParser","END_DOCUMENT ");
onDocumentStart(con);
break;
case XmlPullParser.END_DOCUMENT:
if(BuildConfig.DEBUG) Log.d("BaseParser","END_DOCUMENT ");
onDocumentEnd(con);
break;
case XmlPullParser.START_TAG:
if(BuildConfig.DEBUG) Log.d("BaseParser","START_TAG ".concat(xml.getName()));
onTagStart(con);
Expand Down Expand Up @@ -119,7 +111,7 @@ public void unregisterDataCreation(DataCreationHandler<CON,TYPE> ev){
this.handlerDataCreation.remove(ev);
}

protected void notifyDataCreation(CON con,TYPE data) throws SQLException{
void notifyDataCreation(CON con, TYPE data) throws SQLException, IOException{
dataCount++;
//inherit from http://www.ibm.com/developerworks/jp/java/library/j-jtp07265/
for(DataCreationHandler<CON,TYPE> ev:this.handlerDataCreation){
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package jp.redmine.redmineclient.parser;

import java.io.IOException;
import java.sql.SQLException;

public interface DataCreationHandler<CON,TYPE>{
public void onData(CON info,TYPE data) throws SQLException;
public void onData(CON info,TYPE data) throws SQLException, IOException;
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ protected Void doInBackground(Integer... params) {
return null;
}

protected void doInBackgroundIssue(SelectDataTaskRedmineConnectionHandler client,Integer... params) {
private void doInBackgroundIssue(SelectDataTaskRedmineConnectionHandler client, Integer... params) {
final ParserIssue parser = new ParserIssue();
final List<Integer> listAdditionalIssue = new ArrayList<Integer>();
DataCreationHandler<RedmineConnection,RedmineIssue> relationHandler = new DataCreationHandler<RedmineConnection,RedmineIssue>() {
private RedmineIssueModel mRelation = new RedmineIssueModel(helper);
public void onData(RedmineConnection con,RedmineIssue data) throws SQLException {
public void onData(RedmineConnection con,RedmineIssue data) throws SQLException, IOException {
if(data.getParentId() != 0){
if(mRelation.getIdByIssue(con.getId(), data.getParentId()) == null)
listAdditionalIssue.add(data.getParentId());
Expand Down Expand Up @@ -104,7 +104,7 @@ public void onContent(InputStream stream)

}

protected void doInBackgroundTimeEntry(SelectDataTaskRedmineConnectionHandler client,Integer... params) {
private void doInBackgroundTimeEntry(SelectDataTaskRedmineConnectionHandler client, Integer... params) {
final RedmineTimeEntryModel model = new RedmineTimeEntryModel(helper);
final RedmineTimeActivityModel mActivity = new RedmineTimeActivityModel(helper);
final RedmineUserModel mUser = new RedmineUserModel(helper);
Expand Down
5 changes: 4 additions & 1 deletion OpenRedmine/src/main/res/raw-de/contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Vielen Dank für den Beitrag.
- [etcho](https://www.transifex.com/user/profile/etcho/)

#### Chinesisch (China)
* [StevenGape](https://github.com/StevenGape) - #171
- [StevenGape](https://github.com/StevenGape) - #171

#### Türkisch (Türkei)
- [halis.simsek](https://www.transifex.com/user/profile/halis.simsek/)
Expand All @@ -42,5 +42,8 @@ Vielen Dank für den Beitrag.

#### Englisch
- (Ausgangssprache)
- [elmanytas](https://github.com/elmanytas) spelling fixes - #191
- [ka7](https://github.com/ka7) spelling fixes - #198


[Sie können dem Lokalisierungsteam über Transifex beitreten.](https://www.transifex.com/indication/openredmine/)
7 changes: 4 additions & 3 deletions OpenRedmine/src/main/res/raw-de/version.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ NOCH ZU MACHEN

Nächste Veröffentlichung
===========
- Add issue filter to limit open or closed issues (#199)
- Spelling fixes by ka7 (#198)


v3.20 - 53 - 2017/04/01
v3.20 - 53 - 01.04.2017
===========
- Add journal id to header and performance up (#195)
- Add favorite project list to connection (#194)
Expand Down Expand Up @@ -142,7 +143,7 @@ v3.4 - 35 - 10.12.2013

v3.4 - 34 - 09.12.2013
===========
- Switch list via swipe
- Liste durch Wischen wechseln
- Support pull to refresh
- (Interne Änderungen) Auf Android Studio portieren

Expand Down
5 changes: 4 additions & 1 deletion OpenRedmine/src/main/res/raw-es-rES/contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Thank you for contribution.
- [etcho](https://www.transifex.com/user/profile/etcho/)

#### Chinese (China)
* [StevenGape](https://github.com/StevenGape) - #171
- [StevenGape](https://github.com/StevenGape) - #171

#### Turkish (Turkey)
- [halis.simsek](https://www.transifex.com/user/profile/halis.simsek/)
Expand All @@ -42,5 +42,8 @@ Thank you for contribution.

#### English
- (base language)
- [elmanytas](https://github.com/elmanytas) spelling fixes - #191
- [ka7](https://github.com/ka7) spelling fixes - #198


[You can join localization team via Transifex.](https://www.transifex.com/indication/openredmine/)
3 changes: 2 additions & 1 deletion OpenRedmine/src/main/res/raw-es-rES/version.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ TODO

Next Release
===========

- Add issue filter to limit open or closed issues (#199)
- Spelling fixes by ka7 (#198)

v3.20 - 53 - 2017/04/01
===========
Expand Down
5 changes: 4 additions & 1 deletion OpenRedmine/src/main/res/raw-fr/contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Merci pour votre contribution
- [etcho](https://www.transifex.com/user/profile/etcho/)

#### Chinois (Chine)
* [StevenGape](https://github.com/StevenGape) - #171
- [StevenGape](https://github.com/StevenGape) - #171

#### Turkish (Turkey)
- [halis.simsek](https://www.transifex.com/user/profile/halis.simsek/)
Expand All @@ -42,5 +42,8 @@ Merci pour votre contribution

#### Anglais
- (langue de base)
- [elmanytas](https://github.com/elmanytas) spelling fixes - #191
- [ka7](https://github.com/ka7) spelling fixes - #198


[Vous pouvez rejoindre l'équipe de traduction via Transifex.](https://www.transifex.com/indication/openredmine/)
3 changes: 2 additions & 1 deletion OpenRedmine/src/main/res/raw-fr/version.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ TODO

Next Release
===========

- Add issue filter to limit open or closed issues (#199)
- Spelling fixes by ka7 (#198)

v3.20 - 53 - 2017/04/01
===========
Expand Down
5 changes: 4 additions & 1 deletion OpenRedmine/src/main/res/raw-ja/contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
- [etcho](https://www.transifex.com/user/profile/etcho/)

#### 中国語 (中国)
* [StevenGape](https://github.com/StevenGape) - #171
- [StevenGape](https://github.com/StevenGape) - #171

#### トルコ語 (トルコ)
- [halis.simsek](https://www.transifex.com/user/profile/halis.simsek/)
Expand All @@ -42,5 +42,8 @@

#### 英語
- (ネイティブ)
- [elmanytas](https://github.com/elmanytas) スペルミスを修正 - #191
- [ka7](https://github.com/ka7) スペルミスを修正 - #198


[Transifesを通して翻訳チームに参加することができます。](https://www.transifex.com/indication/openredmine/)
19 changes: 10 additions & 9 deletions OpenRedmine/src/main/res/raw-ja/version.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,21 @@ TODO

次期リリース
===========

- オープンまたはクローズ状態のチケットに限定するフィルタを追加 (#199)
- ka7によるスペルミスを修正 (#198)

v3.20 - 53 - 2017/04/01
===========
- Add journal id to header and performance up (#195)
- コメントIDをヘッダーへ追加およびパフォーマンス改善 (#195)
- 接続にお気に入りのプロジェクト一覧を追加 (#194)
- 接続に最近閲覧したチケット一覧を追加 (#194)
- Update German translation by Atalanttore (#193)
- Update Portuguese(BR) translation by etcho (#193)
- Add french translations by MagicFab (#193)
- Add Turkish (Turkey) translations by halis.simsek (#193)
- Add Spanish (Spain) translations by Bernat13 (#193)
- Update minimum API version from 8 to 9 (Android 2.2 no more supported by support-library)
- Fix little mistake by elmanytas (#191)
- Atalanttoreによるドイツ語翻訳を更新 (#193)
- etchoによるポルトガル語(BR)を更新 (#193)
- MagicFabによるフランス語を追加 (#193)
- halis.simsekによるトルコ語(トルコ)を追加 (#193)
- Bernat13によるスペイン語(スペイン)を追加 (#193)
- 最小APIバージョンを8から9へ更新 (Android 2.2はサポートライブラリによってサポートされない)
- elmanytasによる細かいミスを修正 (#191)

v3.19 - 52 - 2016/06/30
===========
Expand Down
5 changes: 4 additions & 1 deletion OpenRedmine/src/main/res/raw-pt-rBR/contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Obrigado pela contribuição de vocês.
- [etcho](https://www.transifex.com/user/profile/etcho/)

#### Chinês (China)
* [StevenGape](https://github.com/StevenGape) - #171
- [StevenGape](https://github.com/StevenGape) - #171

#### Turco (Turquia)
- [halis.simsek](https://www.transifex.com/user/profile/halis.simsek/)
Expand All @@ -42,5 +42,8 @@ Obrigado pela contribuição de vocês.

#### Inglês
- (língua padrão)
- [elmanytas](https://github.com/elmanytas) correções de ortografia - #191
- [ka7](https://github.com/ka7) correções de ortografia - #198


[Você pode se juntar ao time de tradução no Transifex.](https://www.transifex.com/indication/openredmine/)
21 changes: 11 additions & 10 deletions OpenRedmine/src/main/res/raw-pt-rBR/version.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,21 @@ Coisas a serem feitas

Próxima Release
===========
- Adicionado filtro de tarefas para limitar tarefas fechadas e abertas (#199)
- Correções de ortografia feitas por ka7 (#198)


v3.20 - 53 - 2017/04/01
v3.20 - 53 - 01/04/2017
===========
- Add journal id to header and performance up (#195)
- Adicionado id do journal no cabeçalho e melhorias de perfórmance (#195)
- Adicionada lista de projetos favoritos na conexão (#194)
- Adicionada lista de tarefas recentes na conexão (#194)
- Update German translation by Atalanttore (#193)
- Update Portuguese(BR) translation by etcho (#193)
- Add french translations by MagicFab (#193)
- Add Turkish (Turkey) translations by halis.simsek (#193)
- Add Spanish (Spain) translations by Bernat13 (#193)
- Update minimum API version from 8 to 9 (Android 2.2 no more supported by support-library)
- Fix little mistake by elmanytas (#191)
- Tradução para alemão atualizada por Atalanttore (#193)
- Tradução para português(BR) atualizada por etcho (#193)
- Adicionada tradução para francês por MagicFab (#193)
- Adicionada tradução para turco (Turquia) por halis.simsek (#193)
- Adicionada tradução para espanhol por Bernat13 (#193)
- Atualizada a versão da API mínima necessária de 8 para 9 (Android 2.2 não possui mais suporte)
- Corrigindo pequeno erro feito por elmanytas (#191)

v3.19 - 52 - 30/06/2016
===========
Expand Down
5 changes: 4 additions & 1 deletion OpenRedmine/src/main/res/raw-ru/contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Thank you for contribution.
- [etcho](https://www.transifex.com/user/profile/etcho/)

#### Chinese (China)
* [StevenGape](https://github.com/StevenGape) - #171
- [StevenGape](https://github.com/StevenGape) - #171

#### Turkish (Turkey)
- [halis.simsek](https://www.transifex.com/user/profile/halis.simsek/)
Expand All @@ -42,5 +42,8 @@ Thank you for contribution.

#### English
- (base language)
- [elmanytas](https://github.com/elmanytas) spelling fixes - #191
- [ka7](https://github.com/ka7) spelling fixes - #198


[You can join localization team via Transifex.](https://www.transifex.com/indication/openredmine/)
3 changes: 2 additions & 1 deletion OpenRedmine/src/main/res/raw-ru/version.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ TODO

Next Release
===========

- Add issue filter to limit open or closed issues (#199)
- Spelling fixes by ka7 (#198)

v3.20 - 53 - 2017/04/01
===========
Expand Down
5 changes: 4 additions & 1 deletion OpenRedmine/src/main/res/raw-tr-rTR/contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Katkınız için teşekkürler.
- [etcho](https://www.transifex.com/user/profile/etcho/)

#### Çince (Çin)
* [StevenGape](https://github.com/StevenGape) - #171
- [StevenGape](https://github.com/StevenGape) - #171

#### Turkish (Turkey)
- [halis.simsek](https://www.transifex.com/user/profile/halis.simsek/)
Expand All @@ -42,5 +42,8 @@ Katkınız için teşekkürler.

#### İngilizce
- (temel dil)
- [elmanytas](https://github.com/elmanytas) spelling fixes - #191
- [ka7](https://github.com/ka7) spelling fixes - #198


[Transifex aracılığıyla çeviri ekibine katılabilirsiniz.](https://www.transifex.com/indication/openredmine/)
3 changes: 2 additions & 1 deletion OpenRedmine/src/main/res/raw-tr-rTR/version.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ YAPILACAKLAR

Next Release
===========

- Add issue filter to limit open or closed issues (#199)
- Spelling fixes by ka7 (#198)

v3.20 - 53 - 2017/04/01
===========
Expand Down
Loading