19 // INCLUDE FILES |
19 // INCLUDE FILES |
20 #include <e32std.h> |
20 #include <e32std.h> |
21 #include <f32file.h> |
21 #include <f32file.h> |
22 #include <eikenv.h> |
22 #include <eikenv.h> |
23 |
23 |
24 #include <Browser_platform_variant.hrh> |
24 #include <browser_platform_variant.hrh> |
25 #include "webUtilsCommon.h" |
25 #include "webUtilsCommon.h" |
26 #include "CUserAgent.h" |
26 #include "cuseragent.h" |
27 #include "WebUtilsLogger.h" |
27 #include "WebUtilsLogger.h" |
28 |
28 |
29 #include "WebUtilsInternalCRKeys.h" |
29 #include "webutilsinternalcrkeys.h" |
30 |
30 |
31 |
31 |
32 #define KPlaceHolderMozillaVer _L("Mozilla/5.0") |
32 #define KPlaceHolderMozillaVer _L("Mozilla/5.0") |
33 #define KPlaceHolderComponent _L("AppleWebKit/525 (KHTML, like Gecko) Version/3.0") |
33 #define KPlaceHolderComponent _L("AppleWebKit/525 (KHTML, like Gecko) Version/3.0") |
34 #define KPlaceHolderBrowserName _L("BrowserNG") |
34 #define KPlaceHolderBrowserName _L("BrowserNG") |
690 { |
690 { |
691 |
691 |
692 TInt ret(0); |
692 TInt ret(0); |
693 TBuf<64> BrowserVersionMajor(0); |
693 TBuf<64> BrowserVersionMajor(0); |
694 TBuf<64> BrowserVersionMinor(0); |
694 TBuf<64> BrowserVersionMinor(0); |
695 TBuf<64> BrowserVersionSVNRev(0); |
695 TBuf<64> BrowserVersionFeatureRev(0); |
|
696 TBuf<64> BrowserVersionPatchRev(0); |
696 |
697 |
697 iBrowserVersionStr = HBufC::NewL(KMaxBrowserVersionStringLength); |
698 iBrowserVersionStr = HBufC::NewL(KMaxBrowserVersionStringLength); |
698 |
699 |
699 TPtr BrowserVersionPtr = iBrowserVersionStr->Des(); |
700 TPtr BrowserVersionPtr = iBrowserVersionStr->Des(); |
700 |
701 |
701 |
702 |
702 ret = iRepository->Get(KWebUtilsBrowserVersionMajor, BrowserVersionMajor); |
703 ret = iRepository->Get(KWebUtilsBrowserVersionMajor, BrowserVersionMajor); |
703 if(ret == KErrNone) |
704 if(ret == KErrNone) |
704 { |
705 { |
705 ret = iRepository->Get(KWebUtilsBrowserVersionMinor, BrowserVersionMinor); |
706 ret = iRepository->Get(KWebUtilsBrowserVersionMinor, BrowserVersionMinor); |
706 if(ret == KErrNone) |
707 if(ret == KErrNone) |
707 { |
708 { |
708 ret = iRepository->Get(KWebUtilsBrowserVersionSVNRev, BrowserVersionSVNRev); |
709 ret = iRepository->Get(KWebUtilsBrowserVersionFeatureRev, BrowserVersionFeatureRev); |
709 if(ret == KErrNone) |
710 if(ret == KErrNone) |
710 { |
711 { |
711 BrowserVersionPtr.Append(BrowserVersionMajor); |
712 ret = iRepository->Get(KWebUtilsBrowserVersionPatchRev, BrowserVersionPatchRev); |
712 BrowserVersionPtr.Append(KPlaceHolderPeriod); |
713 if(ret == KErrNone) |
713 BrowserVersionPtr.Append(BrowserVersionMinor); |
714 { |
714 BrowserVersionPtr.Append(KPlaceHolderPeriod); |
715 BrowserVersionPtr.Append(BrowserVersionMajor); |
715 BrowserVersionPtr.Append(BrowserVersionSVNRev); ; |
716 BrowserVersionPtr.Append(KPlaceHolderPeriod); |
716 } |
717 BrowserVersionPtr.Append(BrowserVersionMinor); |
717 } |
718 BrowserVersionPtr.Append(KPlaceHolderPeriod); |
718 } |
719 BrowserVersionPtr.Append(BrowserVersionFeatureRev); |
|
720 //Incase of Feature releases we do not show Patch number. |
|
721 //Therefore, if the patch version is 0 or empty then we do not show the content |
|
722 if( (BrowserVersionPatchRev.CompareF(_L("0")) == 0) |
|
723 || (BrowserVersionPatchRev.CompareF(KNullDesC) == 0)) |
|
724 { |
|
725 //Do Nothing |
|
726 } |
|
727 else |
|
728 { |
|
729 BrowserVersionPtr.Append(KPlaceHolderPeriod); |
|
730 BrowserVersionPtr.Append(BrowserVersionPatchRev); |
|
731 } |
|
732 } |
|
733 } |
|
734 } |
|
735 } |
719 |
736 |
720 if(ret != KErrNone) |
737 if(ret != KErrNone) |
721 { |
738 { |
722 LOG_WRITE("Error: Reading default Browser Version from cenrep failed!"); |
739 LOG_WRITE("Error: Reading default Browser Version from cenrep failed!"); |
723 LOG_LEAVEFN("CUserAgent::BrowserVersion()"); |
740 LOG_LEAVEFN("CUserAgent::BrowserVersion()"); |