From 709e333e784401b72f857e36ba1c9de3df2c029a Mon Sep 17 00:00:00 2001 From: Christian Basler Date: Fri, 12 Aug 2016 23:54:01 +0200 Subject: [PATCH] Updated libraries, most notably Jabit to develop-SNAPSHOT Also, finally added proper icon Known issue: the client seems to sever all connections after some time, I'll need to look into this. This might happen when 8 connections are reached for the first time. --- app/build.gradle | 32 +- .../db/migration/V3.1__Update_table_POW.sql | 2 + .../migration/V3.2__Update_table_message.sql | 4 + app/src/main/ic_launcher-web.png | Bin 0 -> 25944 bytes .../dissem/apps/abit/pow/ServerPowEngine.java | 4 +- .../repository/AndroidMessageRepository.java | 121 ++---- .../AndroidProofOfWorkRepository.java | 25 +- .../apps/abit/repository/SqlHelper.java | 5 +- .../abit/synchronization/SyncAdapter.java | 6 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3418 -> 2236 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2206 -> 1390 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 3097 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7718 -> 5175 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 7508 bytes build.gradle | 2 +- gradle.properties | 20 +- gradle/wrapper/gradle-wrapper.jar | Bin 49896 -> 53324 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 52 +-- gradlew.bat | 8 +- store/icon.svg | 406 ++++++++++++++++-- 21 files changed, 510 insertions(+), 181 deletions(-) create mode 100644 app/src/main/assets/db/migration/V3.1__Update_table_POW.sql create mode 100644 app/src/main/assets/db/migration/V3.2__Update_table_message.sql create mode 100644 app/src/main/ic_launcher-web.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/build.gradle b/app/build.gradle index c2f57a2..e600ee0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,25 +1,25 @@ apply plugin: 'idea' apply plugin: 'com.android.application' +ext { + appName = "Abit" +} +if (project.hasProperty("project.configs") + && new File(project.property("project.configs") + appName + ".gradle").exists()) { + apply from: project.property("project.configs") + appName + ".gradle"; +} + android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 24 + buildToolsVersion "24.0.1" defaultConfig { - applicationId "ch.dissem.apps.abit" + applicationId "ch.dissem.apps." + appName.toLowerCase() minSdkVersion 19 - targetSdkVersion 23 + targetSdkVersion 24 versionCode 7 versionName "1.0-beta7" } - signingConfigs { - release { - storeFile file(keyStoreFile) - storePassword keyStorePassword - keyAlias signingKeyAlias - keyPassword signingKeyPassword - } - } buildTypes { release { minifyEnabled false @@ -29,12 +29,12 @@ android { } } -ext.jabitVersion = '1.1.0-SNAPSHOT' +ext.jabitVersion = 'develop-SNAPSHOT' dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.3.0' - compile 'com.android.support:support-v4:23.3.0' - compile 'com.android.support:design:23.3.0' + compile 'com.android.support:appcompat-v7:24.1.1' + compile 'com.android.support:support-v4:24.1.1' + compile 'com.android.support:design:24.1.1' compile "ch.dissem.jabit:jabit-core:$jabitVersion" compile "ch.dissem.jabit:jabit-networking:$jabitVersion" diff --git a/app/src/main/assets/db/migration/V3.1__Update_table_POW.sql b/app/src/main/assets/db/migration/V3.1__Update_table_POW.sql new file mode 100644 index 0000000..d67a1b5 --- /dev/null +++ b/app/src/main/assets/db/migration/V3.1__Update_table_POW.sql @@ -0,0 +1,2 @@ +ALTER TABLE POW ADD COLUMN expiration_time BIGINT; +ALTER TABLE POW ADD COLUMN message_id BIGINT; diff --git a/app/src/main/assets/db/migration/V3.2__Update_table_message.sql b/app/src/main/assets/db/migration/V3.2__Update_table_message.sql new file mode 100644 index 0000000..1eba39f --- /dev/null +++ b/app/src/main/assets/db/migration/V3.2__Update_table_message.sql @@ -0,0 +1,4 @@ +ALTER TABLE Message ADD COLUMN ack_data BINARY(32); +ALTER TABLE Message ADD COLUMN ttl BIGINT NOT NULL DEFAULT 0; +ALTER TABLE Message ADD COLUMN retries INT NOT NULL DEFAULT 0; +ALTER TABLE Message ADD COLUMN next_try BIGINT; diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000000000000000000000000000000000000..ef455eeca98c6dba0571ee83ad9f560f23ea6f9a GIT binary patch literal 25944 zcmeFY`9D4P%!3RPWFC{txb-?(=w99*=X*b-mW-YrD>MtCMDuVhUma0Lf!V51j%4 z4*d%UC}HT&LU4xUOM5{c5- zzfR^hf$8(?sP+AlVL$WG8|Hp(_iP+Wzm}1UGcq$WSB);*kTnXJX9g~P+*ir&&jSV` zeFhT|y^(U;rMI9M1Zqe0e7in&(FV2oiu8g1|JVNqGO+#5nM@`&|L!<*Yxk#{Ltehi zwKqG)@9Hk^8p2mzUK570vaTaOKtxahaTa!bCg6(T?SrEOy00C>TNH< z>)YX8!w}*^a{Jc9#SsCXK$`GQ#c?J}PAq2g$DO5=rRwQ%UH^w}l`-s*=2=zh2t{7d zUin7;>?U!6iw*k;-f8$7(L0v+%_-M8=xRhly>^iMAv++w?XC$wpP@2+pN-L52!Gf2 z;%r%F@5^(cZWE1_78Elq!C@^A z^kct|qofTwCf8;wSRIPujo1l<#xqLe1z*g|YGWrkciJI}`3WjAw{~kqN-xh>RL$&c zxmCMhD1!7$!gW;x3M}W8nId{~9+@eGDsw{IxsV~f3vm;Poh&s| zAKtm~bj5d>JOzNfRl%yc9V@r-scc1kXh2hXp?W%3yII~$NAzTo_d|@+=}3f@?#44U z$iYUCjySuCKVhUs?5Ec@`uPv^j5p@o=kA7{u4n%w?(*yJ+LCs}NfNob*u+(W<(UV!k0+-JC>vm_U5>3o}BzeTDe0St+U^a4ac&cha+@aYExs`O)S5 zwC~*m)#fP=Ph7tY6cA=X?=8Qv@O>2#MTcuq7LW}n(SX7G8b5tZj>lm+_awV(_V)U*f@CVU3Ya`wwCtKd(b~ zz7V|MVMjent+Ytqi0s=ylb`rHJUOINwhupClfzQ)032_Ak6^Qhvp566RUaO=WrF4;-f zLQyULQ3+t%0?D`tcV1SYp%&K1P#eo1k;)3ok^{u|H!pZc@j|;*+<)u;8q9GwtUAPN z>D9V^m}Ryo&h5!#T9?!h$e^=pge&Y3;Yx&CiH<@)2if&1d{!d!fvmSW+0cksprn(r@b)Pq!({16;)lRY5%W5aWW(SJ-za|2&d$JOFJT}IvEXyf7?wv^7$8LZI zXCEbg73m-?F4qSEs{%*_D~p zSn)bmCvM+hg=uPtR4;iI2?Ln?sPSV|Uk_WYbxYo6?Lsk{9!>fa&#aUmST{YqZ#bSy zjaa+Jm}_Is=NA$~!jiNKlByYDngi?2?&ucOeTs?mAt`M;6pU^*2-JW_CPlLolIZ&m z?rAN6yB=AOCKd_iA5jEvr--p_391bsQGw5Qr(W@#p0!^L!@ml(O(cGQNfSBS<(nrL zp4B@nAsuw(ID`}Lq3{<#wGk?(0J+3j(QGm8Yu!{6cA$|UaQCXFRChIV#os*|At@M( zrE0G9Mvl-aMBX)}nVrw5tnVIn^xBqwnWIZWf7pu-kBAZkMy4%fx2m%bfnb=hC>SXq zIy|gQ`QjhZ5mFO-rj*U#D`Oh>Um-eZbHkJzbNKU=n>Vz$B~;E_jxzF>FkHL&>Nnx# zGT#7x->z15vUR8yZn+u<2-5Au&?&mb_{SfJy@iVP5hIc&+zOEj zmUs`TyMr(CLEzvTGc=f+sVZo_sa5lZXuzE|hXi#RCfT)vaotpCuT#5w`kIshb(@`=aU)QOhd`xyGWo04 z^xCL+PHbE$llNIlgR#4Rd|L++rTN~SF0i9hVCF0{#DK00hgPy?#cODIR$OYu45-en=bsBQxd zWmn;GaTU43Zu_?(QSYe{yl>lwTbwnc!uapZ{DdHEAu!WIPwn~O(XFvZLI@7_{1Oni z>a1d42$&HU`@i*sMZEBI=ZP%wD5RqE110VTFASLbIr>=Q)o=a#I$Ua3pOnQ93db}# z>(*R&yws4pct;<}j|v!#6z~*!CIv0;F4n$e zV4ZxOF$x7i@g*5T`%>7}oC7hy!7v7#5Zd&1MUc^+`Qcz@UW)(E=%O~(bF8U-Je z9#0wJTj_VHS>Zc>Vjk5FxIEWazl^tEkokU{7C4+eUgOv0UVeuBdpub`g4ozfq>f9P zZjwirYipY~(T;c52bTsYf7C!4e~zL?Mh~BId(PU74%zv~>?V-FUGLbDwBoupk6t_V zHgDvnx65?e3bEtsPW>>R7^Zr#j<3e`t!5X6b)0N-@#c4|p6&j+s$R4&WGCV^GocZ= z`sRU4*Bd*R?kycR9Rkg#4;NKWvhT8ct z=`evJyrw|-evM8cmb(xVvC_a_5tl1y6_=adL0i81Ktb=>8A+S})l>x=9wb8` zX@ECoKvovSfS;=|?tZn!{8c+Qml_Tc-?#-6#n)JKqGtr#D^8?L^*-mfpJdgv8l1o` zP^?mu%LWIZ@2I&{RH$iE=;NypMRc#N9f%TWsi0it9V>@Ov<;F9@J)3JjQzOwDZ@oJ zH7LRzO>h`coq7?W40h$)%5Jbb|LSg;8YHSuN`Mnf2efdq)5y)Z=7f{*PLbqs6yvb9 zD#@gy)KeT?H;=tEPIQ{q3RwuUaEH&ec`;7~PdjAXBVO#rj68Du9rfDn#b>D)(Z#|N zN@1i+8Q1D3@uscnsa=6=euMKbN*RcgLd1s9MB?-$<>3m|3TT+7hNNCi%Jlim2YKAs ziK-$Ku+1TFcAZ|VW)d5Yn&%eUh=B>ncxo->cZ=4P|zi}3!$}z5Y zvf=Iu($A&#@3NBd6m+ao*vwuWS`ZK?Qn1Nennim8Wc$DV$W{_2%;(;XcR(p~9Kp3h5F~>}0M|zwz_&=^ zSql4|``2Jx$xqYl^r)l?PR(P%r(vSGSq7(!ttEd^dnu%Y?ZDqYLN9HC2(;(MvY21? zXQHB|jv$Xd+wp|CImnN0?>nr4LTo@r>NxiKko@-cX~JAY9lIKi^ZM%#VmAgo6)021 z%F#|j4_|tu4Nql@k#?Va!8T5oxVP)x37@%&?PtVka9p^&G)NW(Uv9%vns20O4$DO} z&F1*{Gxt~dOt@D)4X*K7vZp@p<$C4v(}D$&!_-M`>OIbjrtX7l-q9m@8!#Td98aPw zzXDU%M0Z+T-O2Z04Rog7xI($4Q9>cs#9~EI(emZ%<2-cHO2~y@uKBC$66R|8!_y80 zW)mrDg`w%qr!P)t zENx<6n=W_$O2L;5zA%djw6Rc9MukgFp33A*ltEsy*yFy~ovN%nH$| zGkCjw?E9nLgvx>Tg%={g+^1^{iQEJO+FG7%2WV{yt(#hvThXmsTDP{UV{*=2nMD9_ z(GSi|MgX~V%(tp@4=+C|h_=n$Rr2$fpsIZ}(^ip_R2V`@?3yZ#iCv#fvDEcv+F3k~ zx*6?)j+xI|a{`lGR2^DGU47H};X835ZJNTu=b1C=MlkF6)ni$Xe~N*`sG7j2XIk%u z5@ngAZ*Xv=pDrPa8b?yjlPMq45f1pW{zgpw_?p`9pX*LHz(`^-3OEkf1x{#{b<;j~ zi6aTFH-7MQm7+qLkMc{lbj**hmKh|}7^sWE2o0eqI0$?N*2oiw_ zmBLf@wH4JZ@xJvSEQ>6nvRI8QGj0ixgF8pr=8$lo1H?Uc2v+yk)&<|Jd8*_b#wD+M z{rue^6It;sB>~$%FICD7Gb-W}Sa}KjyE-QuEoG2?hiL`EThZA@{j%lf>NEAWjb3T9 zFSe)i=hO~z9^nncy`D-D-W(7Id_CL_B+KgUt984ap6-3uwn349Z(rR4(=*xQuE#wO za;-QzTCLm&g#zyZ7_p`~WJG+p_~K1`rbg-HK2}jlqGh4xYSt;fJxL07;Ox$@<>wop zylnO#DzvT^x-oV7@i(4|mcZPAIqahU41GT*q^+m;=zYFtm0N%!e<72o&E?&^v_{>5 zyY>mwy;8BER(rkhF4R^no#Q(C9BHfbXxt8&n~%vbd^CS}bIdT6Uod@1g`_05ZdmxC zt9xE2VHW)i_>t<9p(}esjY@YZeQRB=spcQv!!S z@zjEs@E^u7rhB7~?q3!Oq(4LGT66Txcw@{I;e!P_hprM0mgD2H`cF$AjRTcRXcHKG z-};RD6IfEe7>nQ;Mt=hlFIc!K2YKZ#QGbLZ$nOT(n+fMlq)8WcmvJZ`y_0<^ia8XB z`n!I2Z;2*S|A~Je4DA$B->Mb05dsn+;HS!Xm?h>e5*@!!EMF0(|I2i)O{t|L9M7^j zhUy%Enf*}APV(sc3JcK9e!Z%$cblXBS_d#L3CyqaZ)Qbbf~arao3yV;;4z7}r=PlE zIlGeBgf(2AX}!8FPbAJ8b#!6hQ7rDMSZ5)kHXx=gSr~ClmC#?-t+vcq~D%T`g^EzlQ>tksv9??g&?6$>+hO!BGTQ zGGyFrmtz`E9LP?jV7U5*S;j@tD1#DnOod>Jg}h>z%2%bdR?RpQpQ|pC$^NkOGMgS) zxCSiOuL{)VLn0a+lDc>$HM88PBNQYyEXiP+Y_edZNplGkcclBrQ-Qw9DXwFak=cq50 z4GZ@EvzFFDq&Eg$H|){(4*MWdNgF_T(?iF=cI|ae?OT;9*7M9fy`^eBSO@N)8x zX}2w4Z8oG*IK<^Q4-RgNPqJ(4DcSv4Fk?vg!F)g^Mx0s9a^`fHE$3Y(+06VjU1u$% zO#w@XNOEuS#!>WSknKNucIxv!Pd)`)j{vPXBx?YW1Y_q6E+=GzPMV$I#-*az?JH6J zTQ;gXsivupP@Aq$|3J<^+7oi2(UB8i92~!?qjzZ?OZ}_ug)B37Cfj)R#+2#Gy(t+~ zIETFBm6~+1FftPHv6>|99-L7kd@Du$wcmumBCMh2j9@7hqxeOX^sY#6dX8AD1*zlp zflwy)^YTP7KmP2+ulwdbnl4Ebip1k~;GW8%Bevio*FW?5J?WL$Bj~JJJS_=Y2VlG$ z(rJJ?fQzqo#Y;dOq^EQ1LN@fRA+}zlxl_+Cm=|*%-=lgYdHe^NP*ql#alj0;r2DNx zUb_(tp2jV0V^~zL4O;zd!(?a1+AU^A9$tJD?G*Aj+<~SDFVHH0wM5nz8HN%VCZKUmKd4UNI8@J`tBP?;!r_!=9qLchdcZQ&1g z6KyAnKeK#~ug^9zSTg8b_O6CO66frdO+*6TfQoI>M|T-{(O*)C!ruTrC?YK(D0t8) z2ZPDC1l+?nt79>;TNU9-d?yE9?6Ud4$SO=rGBSh0sWBj#h#8dfmV@#1ka5YX>Dt~! zIg{rK3?0;z5ACx}olEd^oEO)J6d+^#)XX5)A0m6}>#g8WCh)G*0NmZR2Zcy)`P5lH zvwPwH`bd`-D(M; z_=#k{AS14t(VHmVz1=eW&~D7etxj7ZL>vP&NkC)3(8dx!BZG^-&n}I6H4Y27ipLwK zZ%M&oHozbG&`#DUWY-8~>INeQ)%OQ`lpD=jTrSW6Pm_QccsT(BzxaZaJa*lXK!!HS z=Fdx+Y_|hp%hrcfXww>V09ZGX;J``+N&4W8fTUH`8c57;?J()ZIBiZl?Z7iqb>OLU zDH0VCTl=?e{ILlpAq9g2VHi|DgCK_%G8_aJZbcrlMPy3aBgQiNGK0yCS$RFta|ZCA zLX{Mlb|7GsJktda&51H(!4{CMJ)%+?y-9MDsKf%yAWy|(;QMV^a)Ja%`sDNoNxHfQ z+}G^QAt8WOT0ewayU))}-wK!;*yJ-uF8(P|!trM%I`H%ox01JJd|ZnQgJ#6Zcwn%) zIOIh?^&O4s^TFlo({w~3#aU$_>!n(xz=6HsL$9O~cy`}CphHljt_W<{fj zi%R=M08{wA2r!lr0_PM60PLtl&|ZExf(E0fACJ}e9<_+QZb#kDPGob2?5G~e?W(Qn z5ECHCZ5?=a0C!0jt*uXZZ*e*5NcJ&peNevHzykzXf^b0S5Y)E_{0^Qu4MSH6Hec9e z1#k}7k3%3Mbb~xd5rJhtHO*tyK)pL?WcfA%iq8i^~W=>|{K(;0kl&eXCXF6a_7{Y_K6?%gKTYUfPUF0T~6=XETnH>-V zeYz`3mL}i4Iu^}Cw>t19&^x##khPjwlkq8bRNp_$(?EIC>K10ii2nm+_!nEmo=qD!Ig<%V zKHpvtJpgS;gnrKp9Q_F1BS8~YNc$txS*dLApMP zA!n{W13-clsMt>uhu0}2KR*^^R-A!s0zvsKkQ^YM?VGJinh)M*)%6b7CN2g>Y(PH@ zo%&C9Y3fv^eL5>@O@j8~eP`z({5c2S3n7n$kr|&~?gd+zP#)npkV03dy*x{bm$ouc zxy~K5X@*TuM6w5|((m^P8x#!2lb(Mb00>bcB(%@HW2supFw$CKQk*T~-T=Jp-OFRz z(V77XMHgmtj3<DuOxBBVKG5xpd)Dt68;FdNR6NVo=FJt^5ip*Gw(-S>%mH*iab)<|m zvkn)wDWGv2^ksn5vaJ%5@16yeWJwq+Qb0li2&l52vE-Sgb@m`Ya9_I zswANZgziKS#emu?)X*vsSP`VUy?QJDDl6*LORuHCTNDs>kd*f!Ge$m=kzb)L%a#zH z%*^Vx70=`^ZW>n4 zk)m~UVh}PQ+`H$^+Zd39(H;Od3qvp@aag1}F5;pQp)ll-B`%jG0@n`B;Le4)1)64X z0m)hz#1{xl6dVf*3$VESy1ACX5^-pZ{TVn*FIc1E^2FWPF4r_B^bY4&ztdD@M~7`z zL~H_QA#HMM=Ihrkm%QA3{jA5&h7ERG$1tZSBn<(P#dqX|HAGyz$2X#zn%EIHIqvEA^yF=jYlw$7-UM)49Sje1JOvBfL#VdWPZ->1LmHNiC%J!gD$h5xr;hdLHyqX5Ap9myLeJuqU2d-&EM zjZu9S2fG7iZA1Kdkx5YAgl}C9+nBix+S|u0IxN}II z+^eLZF*s}$IF2E127Ui6cZ@Dp8b5sE<>6yjM2C@ztPUDTMxQc%pNv&=&wr!U4R0Ka>yT6t^-~h!ul+n$lk@7oq0bu!D6lWY0Y$YYLnABA?^kQkg zTeiAZsXh6F4;*Nh6mE}HL?`|UqpbJ3D~H{Bqn_rc|KkINgfVnQfT`yl_;D%P*D04Q zYO3}w>t3CYcCvCS1AyG-OCF8OsfGzl^Kn2q?N}`ToyqggzneSlgk4Vq!{RRPV{RJm zUl4I)iMS7hixMoCEJ)aLU_4)R1CYssZGpyy~0C+D6Jj8JbT3ak4TLNy#f7GZHRLO3dE9n?ID4(JYZs8p#H;EJn z&kC~u!ATkj%knEpz_^dWG(7}i0RRw7?#E8R@3(1=i5!mg2BcHMq<$YRTncQkTWx`* z_NXbsW**RlL4pkbTUAlly(&l^u4MX+e03`Si$7#vfK)ufM9`+Mi{X0rVibTu36Y>T z69os`PCN9j0PWWR_jIjQfN=520N6(qf`*2A+9+Cl)|g!P82dy;E7K7QqhH^3{}pa6 zj6{*bA#ihA;C%AhNIsnj2hXA8xuXmP$9WzE;M^4$0rf|$`z_{jAm9K%7y&+A#c7aD zKpmU_NMg9{2wE{3N-bcL0NM|y{0Ao{Gq{nD)Tt(SEn+jy|0OyOhC3rn5(2er`c^l8 zlYkc502bOwAwD-?V4sjQAQ>lM|HPm_42}qcy$Bi{xB#^^pz0Xt)JLTBs+9?a!q9C~ zL~V$i&M~vU;=Cmd{JKHVCa`T$jCL6X@-G2erT~Lm*4UgaiP~16PIdolg3z4o0*rLb z8Zg#?9ahU7r7k6sNbOb(y>~I?3=7&5+Eqjd*ti1J5X|a56!&io+^*GInQ8aGhu4RY z3IOeJ&{v9qLx)L8I>4&?{#qcmmXE`U>aWZ^`70OzjDG>`SQ7aA{_*10z<)0Sz_=>{ zqU1;v5i}emsB+^-pNGf7NPi6qfS}zlT2KNJ4)1}%bXGil=Ai8DkJAAlB?<-yfGQxI zlLrZ#xn8|xpM~K!>RU0cvw8p9(G`@J?@F0r&M7jWrnP0{Ysj2}vAXtbr@+U1Mywq8t{PQaSnwZqci8EDR(@Imn z3uL<}NfxKr#)hBgk-D>Me}{+EOk7B^v>sJI@wKsKe$G>>2p>IexY#81NfYV}JQM-) zvn;s|e@7AIy0N-p9gA2Kr*!U}i7#Vj|E$A`AeeCYWMgJHYnyZ;Em!%W!O*-;h~P@W z6#utPSIqYo4Gj{miNqa_qDHBIVi6x}yV=Czm@*^EpQ6Vh}W4+Jf{DP_B zV|%NFglDsi-AsCk8JyqxH_8;sKO#t?TEMm|?-O_r2dYYtO=hNZt06-&@=NDt67Kzh z9RPkW22!FQq*oDABK?|;>3ey2mB+gsObmzEs$b8o24z3Nk!bO8qQb(>QQBx~BnYC9 zISC7&%g<~d?UEYC)`Y{d8$xM7Iu-Jb1nt(O|E%}MYkK5-j!)0ieLmb@LOyREUCope zGKsp&_7d-2b`tLz-8->LK;sAm#_QHtPh7Rwg5K-5=S`9F(tSgbVb*qV8K|wu0Ma$A z-hc%(!9-en?Em#y`NRBFjC=l$La&1B!E!~{=Tq{JeTQ76B7A?umtmr1x(v0<5*EC5dBFCMvQ2Ef!o4qK-raR|z0cIsYF z|GEYt==Nh6U; zQ6G1Hje&nr%`Sr3oGTQ0eylT|Wa1Kl*$CuWQ&{y8Y*}kqE0hkegp56D?TB*!mkj`% zAMe9R{bDA6p<)V}?bZsJ~v6UZn3asT~pSUe=ztoo#mOWo)IM`wtlkfj|Gd2G-bU^2ovu1#6PKwU;UWKyHfiAmV|?X%v~B7DQHo zN@?h#p;lJ$Dn&bdrh@%sA&ErtlRTOPwb7rI(daUcXE^X^)bdJRz&2;lStN)9xQ|WLhdW{Y zWz*091rO2|1c@2FazNMX{Da~8)NVn8=WW9VxpY=4A(fO`j;}itU+7qCt=T<%f8oaM z;jF-;G?H)}$1c(rs$>f9Nuwn%lOG+Y&DUeC?}OxRf(bE@vz0rc>))xh0hO#yZGHqH zs8m5~(!X$q4&~?J8yv&9tIq{ThWa#KYr?dkaW@h3bEmz3PpNCwF}u>GSZbvCcmMUn z1IRTWOpcbXhxHpeT4_jk{t6Ve?aH-F5P_hRCf`wIcT^dx4 z$&^c%>xjZ+C$y|B*@HGZK>IMruGnu;rVPQu7YLb@A4}uNDo}F}Qqnw?_vNZjY{>25 z)zsvaBc?8#R2ByR;xm58Xauk6Ua!g6@gf11r+}93^xI6hDg`@dgiBxJ`JHi7WOj!b zc(@g0m%;xmJjbe0*8RVA(UXD*;w|Ulmt7bECUA+(_n*WsaUE8k6S3SHWE0V?C{PaB zfMplKV%2c`HR7;p4MO!kCA66oak8uA9SnH3i3o$kGW;ANxc6MsA5y`gaIfhTlAvy$ z8vDR`3+Sx)Bp##!JnZoP4*U(Efq}1%je4Vn@*xLTq&UcY zF2*=WQ#UzCI5uDR_A~9OauD}jy+g_xaHyDnb2qoj0$< z4a|Xec*(D!RPX*4aR1EmO}UrhWpTHS=7eDu zM!`@>-Q6`-GX#P4m;ctiwv^QvT;k*0n|*NLBwXSkR9qi2sAW^T(-7z%f~qO9nMMKB zFdBTyaXyT|Ri;~4ZULaO5{6rwNL{qroW0$GOh5iV(XY(Y1#i|DQYZ(q=y-+8fGD55 zZ^O18JJ{%{bRZD18cmGL%n|} zZ~mK{TD{u+`fRt?N#mzJ_GLZ$GyB#gXM&Au#%Q=L%a1DsbApA?2SrqVZPCrSX=oMCb$KM~3TfBC|Ecr)s7j3X5#DdFKr5!{>a|E8fopfK z+Y>`W->y%OyQc_(GmGDU7fdXs+t! z>=(g-9%MQcQ2$xH!6%@-PY$|eV~jUFHzQ^e>Ab|5?;T_B_|J~PCImp0@XbxR6m|xl z>fBy*zNhBk2i?zK4(*8I)wPzTs$>6@dH^WT00I+QiDyS;uY8<8Ky181t$~meKUnT; znN{3hK182Ry(qwCa8Fv#w)}mCae8jf4=~)}wo@Za9&x^*JPZHzzT;xs4B7nSknF|N z_cy7Q&?{^NuKxfD!sZ-V@MwV6ZkQ3QKxHj6q~%=z(cvblTw)Ahycn{6WBjMdo> zp|(Zw&S!8lp*Z;07)YZiFe^`p;RgC2OQ8DCWiWp&V!r&~GYauZ58Z1l@Y|}Q&q62r z2MZKoo@H78W9bfF3O6Gm1qu&>P8mSj2icl@6Si|~qKqRqX(v#K*?k{LbzS$saj`7W zu1)`C!8Z$~!hp6l-Q^*9rW>~Lz}()6l-2Y9VKrkdyCS^+N}vz>REWS#flk3jT`jOY zlC=Tc(B{Tl#6Gd32G`ynRNCxd-rL7u+w&F;m+KddNx9YT-GhzhSpw$o*rjdkvwvk5 z6kQEcENx^>z(bwD>**Ew$MGVMkRWg|OBCGDO;h-qoDV-ea|iJ|Uza)X z+^+wohRS!|IJpt^(nUpR9mxKlh|Z3DtJ`SE)#$)D*lgHkXCr4uQsrE7j?8;1DZ=B_%?g)<#M@{-eyeIKce{E|L4|IA*M9s(aIn@VqZY5ZVDpR2F4)xo$-1 zI5*+>Cx^y*AAK2@OT@0+K#w|EA=x2G>u?VM&st@ z&6fWuopmkzUEyKFTvZ+dfAPE3X&*N*tAwZmyqgw63^ z&XbB&*V;L67; zclh}(X~ER}S#hZkDhyzVx*g@G%JMyZX-rvdi}<$mZr6?Zdryr7ep-NZ=N4h+FZ>HR$Vie2}W=1<}?U z-5DWgA2~urZ}vwLX;?XbuM48$n;s8VS)|Z4`0YWHGJk%$ce(xMr_YT))u{}3;s;!o z6&XKnM~rQP8gqXsXPlm|vrq;)C8C?+iWcl!Dh`x7`~Kp&Q-|W=5h@XQQ9Ft*+64Z@ zA2uoVP?b96gFD?s*IQXB;&0#uihg8T>a6(pWSNI&TT+auR1+TbrObyyY>k#6?oSU7 zqMhIfV@M5eG?P!+1$NCl2!_S_Pg2P1EAF@axZ&co-Q0VsCL#sP-U(M+42`3!5~_uE zp&pLLpIZBHr&@&QWOO32l0K&2dw$M*_!~4Xnit_9o0km{F_2DXx^KreDM51)1JS>F z*tQFBm-3jZ66TBY432Yf|7{oLnhC~$%*4nKhZk32=d;O248vT|&#~FfB&a&__!W@( z2Cp@nrszEFIC5L_uK9AHpZTM!H7(y4nEIhV(GMQHv_)}!XyX9YCyThA z6R+EP&#Ovp9=hz*-(Y4XzdUc=$fQ8(Ixp1?{N4U zEOdesQq_AYaLF{H2SNJE`Sp7|#VvAG4cC52c^{pTdT2A0Z_b8>#=jdl-RF*<4vH1rds|36 z>p{k!xy7s=E2I`^T9EP0c7pd;1PT0{Z+{($v>8roE1XWVTmeD5L_y*m|1HoAgF5$J z!#1tvVhXFPDd>{7q2$F}Bllg>1pl4zP+xSpCK_G-MkEeLB-Lx8UErrSdb_5YaQ(^n z+x1iU=K^R`2-Sfrb zpaVKfa8|H+@o|~!@ogy&vj+DbEX&+!&)LgLJ$%27w{iKH1_8GNep=d*d6_hzQr^5z z?;#Sl&oCb|aaS`gh&6pP%6{K#`gfg`2*`$`UUsCck}YDZG9I@@4eoAKs)y|AoiTKZ z=1;D25RiJ|pmP?6n;s$i%=7aW;(rvColswA{+`bJw&Jt$L4641AGG~2zBFEcD6s)6 zR`Xfh3VSq)D+tA9Ye~RQ5^)z@XbU1b{r)gJ!$2keGa=$@GhY+AFzf=}esANgW{+5(wJwOp@O@R*Q z-mXt7nB^%=C92%oyvh7+7IDc`DWCI*TiD)O5Pq_MFoCM`QK&c$?X))eL3Qz~AA$#8 zqAaqp1as);y35*p%QvI|`31g#U!%Qc%%!+k0-HVsCjbbo@AKB&)QwLzq~{ zvXtYhuIDR;uKvSp4*^H+)yQk7I?qI zaQEhp7eX*e#JQU|xMMtR!})a*aisI>?gL8_X#w@n1|hS+7dpiM=}x>skKCKym$J$` z@@}joru8B*=vJB2V%Y4-fw9!>+`U3X*EjfG4~+g15}*M)DPjqKIemmiu3KxRyvLVf z*AaKH2x_fhQ?hrRBJ!>dP}VPrxh2$m6>xvQa$ind68L9-Gr8n14pZ8X@(u_tf(@N> zK@VMzE8+K$YJG7B-0hc3c_y*M8~ALf(K1UPkyx1gjbUDhC$`K&t+;nG|HVAgCPf(j zH=s=-49;-Cf*$QOFWGqUkS-4#{z;GE9jSWx!aB9je+8eu`0SB;k=dB=!R|F}qJXr$ zXq9Ry1RKy`I3Vj5ig_M~(U;B;hN|DXAq;;iiEl;b$%G>7R>?p3!=0Z^sbg9G-70GY zRZhqG7bJ=Q_@2E@%9WxG3HODvt`xvG{Z_srvd}a?nbX!qq=qTKcG}ACP7RoULmkd~ z+&tH1%LiU=6WwibRZZ{_`fQ21hHtG5jSHcGPx>ewq~5MayC5(iWQ#FO(4On7 za=fnoX<=-|nZ2M27GF%gQIx!@@uHT41tvq=OpwD1ef_cYS6}Wm_+1GfFkw9q14}sXVVd3!Es{1c!)pEEy z$Pd>6Wj(`$y9@a~_SfYP7eii6TQ9adl-kgFQxQ`dSNwi)o7gS+R90Dzu&*$^V8?~@yxmB+T$IYz6O`XG7Ywjn$+H zdN@1(!H#nKbDf%B_sE=f8r|dC`**=_x8~t{vwmL-a{o2*Cs^|Q$M6sTuypf6-36pa zVL9b{xJVGAiWu5IldX*CxZz6rUEE~vXu(!>LVvr2WpCQUHlkr0pHmiayOITlVl%H> zhx-*oWVjK#uvPwogY)33TSO>hR)HLf@77qezD{$%{PesENLpv!oJe|hd0niDeAEF8 z_tRM#S@~ws^Vb6lTF`ybJKEoX?+u5hzUHp=S}`+qCHLK1w{OoseJff&(vIK zDN4o%n^(kA_bCi^{5!qQ>hi&aV!QJE>-)55&BL~qKd)-qx=fVQYtNC=0z7|t_gqKC zZT*#r;y-!!yRPEu^PdxQ^`<$~XXCl}H$|MB&4RNB9t-$T0$r)A{hki2pKi7owc=IB zaGL_ZU@?i12Bk5DQUfynkwOJZWyJ$|D$p&8pBig6!-~fuaMT#w=fu75-x@T9X?*!& zj?eELY7W{)f7x)nET$(U2-JG};sx9*w_6St^f@RL+-H2-`P|s{t@CeIT3b>+lXJ+W z>souV0%+c>IV6p;KKO~(7q$xjj=SIoleNu^r@g@P)s~%K#@d@wb^bQPh)0I%rJ>pQ zJ%yb_McSf3qZ?=+7bLeC&_(>a3bP2_8zB9%4fLZQ_8uHb3cv)9kA$}aZYBFrbfrj! zo{e`<)@HB$)`b~+lg^HR`FHe9%z?PJ{5Ss~xj@BVsg+pk-kf{hRSqWx@uo!_OX%*- zxFN5mzA zD@2}M71{WH>)82Ip10ZaFIqtShWwabt#AHYwNxK?m(}$SDoGP!eobXdN8I)Lat$gq zBP>Ip`TAP?ziUMZDs5 ziz<%{Vw`Rz6$IB*kG@}!N60mDjIfr#EXV)h4P?6IRHD4%CI4wI3doP zLusu;h_M!8GAM^Q9>utQFW+;qyeCw?C*xqE<=gphzwMI>N5iV`eJ1U1>AC)cpKN&) z>35{rJtlwNzhIolQ!umc)g5`{Nbq$!ce6l|pYtq}mqf#EW#^ePSw&7U)}VGGVa2PUE)pj=0Dy)#H*b?iU9=OoyuyUOid2`Y8Z1}48>iivA`;5w5MI0K9I{kiq!3ri_&&Hj6h zodp#)dagCEwa={$DqLt~O6RD|1PwVy2xffP0mgHx{KqT#=k7YmL*e5CK?cMbqAtKl z2>I1SOqna%|Bf~W%vmw@Qh9(=EWgloD%<>1QQ1MIS{bX+OEzO0j_D{)tqiQOJyxcN zk8z<|3>}2^ZVMUScdjZvjIGK~BK#cxND|r_l$HD>4GtG0|0ZIt4rJYb@&4eK@wMwY zfdkWQyU0k_T*qCuozG*>xbH}HXI7PO?x0LrM5HEm-<~`eRA1je!+5-HIFZaY;%V0h zD$#L5k~h(SJOc4I38N-UyA3*=v-u`XID5$&R?vB~wpbot-sA6|`|ZK4n8cgyo&lb> zoXV_=QaAB#SdL61_i$DDqB3NN%(g#eCAv%``dDu5vtv4cWMyXeq`luA;bZ~HMbM}z+Do8#?SzVKz)^u3!u@KpGgrxq z%hBckSRVy3(4B++eMpIY^%E8`wwfnHpkaSADdr#;Koqiuk|}av5|-)0{b;c}WjHu})_)BY|2o;c3l;E!8)tYtX_i;Hm@eff6#6CR~MnwL$WS4_xW*Ko<0&Eec zn2jW4pu|Z)7!g_omZ{5HiY03_pa>_1wAvv=(=aKuaU?=Df-aD-Cl!UY(9pwX;{Xxl zwG82P*L?fjYSCt2nt{eaXi0=IVa=Bi(L+PRyI8Wb8OtNyhKsp!BwW>(!B7N9Q0aK6 zYKpNzM9GSP{=WLbJ`u4OHI!*~5%fX;dKk1N#uBv!AHz`P&OoD$czxRZ&U9`MD4Mp8 zqJ*)XFwvn-6b_~)Cjw$jbqF*2r?f~Z>WKf?i=sM_qXfESPtwXVA(}FRtW?T*Bk}5j zC97LmgFPSTni~r;Vz#2vXXikv%^hm_1vq`*6f?thySNz!4cbs7t zm@r%tQ;`y0PQs!SAw+J;aMttQrIRNyjDt7`{QpEcDKF7(aF5=7G?Q%0g*cJfbaUv% z1oTj)xJ;{jc=j!cp^AZX0x;?eNi0@hE$B1^J&=-c0YWTQ{w5`XqAx}W47SG*ZI{%H zVQ7khI(j~jleURXNs&-Cb5t0>0H8r1QIVkoTeBcEra)Tn`_VhS{;83~SJn}ybi5dxqY`7}4!iXBY&_62&V`hdi{^ms4J z#h~O=fJWKRB%4EB_T z5`)ZTdVdky(|vSdy2Qo^&m4s88L;TVMsgDAm^fS+J zBK$0gJLp5LYaRn21S9$`t-y%qEDk&APy#??NfdU3o{!5lF)QT+;!d$6-eb4M|33J9 zusySq++8B13sC1sfK2d`{91(9=09KoB1b_Y9SdHq=XR8cpVJChMWLa@Dtld%#Qs|+ z@s(I%_Vbm9CQ%M48EwKV-&gU}Q(lZ}jAqz+Y>-T`mu<3Kq|%j}QHR%){)+$_7$J?| zY(1h#Vr@{ZA!|*t5JnA2225Uvr5(YoSEK#cErfmJC;I{ zeZ0du(WjQwoFVe_1~8W2IC2cI`Un!q(tsJ9I;RJewsXeiM%`PL*F?T`pq@~d2+N;) zR0#otD&1b(x?*-@07jjIu5$v6<8=4PsyY~TT*=nronY)}uhD+?(+#$t46}thnK+4hP^!VrU~kHL6R~jv@38y9-Q?B{-QQB1wBiyFRZ5tBzuu4ZkwD zxBAgffLaDnsQ|-)toENn2P6__`si`H-hB3J+G|*3 zY^fQp17v6c7qHpVK+qpv2))lOf@Qtu0^_)3Bk9xR-@*8}w)Qw)-)s0NXb&9F4L_#{ zpg=0!3c!3csEe-p&hgKEH5HpUm>yLX)A8_EFlKsx)VBBcT)}H~FK#dkDy_K-RM)~l6^7X2vAh~I zMs!8i&uk<*0JYx`z-gv{SI<8IrBlGDDtvvFk+;50@LC5+d_WOi&u->E_xt+;8e=UL zyupz;WhF=DRED0pd#}=j?}AeD*uCUrP#a7^Xuj6H)i<)h{cVqkGpmU~h?Sdv)0|@V zRq^r=NMkjLUAi$}Rmjh)Laph*@3{a2#XxI;-8TT{4qW@0D4&6}N*DBs(q$5_k4&Z< zh8jzJ^833KG#xiVymPFo@fBbH80qqI*gk)W1*aPE zDqqZ{j^eA%7W=t8`0W5aN(buq87rU5`kTN!q3}~Zy?}GZISmg^k_bxAM6hO6% zAsY&<)xK-XhWVDt2G7>0-i|iOCg`mRUMtxlYSj60^h*ACxo&*msShK9x(iG!bAs?i z5Y;A)q9agHfg02=?p;~u!U_I``_$UNC^SA)5=9e|DSnsyF8l4d+f0d>Ax{y&V({E^ zSY+F*a{0L)#4p_ig z0mXL67VXP4sCU8Vxj{14^G&VaSF1b@xmkd61;>0a!&MdEvTG|^_ncTkXg+V*FdI+h zU&x?7hKZxnpe3)8)u;=#QT-{XG4!1`n2N-)wG(cnuetGW<-+z+6GI zvr-;?*|MdLqO2atS+f1;?&mu1*y)zVE?MBu-r4ioQ_$MKe?DN^ zo3Repk1Fp5%>6G*C_ef1%#46^bvx_bKt;HkQoomNqe%kNbPW-UeztHJliiHDCs@|O(A>$>f~Br*{;$vOFuM^1Y|4Jd{{Dti$KsppJj-)I^6JB z_V1|Qw3OybTO)7277dnZDD-E-a57=`bEd#8ckw!CC}(&laHl#ysFB<~Tf*V5T}=P( zM(k8#SV*PlQG<|BbC>ixML7p;>7{I%^YSftmTe=Htuq}B+2?&qe?E=njb(~yEnMX9-pkyQEcET1oSP_6cl z(Sr5(;UU6<*`|8IUnd#AL=nLxht0B`9>H3cu;%}@>C15y_}u{0@9rsW^-JpJq{|XY zhSPrvP#GVW^e47vn*!BKznTcc*MrcfOkyf2q}uACp`KrBPf$*# zz~K(JLa}DyV>Igt!qbp152sqD)U*_v&$dUM-aa_t?jA87b7pTZDWYXso8Q$@RYU%0 zl{Vv*PsX|b}hBMK8V4_2P ziu83t=Wc61<6R|EKejER_W}JS)c>jBOF6ldVqtNX8Yz7VPoegiA#ogf5$!nrcFM z)bCEH+^HX*%0u%XA%KS%s*bWv>#$tur*>gSp3$#WF3V6|0W%kM!hL)yPGLewK6fX> zkcuAk4-jFWRPy7-oWYk`Tvf*hg2Jfq-b_O-ehWRme5Axca5;OCAF7`=zdacXpnXw= zs_^d9)Y^UKj4xX-Y?&f#SP2}iq;WTPH3Fe}WuwMn7h$LS)#dc2iw&Ic3RP};RsaY7 z`$*g?i0-M}0Vbm)W^veUF`TB$#D2kGP9M%FH(=zdlzteS{fk8Xc7ia}m$K4RqqG%F zKz@^B9rKk#wxl0}da~c_4j9&N2%XX6jGc!Ibd3JsE$I`TUyHgtCp#IG4NXIq7Kf%> zEc;X0y8dW%j|$XG1|s%#z4hh3WQMAu z#s!vXl`2FgBaoa|Vr?&w;fyV2MJ?~7QhvxRp82}DYhuz#ic;Q6P-J>%$ANcnK6_9I z-{w3-BylP<9$`sjfW9co;@D!atW9$&*x+0XDEPpa}9@3iI1IaXs0 zo!Ldb-bu|wk9DwOC&ojxyvGDkeM@gmp^r~o&g8VPS-=0n%Jbxxtw}WgZX>pdQZj#g zgAT!XeZ1S^c14hR8n+B}x)_G^ad5xF(KIfIqNz7uRdVg`b+wWeq(gz>W2)i5;F7+&ey0eV~L8$^85 zX)?p1%v)1jerHj{Q@xSoljQ>7R^58(8K=-akDpTp0?N#AHf7kYXe-$|RB>WFn*rPT8 literal 0 HcmV?d00001 diff --git a/app/src/main/java/ch/dissem/apps/abit/pow/ServerPowEngine.java b/app/src/main/java/ch/dissem/apps/abit/pow/ServerPowEngine.java index 1b94aa5..1dd81bb 100644 --- a/app/src/main/java/ch/dissem/apps/abit/pow/ServerPowEngine.java +++ b/app/src/main/java/ch/dissem/apps/abit/pow/ServerPowEngine.java @@ -36,7 +36,7 @@ import ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest; import ch.dissem.bitmessage.ports.ProofOfWorkEngine; import static ch.dissem.bitmessage.extensions.pow.ProofOfWorkRequest.Request.CALCULATE; -import static ch.dissem.bitmessage.utils.Singleton.security; +import static ch.dissem.bitmessage.utils.Singleton.cryptography; /** * @author Christian Basler @@ -78,7 +78,7 @@ public class ServerPowEngine implements ProofOfWorkEngine, InternalContext (request); cryptoMsg.signAndEncrypt( identity, - security().createPublicKey(identity.getPublicDecryptionKey()) + cryptography().createPublicKey(identity.getPublicDecryptionKey()) ); context.getNetworkHandler().send( Preferences.getTrustedNode(ctx), Preferences.getTrustedNodePort(ctx), diff --git a/app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java index 6b128b4..5a1765e 100644 --- a/app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java +++ b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java @@ -22,17 +22,6 @@ import android.database.Cursor; import android.database.DatabaseUtils; import android.database.sqlite.SQLiteConstraintException; import android.database.sqlite.SQLiteDatabase; -import android.support.v4.database.DatabaseUtilsCompat; - -import ch.dissem.apps.abit.R; -import ch.dissem.bitmessage.InternalContext; -import ch.dissem.bitmessage.entity.BitmessageAddress; -import ch.dissem.bitmessage.entity.Plaintext; -import ch.dissem.bitmessage.entity.valueobject.InventoryVector; -import ch.dissem.bitmessage.entity.valueobject.Label; -import ch.dissem.bitmessage.ports.MessageRepository; -import ch.dissem.bitmessage.utils.Encode; -import ch.dissem.bitmessage.utils.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,12 +32,19 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; -import static ch.dissem.apps.abit.repository.SqlHelper.join; +import ch.dissem.apps.abit.R; +import ch.dissem.bitmessage.entity.BitmessageAddress; +import ch.dissem.bitmessage.entity.Plaintext; +import ch.dissem.bitmessage.entity.valueobject.InventoryVector; +import ch.dissem.bitmessage.entity.valueobject.Label; +import ch.dissem.bitmessage.ports.AbstractMessageRepository; +import ch.dissem.bitmessage.ports.MessageRepository; +import ch.dissem.bitmessage.utils.Encode; /** * {@link MessageRepository} implementation using the Android SQL API. */ -public class AndroidMessageRepository implements MessageRepository, InternalContext.ContextHolder { +public class AndroidMessageRepository extends AbstractMessageRepository { private static final Logger LOG = LoggerFactory.getLogger(AndroidMessageRepository.class); private static final String TABLE_NAME = "Message"; @@ -58,9 +54,13 @@ public class AndroidMessageRepository implements MessageRepository, InternalCont private static final String COLUMN_SENDER = "sender"; private static final String COLUMN_RECIPIENT = "recipient"; private static final String COLUMN_DATA = "data"; + private static final String COLUMN_ACK_DATA = "ack_data"; private static final String COLUMN_SENT = "sent"; private static final String COLUMN_RECEIVED = "received"; private static final String COLUMN_STATUS = "status"; + private static final String COLUMN_TTL = "ttl"; + private static final String COLUMN_RETRIES = "retries"; + private static final String COLUMN_NEXT_TRY = "next_try"; private static final String COLUMN_INITIAL_HASH = "initial_hash"; private static final String JOIN_TABLE_NAME = "Message_Label"; @@ -74,27 +74,11 @@ public class AndroidMessageRepository implements MessageRepository, InternalCont private static final String LBL_COLUMN_COLOR = "color"; private static final String LBL_COLUMN_ORDER = "ord"; private final SqlHelper sql; - private final Context ctx; - private InternalContext bmc; + private final Context context; public AndroidMessageRepository(SqlHelper sql, Context ctx) { this.sql = sql; - this.ctx = ctx; - } - - @Override - public void setContext(InternalContext context) { - bmc = context; - } - - @Override - public List